From d75da632f76094ec3e9af08aa9c11a0cd5ab5af2 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 09:37:33 +0100
Subject: [PATCH 001/226] Prototype nav-v2: label sections, accordion sidebar,
 feature flag
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds a new `navigation-v2.yml`-driven sidebar behind the `nav-v2`
feature flag (enabled by default in dev/preview environments).

- New YAML format: label sections (non-clickable headings), toc entries
  that resolve to existing navigation nodes at their original URL paths,
  page crosslinks, and title-only placeholder (disabled) links
- `SiteNavigationV2` extends `SiteNavigation`, passes the original
  nav file to the base constructor so content URLs are unchanged; builds
  a separate `V2NavigationItems` tree for sidebar rendering
- `GlobalNavigationHtmlWriter` detects `SiteNavigationV2` and returns
  the same full V2 nav HTML (cached once) for every page
- `_TocTreeNavV2.cshtml` renders labels as `<span>`, placeholders as
  `aria-disabled` anchors, folders/leaves same as V1
- `pages-nav-v2.ts` adds accordion collapse (open one section → others
  collapse) and current-page marking with no auto-expand
- Feature flag key normalisation: assembler.yml uses `NAV_V2` (underscore)
  but lookup uses `nav-v2` (hyphen); fixed by calling `featureFlags.Set`
  which normalises via `ToLowerInvariant().Replace('_', '-')`

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/assembler.yml                          |   2 +
 config/navigation-v2.yml                      |  34 ++++
 nav-v2-status.md                              | 121 ++++++++++++++
 .../Builder/FeatureFlags.cs                   |   6 +
 .../ConfigurationFileProvider.cs              |  34 ++++
 .../Toc/NavigationV2File.cs                   | 141 +++++++++++++++++
 .../V2/LabelNavigationNode.cs                 |  74 +++++++++
 .../V2/PlaceholderNavigationLeaf.cs           |  36 +++++
 .../V2/SiteNavigationV2.cs                    |  81 ++++++++++
 src/Elastic.Documentation.Site/Assets/main.ts |   8 +-
 .../Assets/pages-nav-v2.ts                    |  66 ++++++++
 .../Navigation/NavigationViewModel.cs         |   3 +
 .../Navigation/_TocTree.cshtml                |  42 +++--
 .../Navigation/_TocTreeNavV2.cshtml           | 148 ++++++++++++++++++
 .../Building/AssemblerBuildService.cs         |  31 +++-
 .../Navigation/GlobalNavigationHtmlWriter.cs  |  67 ++++++++
 16 files changed, 878 insertions(+), 16 deletions(-)
 create mode 100644 config/navigation-v2.yml
 create mode 100644 nav-v2-status.md
 create mode 100644 src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
 create mode 100644 src/Elastic.Documentation.Navigation/V2/LabelNavigationNode.cs
 create mode 100644 src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationLeaf.cs
 create mode 100644 src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
 create mode 100644 src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
 create mode 100644 src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml

diff --git a/config/assembler.yml b/config/assembler.yml
index af9a9ff031..463a9957f4 100644
--- a/config/assembler.yml
+++ b/config/assembler.yml
@@ -38,6 +38,7 @@ environments:
     path_prefix: docs
     feature_flags:
       SEARCH_OR_ASK_AI: true
+      NAV_V2: true
   preview:
     uri: https://docs-v3-preview.elastic.dev
     path_prefix: ${ASSEMBLER_PREVIEW_PATH_PREFIX}
@@ -46,6 +47,7 @@ environments:
       enabled: false
     feature_flags:
       SEARCH_OR_ASK_AI: true
+      NAV_V2: true
 
 shared_configuration:
   stack: &stack
diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
new file mode 100644
index 0000000000..e4867956f4
--- /dev/null
+++ b/config/navigation-v2.yml
@@ -0,0 +1,34 @@
+nav:
+  - label: Get Started
+    children:
+      - toc: get-started
+
+  - label: Solutions
+    children:
+      - toc: solutions
+
+  - label: Manage Data
+    children:
+      - toc: manage-data
+
+  - label: Explore & Analyze
+    children:
+      - toc: explore-analyze
+
+  - label: Deploy & Manage
+    children:
+      - toc: deploy-manage
+
+  - label: Cloud Account
+    children:
+      - toc: cloud-account
+
+  - label: Troubleshoot
+    children:
+      - toc: troubleshoot
+
+  - label: Reference
+    expanded: true
+    children:
+      - toc: elasticsearch://reference/elasticsearch
+      - toc: kibana://reference
diff --git a/nav-v2-status.md b/nav-v2-status.md
new file mode 100644
index 0000000000..238ec65615
--- /dev/null
+++ b/nav-v2-status.md
@@ -0,0 +1,121 @@
+# nav-v2 prototype — status & plan
+
+Branch: `nav-v2`
+Date: 2026-03-20
+
+---
+
+## Goal
+
+Prototype a new information architecture sidebar without touching production nav.
+Gated behind the `nav-v2` feature flag (enabled automatically in `dev` and `preview` environments).
+
+The V2 nav:
+- Shows label sections (non-clickable headings) instead of bare TOC roots
+- Renders the **full tree on every page** (not per-section like V1)
+- Has accordion collapse (open one top-level section → others collapse)
+- No auto-expand to current page (progressive disclosure)
+- Disabled placeholder links styled with `cursor-not-allowed`
+
+Content is built at **the same URL paths as V1** — the V2 flag changes only the sidebar layout.
+
+---
+
+## Current state: build green, awaiting assembler re-build
+
+`./build.sh build` passes (lint + compile + all unit tests).
+The assembler serve at `localhost:4000` still shows the **old nav** because it was built before two bugs were fixed. User needs to re-run `assembler build` to get the fixed output.
+
+### Bugs fixed in this session
+
+| # | Bug | Fix |
+|---|-----|-----|
+| 1 | Feature flag never fired — `assembler.yml` sets `NAV_V2` (underscore) but `FeatureFlags(dict)` stores keys as-is; `IsEnabled("nav-v2")` never matched | Use `featureFlags.Set(key, value)` in `AssemblerBuildService` to normalise keys before lookup |
+| 2 | Content built at `/docs/l2/get-started/` instead of `/docs/get-started/` — `SiteNavigationV2` was synthesising a new nav file with `l{depth+1}/` prefixes | Pass the original `SiteNavigationFile` to the base constructor; V2 only changes sidebar rendering |
+
+---
+
+## Files changed
+
+### New files
+| File | Purpose |
+|------|---------|
+| `config/navigation-v2.yml` | Skeleton: 8 label sections matching current top-level nav |
+| `src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs` | YAML model (`LabelNavV2Item`, `TocNavV2Item`, `PageNavV2Item`) + `NavV2FileYamlConverter` |
+| `src/Elastic.Documentation.Navigation/V2/LabelNavigationNode.cs` | Non-clickable section heading; implements `INodeNavigationItem` |
+| `src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationLeaf.cs` | Disabled placeholder link; implements `ILeafNavigationItem` |
+| `src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs` | Extends `SiteNavigation`; passes original nav file to base; builds V2 label tree from `navigation-v2.yml` |
+| `src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml` | V2 Razor partial: labels as `<span>`, placeholders as `aria-disabled`, folders/leaves same as V1 |
+| `src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts` | Accordion collapse + current-page marking (no auto-expand) |
+
+### Modified files
+| File | Change |
+|------|--------|
+| `config/assembler.yml` | `NAV_V2: true` under `dev:` and `preview:` feature_flags |
+| `src/.../Builder/FeatureFlags.cs` | Added `NavV2Enabled` property |
+| `src/.../ConfigurationFileProvider.cs` | `NavV2Deserializer` (reflection-based); optional `NavigationV2File` property; `TryCreateTemporaryConfigurationFile` helper |
+| `src/.../NavigationViewModel.cs` | Added `IsNavV2` bool (default `false`) |
+| `src/.../Navigation/_TocTree.cshtml` | Branches on `IsNavV2`; wraps V2 tree in `<nav data-nav-v2>` |
+| `src/.../AssemblerBuildService.cs` | Normalises feature flag keys; loads `navigation-v2.yml` + instantiates `SiteNavigationV2` when flag on; skips path-prefix duplicate validation for V2 |
+| `src/.../GlobalNavigationHtmlWriter.cs` | Detects `SiteNavigationV2`; always returns full V2 nav HTML (cached once as `"nav-v2"`); `SiteNavigationV2Wrapper` exposes `V2NavigationItems` as the tree root |
+| `src/.../main.ts` | On `htmx:load`, calls `initNavV2(nav)` when `[data-nav-v2]` is present; otherwise falls back to `initNav()` |
+
+---
+
+## How the V2 nav renders on every page
+
+```
+HtmlWriter.RenderLayout (called per page)
+  → NavigationHtmlWriter.RenderNavigation(root, navigationItem)
+    → GlobalNavigationHtmlWriter detects `globalNavigation is SiteNavigationV2`
+      → RenderV2Navigation: renders full V2 tree once, cached as "nav-v2"
+      → returns same HTML for every page
+```
+
+`_TocTree.cshtml` checks `Model.IsNavV2`:
+- **true** → `<nav data-nav-v2><ul id="nav-tree"> ... _TocTreeNavV2 ... </ul></nav>`
+- **false** → existing V1 `<ul id="nav-tree"> ... _TocTreeNav ... </ul>`
+
+`main.ts` on `htmx:load`:
+- `[data-nav-v2]` present → `initNavV2(nav)` (accordion + current-page marker, no auto-expand)
+- absent → `initNav()` (V1 behaviour unchanged)
+
+---
+
+## Next steps / open items
+
+1. **Re-run assembler build** to see V2 nav in the browser.
+
+2. **Verify accordion works** — click a top-level label to expand; click another to confirm the first collapses.
+
+3. **Verify `expanded: true`** — "Reference" section in `navigation-v2.yml` has `expanded: true`; confirm it starts open.
+
+4. **Current-page highlighting** — `pages-nav-v2.ts` marks the active link; confirm it highlights the right item without auto-expanding parents.
+
+5. **`navigation-v2.yml` content** — currently mirrors V1 structure exactly. The whole point of V2 is to let you freely rearrange this file. The skeleton has these top-level labels:
+   - Get Started, Solutions, Manage Data, Explore & Analyze, Deploy & Manage, Cloud Account, Troubleshoot, Reference
+
+6. **Placeholder / page crosslinks** — `page:` items in `navigation-v2.yml` currently render as disabled placeholders (prototype shortcut). Wire up real cross-link resolution if needed.
+
+7. **`l{depth+1}/` parallel paths** — dropped for now (content stays at V1 paths). Could be re-added later if the team wants to preview a new IA at separate URLs while keeping V1 live.
+
+8. **Uncommitted** — nothing is committed yet. All changes are working-tree only.
+
+---
+
+## How to test locally
+
+```bash
+# from docs-builder root
+assembler clone          # if repos not yet cloned
+assembler build          # re-build with nav-v2 fixes
+assembler serve          # serve at localhost:4000
+```
+
+Open `http://localhost:4000/docs/get-started/` — sidebar should show label sections
+with accordion behaviour instead of the flat V1 nav.
+
+To disable V2 nav temporarily without changing code:
+```bash
+FEATURE_NAV_V2=false assembler build
+```
diff --git a/src/Elastic.Documentation.Configuration/Builder/FeatureFlags.cs b/src/Elastic.Documentation.Configuration/Builder/FeatureFlags.cs
index 9da3dee248..e7dfb43662 100644
--- a/src/Elastic.Documentation.Configuration/Builder/FeatureFlags.cs
+++ b/src/Elastic.Documentation.Configuration/Builder/FeatureFlags.cs
@@ -44,6 +44,12 @@ public bool DiagnosticsPanelEnabled
 		set => _featureFlags["diagnostics-panel"] = value;
 	}
 
+	public bool NavV2Enabled
+	{
+		get => IsEnabled("nav-v2");
+		set => _featureFlags["nav-v2"] = value;
+	}
+
 	private bool IsEnabled(string key)
 	{
 		var envKey = $"FEATURE_{key.ToUpperInvariant().Replace('-', '_')}";
diff --git a/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs b/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs
index 05a994c21a..643fa7aeb2 100644
--- a/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs
+++ b/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs
@@ -30,6 +30,11 @@ public partial class ConfigurationFileProvider
 		.WithTypeConverter(new SiteTableOfContentsRefYamlConverter())
 		.Build();
 
+	public static IDeserializer NavV2Deserializer { get; } = new DeserializerBuilder()
+		.WithNamingConvention(UnderscoredNamingConvention.Instance)
+		.WithTypeConverter(new NavV2FileYamlConverter())
+		.Build();
+
 	public ConfigurationSource ConfigurationSource { get; }
 
 	public string? GitReference { get; }
@@ -98,6 +103,7 @@ public ConfigurationFileProvider(
 		ProductsFile = CreateTemporaryConfigurationFile("products.yml");
 		AssemblerFile = CreateTemporaryConfigurationFile("assembler.yml");
 		NavigationFile = CreateTemporaryConfigurationFile("navigation.yml");
+		NavigationV2File = TryCreateTemporaryConfigurationFile("navigation-v2.yml");
 		LegacyUrlMappingsFile = CreateTemporaryConfigurationFile("legacy-url-mappings.yml");
 		// reading from synonyms.yml is temporary. If you spot this again as a future reader, feel free to remove it.
 		SearchFile = CreateTemporaryConfigurationFile("search.yml", "synonyms.yml");
@@ -109,6 +115,9 @@ public ConfigurationFileProvider(
 
 	public IFileInfo NavigationFile { get; private set; }
 
+	/// <summary>Optional — present only when <c>config/navigation-v2.yml</c> exists.</summary>
+	public IFileInfo? NavigationV2File { get; }
+
 	public IFileInfo VersionFile { get; }
 
 	public IFileInfo ProductsFile { get; }
@@ -193,6 +202,31 @@ public IFileInfo CreateNavigationFile(AssemblyConfiguration configuration)
 
 	}
 
+	private IFileInfo? TryCreateTemporaryConfigurationFile(string fileName)
+	{
+		if (ConfigurationSource == ConfigurationSource.Local)
+		{
+			var localPath = GetLocalPath(fileName);
+			if (!_fileSystem.File.Exists(localPath))
+				return null;
+		}
+		else if (ConfigurationSource == ConfigurationSource.Remote)
+		{
+			var appDataPath = GetAppDataPath(fileName);
+			if (!_fileSystem.File.Exists(appDataPath))
+				return null;
+		}
+		else
+		{
+			// Embedded — check if resource exists
+			var resourceName = $"{_assemblyName}.{fileName}";
+			if (typeof(ConfigurationFileProvider).Assembly.GetManifestResourceStream(resourceName) is null)
+				return null;
+		}
+
+		return CreateTemporaryConfigurationFile(fileName);
+	}
+
 	private IFileInfo CreateTemporaryConfigurationFile(string fileName, string? fallback = null)
 	{
 		using var stream = GetLocalOrEmbedded(fileName, fallback);
diff --git a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
new file mode 100644
index 0000000000..7088ee3b3b
--- /dev/null
+++ b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
@@ -0,0 +1,141 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using YamlDotNet.Core;
+using YamlDotNet.Core.Events;
+using YamlDotNet.Serialization;
+
+namespace Elastic.Documentation.Configuration.Toc;
+
+public interface INavV2Item { }
+
+public record LabelNavV2Item(
+	string Label,
+	bool Expanded,
+	IReadOnlyList<INavV2Item> Children
+) : INavV2Item;
+
+public record TocNavV2Item(
+	Uri Source,
+	IReadOnlyList<INavV2Item> Children
+) : INavV2Item;
+
+/// <summary>
+/// Represents a single-page crosslink (when <see cref="Page"/> is non-null) or
+/// a placeholder disabled link (when <see cref="Page"/> is null and only <see cref="Title"/> is set).
+/// </summary>
+public record PageNavV2Item(Uri? Page, string? Title) : INavV2Item;
+
+public class NavigationV2File
+{
+	[YamlMember(Alias = "nav")]
+	public IReadOnlyList<INavV2Item> Nav { get; set; } = [];
+
+	public static NavigationV2File Deserialize(string yaml) =>
+		ConfigurationFileProvider.NavV2Deserializer.Deserialize<NavigationV2File>(yaml);
+}
+
+public class NavV2FileYamlConverter : IYamlTypeConverter
+{
+	public bool Accepts(Type type) => type == typeof(NavigationV2File) || type == typeof(INavV2Item);
+
+	public object? ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)
+	{
+		if (type == typeof(NavigationV2File))
+			return ReadFile(parser, rootDeserializer);
+		return ReadItem(parser, rootDeserializer);
+	}
+
+	private static NavigationV2File ReadFile(IParser parser, ObjectDeserializer rootDeserializer)
+	{
+		if (!parser.TryConsume<MappingStart>(out _))
+			return new NavigationV2File();
+
+		var file = new NavigationV2File();
+		while (!parser.TryConsume<MappingEnd>(out _))
+		{
+			var key = parser.Consume<Scalar>();
+			if (key.Value == "nav")
+				file.Nav = ReadItemList(parser, rootDeserializer);
+			else
+				parser.SkipThisAndNestedEvents();
+		}
+		return file;
+	}
+
+	private static IReadOnlyList<INavV2Item> ReadItemList(IParser parser, ObjectDeserializer rootDeserializer)
+	{
+		var items = new List<INavV2Item>();
+		if (!parser.TryConsume<SequenceStart>(out _))
+			return items;
+
+		while (!parser.TryConsume<SequenceEnd>(out _))
+		{
+			var item = ReadItem(parser, rootDeserializer);
+			if (item is not null)
+				items.Add(item);
+		}
+		return items;
+	}
+
+	private static INavV2Item? ReadItem(IParser parser, ObjectDeserializer rootDeserializer)
+	{
+		if (!parser.TryConsume<MappingStart>(out _))
+			return null;
+
+		var dict = new Dictionary<string, object?>();
+		while (!parser.TryConsume<MappingEnd>(out _))
+		{
+			var key = parser.Consume<Scalar>();
+			if (key.Value == "children")
+				dict["children"] = ReadItemList(parser, rootDeserializer);
+			else if (parser.Accept<Scalar>(out var val))
+			{
+				dict[key.Value] = val.Value;
+				_ = parser.MoveNext();
+			}
+			else
+				parser.SkipThisAndNestedEvents();
+		}
+
+		if (dict.TryGetValue("label", out var labelVal) && labelVal is string labelStr)
+		{
+			var expanded = dict.TryGetValue("expanded", out var expVal)
+				&& expVal is string expStr
+				&& bool.TryParse(expStr, out var expBool)
+				&& expBool;
+			var labelChildren = dict.TryGetValue("children", out var lch) && lch is IReadOnlyList<INavV2Item> lChildList
+				? lChildList
+				: [];
+			return new LabelNavV2Item(labelStr, expanded, labelChildren);
+		}
+
+		if (dict.TryGetValue("toc", out var tocVal) && tocVal is string tocStr)
+		{
+			var uriString = tocStr.Contains("://") ? tocStr : $"docs-content://{tocStr}";
+			if (!Uri.TryCreate(uriString, UriKind.Absolute, out var source))
+				throw new InvalidOperationException($"Invalid TOC source: '{tocStr}'");
+			var tocChildren = dict.TryGetValue("children", out var tch) && tch is IReadOnlyList<INavV2Item> tChildList
+				? tChildList
+				: [];
+			return new TocNavV2Item(source, tocChildren);
+		}
+
+		if (dict.TryGetValue("page", out var pageVal) && pageVal is string pageStr)
+		{
+			var uriString = pageStr.Contains("://") ? pageStr : $"docs-content://{pageStr}";
+			_ = Uri.TryCreate(uriString, UriKind.Absolute, out var pageUri);
+			var title = dict.TryGetValue("title", out var t) && t is string ts ? ts : null;
+			return new PageNavV2Item(pageUri, title);
+		}
+
+		if (dict.TryGetValue("title", out var titleVal) && titleVal is string titleStr)
+			return new PageNavV2Item(null, titleStr);
+
+		return null;
+	}
+
+	public void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer serializer) =>
+		serializer.Invoke(value, type);
+}
diff --git a/src/Elastic.Documentation.Navigation/V2/LabelNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/LabelNavigationNode.cs
new file mode 100644
index 0000000000..06b2340257
--- /dev/null
+++ b/src/Elastic.Documentation.Navigation/V2/LabelNavigationNode.cs
@@ -0,0 +1,74 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Documentation.Extensions;
+
+namespace Elastic.Documentation.Navigation.V2;
+
+/// <summary>
+/// A non-clickable section heading in the V2 navigation sidebar.
+/// Has children but no URL of its own.
+/// </summary>
+public class LabelNavigationNode : INodeNavigationItem<INavigationModel, INavigationItem>
+{
+	private readonly LabelIndexLeaf _index;
+
+	public LabelNavigationNode(
+		string label,
+		bool expandedByDefault,
+		IReadOnlyCollection<INavigationItem> children,
+		INodeNavigationItem<INavigationModel, INavigationItem>? parent
+	)
+	{
+		Id = ShortId.Create("label");
+		NavigationTitle = label;
+		ExpandedByDefault = expandedByDefault;
+		NavigationItems = children;
+		Parent = parent;
+		NavigationRoot = parent?.NavigationRoot!;
+		_index = new LabelIndexLeaf(this);
+	}
+
+	/// <summary>Whether this label section starts expanded by default.</summary>
+	public bool ExpandedByDefault { get; }
+
+	/// <inheritdoc />
+	public string Id { get; }
+
+	/// <inheritdoc />
+	public string Url => string.Empty;
+
+	/// <inheritdoc />
+	public string NavigationTitle { get; }
+
+	/// <inheritdoc />
+	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
+
+	/// <inheritdoc />
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
+
+	/// <inheritdoc />
+	public bool Hidden => false;
+
+	/// <inheritdoc />
+	public int NavigationIndex { get; set; }
+
+	/// <inheritdoc />
+	public ILeafNavigationItem<INavigationModel> Index => _index;
+
+	/// <inheritdoc />
+	public IReadOnlyCollection<INavigationItem> NavigationItems { get; }
+
+	private sealed class LabelIndexLeaf(LabelNavigationNode owner)
+		: ILeafNavigationItem<INavigationModel>, INavigationModel
+	{
+		public INavigationModel Model => this;
+		public string Url => string.Empty;
+		public string NavigationTitle => owner.NavigationTitle;
+		public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot => owner.NavigationRoot;
+		public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; } = owner;
+		public bool Hidden => true;
+		public int NavigationIndex { get; set; }
+	}
+}
diff --git a/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationLeaf.cs b/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationLeaf.cs
new file mode 100644
index 0000000000..cdc42adca8
--- /dev/null
+++ b/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationLeaf.cs
@@ -0,0 +1,36 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+namespace Elastic.Documentation.Navigation.V2;
+
+/// <summary>
+/// A disabled placeholder link in the V2 navigation sidebar.
+/// Has a title but no URL — rendered with <c>cursor-not-allowed</c>.
+/// </summary>
+public class PlaceholderNavigationLeaf(
+	string title,
+	INodeNavigationItem<INavigationModel, INavigationItem>? parent
+) : ILeafNavigationItem<INavigationModel>, INavigationModel
+{
+	/// <inheritdoc />
+	public INavigationModel Model => this;
+
+	/// <inheritdoc />
+	public string Url => string.Empty;
+
+	/// <inheritdoc />
+	public string NavigationTitle { get; } = title;
+
+	/// <inheritdoc />
+	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; } = parent?.NavigationRoot!;
+
+	/// <inheritdoc />
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; } = parent;
+
+	/// <inheritdoc />
+	public bool Hidden => false;
+
+	/// <inheritdoc />
+	public int NavigationIndex { get; set; }
+}
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
new file mode 100644
index 0000000000..61ce162d22
--- /dev/null
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -0,0 +1,81 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Documentation.Configuration.Assembler;
+using Elastic.Documentation.Configuration.Toc;
+using Elastic.Documentation.Navigation.Assembler;
+using Elastic.Documentation.Navigation.Isolated.Node;
+
+namespace Elastic.Documentation.Navigation.V2;
+
+/// <summary>
+/// Extends <see cref="SiteNavigation"/> with a V2 label-structured sidebar tree derived from
+/// <c>navigation-v2.yml</c>. Content is built at the same URL paths as V1 (the original
+/// <paramref name="originalFile"/> is passed to the base constructor unchanged).
+/// Only the sidebar presentation changes — <see cref="V2NavigationItems"/> exposes the
+/// label/placeholder hierarchy used by <c>_TocTreeNavV2.cshtml</c>.
+/// </summary>
+public class SiteNavigationV2 : SiteNavigation
+{
+	public SiteNavigationV2(
+		NavigationV2File v2File,
+		SiteNavigationFile originalFile,
+		IDocumentationContext context,
+		IReadOnlyCollection<IDocumentationSetNavigation> documentationSetNavigations,
+		string? sitePrefix
+	) : base(originalFile, context, documentationSetNavigations, sitePrefix)
+		=> V2NavigationItems = BuildV2Items(v2File.Nav, Nodes, this, depth: 0);
+
+	/// <summary>
+	/// Label-structured navigation items for V2 sidebar rendering.
+	/// Contains <see cref="LabelNavigationNode"/>, <see cref="PlaceholderNavigationLeaf"/>,
+	/// and existing <see cref="IRootNavigationItem{TIndex,TChildNavigation}"/> nodes.
+	/// </summary>
+	public IReadOnlyList<INavigationItem> V2NavigationItems { get; }
+
+	private static IReadOnlyList<INavigationItem> BuildV2Items(
+		IReadOnlyList<INavV2Item> v2Items,
+		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
+		INodeNavigationItem<INavigationModel, INavigationItem> parent,
+		int depth
+	)
+	{
+		var result = new List<INavigationItem>();
+		foreach (var item in v2Items)
+		{
+			var navItem = CreateV2NavigationItem(item, nodes, parent, depth);
+			if (navItem is not null)
+				result.Add(navItem);
+		}
+		return result;
+	}
+
+	private static INavigationItem? CreateV2NavigationItem(
+		INavV2Item item,
+		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
+		INodeNavigationItem<INavigationModel, INavigationItem> parent,
+		int depth
+	) =>
+		item switch
+		{
+			LabelNavV2Item label => CreateLabel(label, nodes, parent, depth),
+			TocNavV2Item toc => nodes.TryGetValue(toc.Source, out var node) ? node : null,
+			PageNavV2Item { Page: null, Title: var title } => new PlaceholderNavigationLeaf(title ?? "Untitled", parent),
+			PageNavV2Item { Title: var title } page => new PlaceholderNavigationLeaf(title ?? page.Page?.ToString() ?? "Unknown", parent),
+			_ => null
+		};
+
+	private static LabelNavigationNode CreateLabel(
+		LabelNavV2Item label,
+		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
+		INodeNavigationItem<INavigationModel, INavigationItem> parent,
+		int depth
+	)
+	{
+		// Build a temporary label so it can be used as parent for its children
+		var placeholder = new LabelNavigationNode(label.Label, label.Expanded, [], parent);
+		var children = BuildV2Items(label.Children, nodes, placeholder, depth + 1);
+		return new LabelNavigationNode(label.Label, label.Expanded, children, parent);
+	}
+}
diff --git a/src/Elastic.Documentation.Site/Assets/main.ts b/src/Elastic.Documentation.Site/Assets/main.ts
index c67b85dfa5..76aa8632b0 100644
--- a/src/Elastic.Documentation.Site/Assets/main.ts
+++ b/src/Elastic.Documentation.Site/Assets/main.ts
@@ -7,6 +7,7 @@ import { initImageCarousel } from './image-carousel'
 import { initMermaid } from './mermaid'
 import { openDetailsWithAnchor } from './open-details-with-anchor'
 import { initNav } from './pages-nav'
+import { initNavV2 } from './pages-nav-v2'
 import { initSmoothScroll } from './smooth-scroll'
 import { initTabs } from './tabs'
 import { initializeOtel } from './telemetry/instrumentation'
@@ -114,7 +115,12 @@ document.addEventListener('htmx:load', function () {
     initAppliesSwitch()
     initMath()
     initMermaid()
-    initNav()
+    const v2Nav = document.querySelector<HTMLElement>('[data-nav-v2]')
+    if (v2Nav) {
+        initNavV2(v2Nav)
+    } else {
+        initNav()
+    }
 
     initSmoothScroll()
     openDetailsWithAnchor()
diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
new file mode 100644
index 0000000000..73ec01b106
--- /dev/null
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -0,0 +1,66 @@
+import { $, $$ } from 'select-dom'
+
+/**
+ * Returns all sibling top-level accordion checkboxes for a given checkbox.
+ * Siblings are other checkboxes inside [data-v2-accordion] elements at the
+ * same nesting level as the given checkbox's ancestor accordion.
+ */
+function getSiblingAccordionCheckboxes(
+    checkbox: HTMLInputElement
+): HTMLInputElement[] {
+    const accordion = checkbox.closest('[data-v2-accordion]')
+    if (!accordion) return []
+
+    const parent = accordion.parentElement
+    if (!parent) return []
+
+    return Array.from(
+        parent.querySelectorAll<HTMLInputElement>(
+            '[data-v2-accordion] > .peer input[type=checkbox]'
+        )
+    ).filter((cb) => cb !== checkbox)
+}
+
+/**
+ * Accordion behaviour: when a top-level section is opened,
+ * collapse all its siblings so only one section is expanded at a time.
+ */
+function initAccordion(nav: HTMLElement) {
+    nav.querySelectorAll<HTMLInputElement>(
+        '[data-v2-accordion] > .peer input[type=checkbox]'
+    ).forEach((cb) => {
+        cb.addEventListener('change', (e) => {
+            const target = e.target as HTMLInputElement
+            if (target.checked) {
+                getSiblingAccordionCheckboxes(target).forEach((sibling) => {
+                    sibling.checked = false
+                })
+            }
+        })
+    })
+}
+
+/**
+ * Mark the current page's nav link with the "current" CSS class.
+ * Unlike the V1 nav, we do NOT auto-expand parent sections —
+ * progressive disclosure keeps all sections collapsed until the user opens them.
+ */
+function markCurrentPage(nav: HTMLElement) {
+    // Remove stale current markers
+    $$('.current', nav).forEach((el) => el.classList.remove('current'))
+
+    const pathname = window.location.pathname.replace(/\/$/, '')
+    $$(
+        `a[href="${pathname}"], a[href="${pathname}/"]`,
+        nav
+    ).forEach((el) => el.classList.add('current'))
+}
+
+/**
+ * Initialize all V2 nav behaviours on the given sidebar element.
+ * Call this on every htmx:load when [data-nav-v2] is present.
+ */
+export function initNavV2(nav: HTMLElement) {
+    initAccordion(nav)
+    markCurrentPage(nav)
+}
diff --git a/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs b/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
index fb0dc7edea..57c7b6b9c9 100644
--- a/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
+++ b/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
@@ -23,4 +23,7 @@ public class NavigationViewModel
 	public required IHtmxAttributeProvider Htmx { get; init; }
 
 	public BuildType BuildType { get; init; } = BuildType.Isolated;
+
+	/// <summary>When true, the sidebar renders using the V2 nav partial with accordion behaviour.</summary>
+	public bool IsNavV2 { get; init; }
 }
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
index 812e7d7e21..d1eb8bade6 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
@@ -1,5 +1,6 @@
 @using Elastic.Documentation
 @using Elastic.Documentation.Site.Navigation
+@using Elastic.Documentation.Navigation
 @inherits RazorSlice<Elastic.Documentation.Site.Navigation.NavigationViewModel>
 
 <div class="pb-9 pl-3 md:pl-0 font-body">
@@ -67,15 +68,34 @@
 		</div>
 	</div>
 
-	<ul class="block px-4" id="nav-tree">
-		@await RenderPartialAsync(_TocTreeNav.Create(new NavigationTreeItem
-		{
-			IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
-			IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
-			Level = 0,
-			SubTree = Model.Tree,
-			RootNavigationId = Model.Tree.Id,
-			Htmx = Model.Htmx
-		}))
-	</ul>
+	@if (Model.IsNavV2)
+	{
+		<nav data-nav-v2>
+			<ul class="block px-4" id="nav-tree">
+				@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
+				{
+					IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
+					IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
+					Level = 0,
+					SubTree = Model.Tree,
+					RootNavigationId = Model.Tree.Id,
+					Htmx = Model.Htmx
+				}))
+			</ul>
+		</nav>
+	}
+	else
+	{
+		<ul class="block px-4" id="nav-tree">
+			@await RenderPartialAsync(_TocTreeNav.Create(new NavigationTreeItem
+			{
+				IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
+				IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
+				Level = 0,
+				SubTree = Model.Tree,
+				RootNavigationId = Model.Tree.Id,
+				Htmx = Model.Htmx
+			}))
+		</ul>
+	}
 </div>
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
new file mode 100644
index 0000000000..6471b6843b
--- /dev/null
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -0,0 +1,148 @@
+@using Elastic.Documentation.Navigation
+@using Elastic.Documentation.Navigation.Isolated
+@using Elastic.Documentation.Navigation.Isolated.Leaf
+@using Elastic.Documentation.Navigation.V2
+@using Elastic.Documentation.Site.Navigation
+@inherits RazorSlice<NavigationTreeItem>
+@{
+	var isTopLevel = Model.Level == 0;
+}
+@foreach (var item in Model.SubTree.NavigationItems)
+{
+	if (item.Hidden)
+	{
+		continue;
+	}
+
+	if (item is LabelNavigationNode label)
+	{
+		var labelId = $"v2-label-{label.Id}";
+		<li class="flex flex-wrap @(isTopLevel ? "mt-6" : "mt-4") relative" data-v2-accordion>
+			<div class="peer grid grid-cols-[1fr_auto] w-full">
+				<span class="@(isTopLevel ? "font-semibold text-ink" : "") content-center py-1 pr-2 text-sm select-none">
+					@label.NavigationTitle
+				</span>
+				@if (label.NavigationItems.Count > 0)
+				{
+					<label for="@labelId" class="group/label flex mr-2 items-start">
+						<div class="hover:bg-grey-20 rounded-sm p-1 cursor-pointer">
+							<svg
+								xmlns="http://www.w3.org/2000/svg"
+								fill="none"
+								viewBox="0 0 24 24"
+								stroke-width="1.5"
+								stroke="currentColor"
+								class="shrink-0 -rotate-90 group-has-checked/label:rotate-0 w-3.5">
+								<path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/>
+							</svg>
+						</div>
+						<input
+							id="@labelId"
+							type="checkbox"
+							class="hidden"
+							aria-hidden="true"
+							@(label.ExpandedByDefault ? "checked" : "")>
+					</label>
+				}
+			</div>
+			@if (label.NavigationItems.Count > 0)
+			{
+				<ul class="w-full hidden peer-has-checked:block ml-4 relative before:content-[''] before:absolute before:-left-[calc(var(--spacing)*4-1px)] before:top-0 before:bottom-0 before:w-px before:bg-grey-20 before:peer-has-checked:block">
+					@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
+					{
+						IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
+						IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
+						Level = Model.Level + 1,
+						SubTree = label,
+						RootNavigationId = Model.RootNavigationId,
+						Htmx = Model.Htmx
+					}))
+				</ul>
+			}
+		</li>
+	}
+	else if (item is PlaceholderNavigationLeaf placeholder)
+	{
+		<li class="flex group/li pr-8 @(isTopLevel ? "font-semibold mt-6" : "mt-4")">
+			<a
+				class="sidebar-link grow text-grey-40 cursor-not-allowed"
+				aria-disabled="true"
+				tabindex="-1">
+				@placeholder.NavigationTitle
+			</a>
+		</li>
+	}
+	else if (item is INodeNavigationItem<INavigationModel, INavigationItem> { NavigationItems.Count: 0 } group)
+	{
+		<li class="flex group/li pr-8 @(isTopLevel ? "font-semibold mt-6" : "mt-4")">
+			<a
+				href="@group.Url"
+				@Model.Htmx.GetNavHxAttributes(true)
+				class="sidebar-link group-[.current]/li:text-blue-elastic!"
+			>
+				@group.NavigationTitle
+			</a>
+		</li>
+	}
+	else if (item is INodeNavigationItem<INavigationModel, INavigationItem> folder)
+	{
+		var allHidden = folder.NavigationItems.All(n => n.Hidden);
+		<li class="flex flex-wrap group-navigation @(isTopLevel ? "mt-6" : "mt-4") relative">
+			<div class="peer grid grid-cols-[1fr_auto] w-full">
+				<a
+					href="@(folder.Url)"
+					@Model.Htmx.GetNavHxAttributes(true)
+					class="sidebar-link pr-2 content-center @(isTopLevel ? "font-semibold" : "") group-[.current]/li:text-blue-elastic!">
+					@(folder.NavigationTitle)
+				</a>
+				@if (!allHidden)
+				{
+					<label for="@folder.Id" class="group/label flex mr-2 items-start">
+						<div class="hover:bg-grey-20 rounded-sm p-1 cursor-pointer">
+							<svg
+								xmlns="http://www.w3.org/2000/svg"
+								fill="none"
+								viewBox="0 0 24 24"
+								stroke-width="1.5"
+								stroke="currentColor"
+								class="shrink-0 -rotate-90 group-has-checked/label:rotate-0 w-3.5">
+								<path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/>
+							</svg>
+						</div>
+						<input
+							id="@folder.Id"
+							type="checkbox"
+							class="hidden"
+							aria-hidden="true">
+					</label>
+				}
+			</div>
+			@if (folder.NavigationItems.Count > 0)
+			{
+				<ul class="w-full hidden peer-has-checked:block ml-4 relative before:content-[''] before:absolute before:-left-[calc(var(--spacing)*4-1px)] before:top-0 before:bottom-0 before:w-px before:bg-grey-20 before:peer-has-checked:block peer-has-[.current]:before:bg-grey-40 has-[.current]:before:bg-grey-40">
+					@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
+					{
+						IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
+						IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
+						Level = Model.Level + 1,
+						SubTree = folder,
+						RootNavigationId = Model.RootNavigationId,
+						Htmx = Model.Htmx
+					}))
+				</ul>
+			}
+		</li>
+	}
+	else if (item is ILeafNavigationItem<INavigationModel> leaf)
+	{
+		<li class="flex group/li pr-8 @(isTopLevel ? "font-semibold mt-6" : "mt-4")">
+			<a
+				href="@leaf.Url"
+				@Model.Htmx.GetNavHxAttributes(true)
+				class="sidebar-link grow group-[.current]/li:text-blue-elastic!"
+			>
+				@leaf.NavigationTitle
+			</a>
+		</li>
+	}
+}
diff --git a/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs b/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
index 54e294f9fd..7161020555 100644
--- a/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
+++ b/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
@@ -9,10 +9,12 @@
 using Elastic.Documentation.Assembler.Sourcing;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Assembler;
+using Elastic.Documentation.Configuration.Builder;
 using Elastic.Documentation.Configuration.Toc;
 using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.LegacyDocs;
 using Elastic.Documentation.Navigation.Assembler;
+using Elastic.Documentation.Navigation.V2;
 using Elastic.Documentation.Services;
 using Microsoft.Extensions.Logging;
 
@@ -102,12 +104,33 @@ Cancel ctx
 		var navigationFileInfo = configurationContext.ConfigurationFileProvider.NavigationFile;
 		var siteNavigationFile = SiteNavigationFile.Deserialize(await fs.File.ReadAllTextAsync(navigationFileInfo.FullName, ctx));
 		var documentationSets = assembleSources.AssembleSets.Values.Select(s => s.DocumentationSet.Navigation).ToArray();
-		var navigation = new SiteNavigation(siteNavigationFile, assembleContext, documentationSets, assembleContext.Environment.PathPrefix);
+
+		// Normalise keys from assembler.yml (e.g. NAV_V2 → nav-v2) before checking flags
+		var featureFlags = new FeatureFlags([]);
+		foreach (var (key, value) in assembleContext.Environment.FeatureFlags)
+			featureFlags.Set(key, value);
+
+		var navV2FileInfo = configurationContext.ConfigurationFileProvider.NavigationV2File;
+		SiteNavigation navigation;
+		if (featureFlags.NavV2Enabled && navV2FileInfo is not null)
+		{
+			_logger.LogInformation("nav-v2 feature flag enabled — loading navigation-v2.yml");
+			var v2File = NavigationV2File.Deserialize(await fs.File.ReadAllTextAsync(navV2FileInfo.FullName, ctx));
+			navigation = new SiteNavigationV2(v2File, siteNavigationFile, assembleContext, documentationSets, assembleContext.Environment.PathPrefix);
+		}
+		else
+		{
+			navigation = new SiteNavigation(siteNavigationFile, assembleContext, documentationSets, assembleContext.Environment.PathPrefix);
+		}
 
 		_logger.LogInformation("Validating navigation.yml does not contain colliding path prefixes");
-		// this validates all path prefixes are unique, early exit if duplicates are detected
-		if (!SiteNavigationFile.ValidatePathPrefixes(assembleContext.Collector, siteNavigationFile, navigationFileInfo) || assembleContext.Collector.Errors > 0)
-			return false;
+		// Skip path prefix validation for V2 nav — prefixes are auto-derived
+		if (navigation is not SiteNavigationV2)
+		{
+			// this validates all path prefixes are unique, early exit if duplicates are detected
+			if (!SiteNavigationFile.ValidatePathPrefixes(assembleContext.Collector, siteNavigationFile, navigationFileInfo) || assembleContext.Collector.Errors > 0)
+				return false;
+		}
 
 		var pathProvider = new GlobalNavigationPathProvider(navigation, assembleSources, assembleContext);
 		using var htmlWriter = new GlobalNavigationHtmlWriter(logFactory, navigation, collector);
diff --git a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
index a833213cc3..49af8a0d33 100644
--- a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -7,6 +7,7 @@
 using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.Navigation;
 using Elastic.Documentation.Navigation.Assembler;
+using Elastic.Documentation.Navigation.V2;
 using Elastic.Documentation.Site;
 using Elastic.Documentation.Site.Navigation;
 using Microsoft.Extensions.Logging;
@@ -28,6 +29,10 @@ public async Task<NavigationRenderResult> RenderNavigation(
 		Cancel ctx = default
 	)
 	{
+		// V2 nav: always render the full V2 tree regardless of current section
+		if (globalNavigation is SiteNavigationV2 navV2)
+			return await RenderV2Navigation(navV2, ctx);
+
 		if (currentRootNavigation is SiteNavigation)
 			return NavigationRenderResult.Empty;
 
@@ -64,6 +69,50 @@ public async Task<NavigationRenderResult> RenderNavigation(
 		}
 	}
 
+	private const string NavV2CacheKey = "nav-v2";
+
+	private async Task<NavigationRenderResult> RenderV2Navigation(SiteNavigationV2 navV2, Cancel ctx)
+	{
+		if (_renderedNavigationCache.TryGetValue(NavV2CacheKey, out var cachedHtml))
+			return new NavigationRenderResult { Html = cachedHtml, Id = NavV2CacheKey };
+
+		await _semaphore.WaitAsync(ctx);
+		try
+		{
+			if (_renderedNavigationCache.TryGetValue(NavV2CacheKey, out cachedHtml))
+				return new NavigationRenderResult { Html = cachedHtml, Id = NavV2CacheKey };
+
+			_logger.LogInformation("Rendering V2 navigation");
+
+			var model = CreateV2NavigationModel(navV2);
+			var html = await ((INavigationHtmlWriter)this).Render(model, ctx);
+			_renderedNavigationCache[NavV2CacheKey] = html;
+			return new NavigationRenderResult { Html = html, Id = NavV2CacheKey };
+		}
+		finally
+		{
+			_ = _semaphore.Release();
+		}
+	}
+
+	private static NavigationViewModel CreateV2NavigationModel(SiteNavigationV2 navV2)
+	{
+		var syntheticV2Root = new SiteNavigationV2Wrapper(navV2);
+		return new NavigationViewModel
+		{
+			Title = "Elastic Docs",
+			TitleUrl = navV2.Url,
+			Tree = syntheticV2Root,
+			IsPrimaryNavEnabled = true,
+			IsUsingNavigationDropdown = false,
+			IsGlobalAssemblyBuild = true,
+			TopLevelItems = [],
+			Htmx = new DefaultHtmxAttributeProvider("/"),
+			BuildType = BuildType.Assembler,
+			IsNavV2 = true
+		};
+	}
+
 	private NavigationViewModel CreateNavigationModel(INodeNavigationItem<INavigationModel, INavigationItem> group)
 	{
 		var topLevelItems = globalNavigation.TopLevelItems;
@@ -86,4 +135,22 @@ public void Dispose()
 		_semaphore.Dispose();
 		GC.SuppressFinalize(this);
 	}
+
+	/// <summary>
+	/// Thin wrapper so <see cref="SiteNavigationV2.V2NavigationItems"/> is exposed as
+	/// <see cref="INodeNavigationItem{TIndex,TChildNavigation}.NavigationItems"/> for the Razor partial.
+	/// </summary>
+	private sealed class SiteNavigationV2Wrapper(SiteNavigationV2 navV2)
+		: INodeNavigationItem<INavigationModel, INavigationItem>
+	{
+		public string Id => "nav-v2-root";
+		public string Url => navV2.Url;
+		public string NavigationTitle => navV2.NavigationTitle;
+		public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot => navV2;
+		public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
+		public bool Hidden => false;
+		public int NavigationIndex { get; set; }
+		public ILeafNavigationItem<INavigationModel> Index => navV2.Index;
+		public IReadOnlyCollection<INavigationItem> NavigationItems => navV2.V2NavigationItems;
+	}
 }

From 0f58ae06f323845a48caae9e7187e08a6eecb0bb Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 09:59:42 +0100
Subject: [PATCH 002/226] Fix accordion: unique IDs per label section
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ShortId.Create("label") always produced the same SHA256 hash, so all
8 label checkboxes shared id="v2-label-1ACA80E8". Every <label for="">
targeted the first checkbox, making only "Get Started" expandable.

Fix: include the label text in the hash — ShortId.Create("label", label).

Also updates nav-v2-status.md to reflect verified accordion behaviour.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 nav-v2-status.md                              | 29 ++++++++++---------
 .../V2/LabelNavigationNode.cs                 |  2 +-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/nav-v2-status.md b/nav-v2-status.md
index 238ec65615..dd21c993ad 100644
--- a/nav-v2-status.md
+++ b/nav-v2-status.md
@@ -21,17 +21,18 @@ Content is built at **the same URL paths as V1** — the V2 flag changes only th
 
 ---
 
-## Current state: build green, awaiting assembler re-build
+## Current state: working ✓
 
 `./build.sh build` passes (lint + compile + all unit tests).
-The assembler serve at `localhost:4000` still shows the **old nav** because it was built before two bugs were fixed. User needs to re-run `assembler build` to get the fixed output.
+Accordion expand/collapse verified in-browser with Playwright.
 
-### Bugs fixed in this session
+### Bugs fixed
 
 | # | Bug | Fix |
 |---|-----|-----|
 | 1 | Feature flag never fired — `assembler.yml` sets `NAV_V2` (underscore) but `FeatureFlags(dict)` stores keys as-is; `IsEnabled("nav-v2")` never matched | Use `featureFlags.Set(key, value)` in `AssemblerBuildService` to normalise keys before lookup |
 | 2 | Content built at `/docs/l2/get-started/` instead of `/docs/get-started/` — `SiteNavigationV2` was synthesising a new nav file with `l{depth+1}/` prefixes | Pass the original `SiteNavigationFile` to the base constructor; V2 only changes sidebar rendering |
+| 3 | All label checkboxes shared the same ID (`v2-label-1ACA80E8`) — `ShortId.Create("label")` is a deterministic SHA256 hash; every `<label for="...">` targeted the same first checkbox, so only "Get Started" could ever open | `LabelNavigationNode`: `ShortId.Create("label", label)` — include the label text in the hash |
 
 ---
 
@@ -82,24 +83,26 @@ HtmlWriter.RenderLayout (called per page)
 
 ---
 
-## Next steps / open items
+## Verified behaviours ✓
 
-1. **Re-run assembler build** to see V2 nav in the browser.
+- Label sections visible as non-clickable headings with chevron toggle
+- `expanded: true` on "Reference" → starts open on page load
+- Clicking a collapsed section opens it
+- Opening one section collapses previously-open sibling (accordion)
+- All other sections remain collapsed until clicked
 
-2. **Verify accordion works** — click a top-level label to expand; click another to confirm the first collapses.
-
-3. **Verify `expanded: true`** — "Reference" section in `navigation-v2.yml` has `expanded: true`; confirm it starts open.
+---
 
-4. **Current-page highlighting** — `pages-nav-v2.ts` marks the active link; confirm it highlights the right item without auto-expanding parents.
+## Open items / next steps
 
-5. **`navigation-v2.yml` content** — currently mirrors V1 structure exactly. The whole point of V2 is to let you freely rearrange this file. The skeleton has these top-level labels:
+1. **`navigation-v2.yml` content** — currently mirrors V1 structure exactly. The whole point of V2 is to freely rearrange this file. The skeleton has these top-level labels:
    - Get Started, Solutions, Manage Data, Explore & Analyze, Deploy & Manage, Cloud Account, Troubleshoot, Reference
 
-6. **Placeholder / page crosslinks** — `page:` items in `navigation-v2.yml` currently render as disabled placeholders (prototype shortcut). Wire up real cross-link resolution if needed.
+2. **Current-page highlighting** — `pages-nav-v2.ts` marks the active link; verify it highlights the right item without auto-expanding parents.
 
-7. **`l{depth+1}/` parallel paths** — dropped for now (content stays at V1 paths). Could be re-added later if the team wants to preview a new IA at separate URLs while keeping V1 live.
+3. **Placeholder / page crosslinks** — `page:` items in `navigation-v2.yml` currently render as disabled placeholders (prototype shortcut). Wire up real cross-link resolution if needed.
 
-8. **Uncommitted** — nothing is committed yet. All changes are working-tree only.
+4. **`l{depth+1}/` parallel paths** — dropped for now (content stays at V1 paths). Could be re-added later if the team wants to preview a new IA at separate URLs while keeping V1 live.
 
 ---
 
diff --git a/src/Elastic.Documentation.Navigation/V2/LabelNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/LabelNavigationNode.cs
index 06b2340257..5588fd3206 100644
--- a/src/Elastic.Documentation.Navigation/V2/LabelNavigationNode.cs
+++ b/src/Elastic.Documentation.Navigation/V2/LabelNavigationNode.cs
@@ -21,7 +21,7 @@ public LabelNavigationNode(
 		INodeNavigationItem<INavigationModel, INavigationItem>? parent
 	)
 	{
-		Id = ShortId.Create("label");
+		Id = ShortId.Create("label", label);
 		NavigationTitle = label;
 		ExpandedByDefault = expandedByDefault;
 		NavigationItems = children;

From 407c4773ba0e2814a652d1d9ca3453d0378ed4d0 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 10:24:21 +0100
Subject: [PATCH 003/226] Rewrite navigation-v2.yml with proposed IA (6
 top-level labels, nested labels)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Translates the team's proposed information architecture into the V2 nav:

Top-level labels:
  • Elasticsearch fundamentals (get-started + placeholder concepts)
  • Install, deploy, and administer (deploy-manage + cloud-account)
  • The Elasticsearch Platform (container for nested labels)
  • Solutions and project types (solutions)
  • Reference (elasticsearch + kibana)
  • Troubleshooting (troubleshoot)

"The Elasticsearch Platform" has three nested labels:
  • Ingest and manage data → toc: manage-data
  • Search, visualize, and analyze → toc: explore-analyze
  • AI and machine learning → title: placeholders (content lives in
    explore-analyze today; dedicated toc roots needed to wire up)

Nested labels work with no code changes — the YAML parser, SiteNavigationV2
builder, and _TocTreeNavV2 partial already recurse through children at any
depth. The Razor partial applies level-aware styling (font-semibold at
level 0, lighter weight at depth 1+).

Also documents the proposed IA mapping and content split analysis
in nav-v2-status.md.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/navigation-v2.yml |  94 +++++++++++++++++++++++++++------
 nav-v2-status.md         | 109 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 182 insertions(+), 21 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index e4867956f4..a7d6279c48 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -1,34 +1,96 @@
 nav:
-  - label: Get Started
+  # ─────────────────────────────────────────────────────────────
+  # Elasticsearch fundamentals
+  # Content: get-started + conceptual/architecture pages that
+  # currently live in the ES reference but belong here editorially.
+  # ─────────────────────────────────────────────────────────────
+  - label: Elasticsearch fundamentals
     children:
       - toc: get-started
+      - title: What is Elasticsearch?
+      - title: Core concepts (indices, shards, mappings)
+      - title: Architecture and scalability
 
-  - label: Solutions
+  # ─────────────────────────────────────────────────────────────
+  # Install, deploy, and administer
+  # Content: deploy-manage (Elastic Cloud, ECE, ECK, self-managed,
+  # security, monitoring, upgrade, tools) + cloud-account.
+  # ─────────────────────────────────────────────────────────────
+  - label: Install, deploy, and administer
     children:
-      - toc: solutions
+      - toc: deploy-manage
+      - toc: cloud-account
 
-  - label: Manage Data
+  # ─────────────────────────────────────────────────────────────
+  # The Elasticsearch Platform
+  # Container label with three nested sub-sections.
+  # All real content currently lives in two monolithic toc roots
+  # (manage-data, explore-analyze); placeholders mark sections
+  # that will need dedicated toc roots when the split happens.
+  # ─────────────────────────────────────────────────────────────
+  - label: The Elasticsearch Platform
     children:
-      - toc: manage-data
 
-  - label: Explore & Analyze
-    children:
-      - toc: explore-analyze
+      # ── Ingest and manage data ───────────────────────────────
+      # Desired level-1 sections (future toc splits of manage-data):
+      #   • Ingest or migrate your data (manage-data/ingest + migrate)
+      #   • Store and manage data (manage-data/data-store)
+      #   • Manage data lifecycle (manage-data/lifecycle)
+      #   • Time-series data (manage-data/use-case-timeseries)
+      # For now, the entire manage-data toc root maps here.
+      - label: Ingest and manage data
+        children:
+          - toc: manage-data
 
-  - label: Deploy & Manage
-    children:
-      - toc: deploy-manage
+      # ── Search, visualize, and analyze ───────────────────────
+      # Desired level-1 sections (subset of explore-analyze):
+      #   • Query and filter (query-filter, discover)
+      #   • Dashboards and visualizations (dashboards, visualize)
+      #   • Alerting and cases (alerting, cases)
+      #   • Transforms and cross-cluster (transforms, cross-cluster-search)
+      #   • Reports and workflows (report-and-share, workflows)
+      # explore-analyze also contains AI/ML — those belong below.
+      - label: Search, visualize, and analyze
+        children:
+          - toc: explore-analyze
 
-  - label: Cloud Account
-    children:
-      - toc: cloud-account
+      # ── AI and machine learning ───────────────────────────────
+      # Desired level-1 sections (future toc splits of explore-analyze):
+      #   • AI features and Agent Builder (explore-analyze/ai-features)
+      #   • Elastic Inference Service (explore-analyze/elastic-inference)
+      #   • Machine learning: anomaly detection, NLP, DFA
+      #     (explore-analyze/machine-learning)
+      # Shown as placeholders until content gets its own toc root.
+      - label: AI and machine learning
+        children:
+          - title: AI features and Agent Builder
+          - title: Elastic Inference Service
+          - title: Machine learning
 
-  - label: Troubleshoot
+  # ─────────────────────────────────────────────────────────────
+  # Solutions and project types
+  # Content: solutions (search, observability, security,
+  # elasticsearch-solution-project).
+  # ─────────────────────────────────────────────────────────────
+  - label: Solutions and project types
     children:
-      - toc: troubleshoot
+      - toc: solutions
 
+  # ─────────────────────────────────────────────────────────────
+  # Reference
+  # Content: Elasticsearch REST API + config reference,
+  # Kibana reference, and docs-content reference sub-tocs
+  # (clients, ingestion tools, fleet, APM, ML reference, glossary).
+  # ─────────────────────────────────────────────────────────────
   - label: Reference
     expanded: true
     children:
       - toc: elasticsearch://reference/elasticsearch
       - toc: kibana://reference
+
+  # ─────────────────────────────────────────────────────────────
+  # Troubleshooting
+  # ─────────────────────────────────────────────────────────────
+  - label: Troubleshooting
+    children:
+      - toc: troubleshoot
diff --git a/nav-v2-status.md b/nav-v2-status.md
index dd21c993ad..d96e1a5b02 100644
--- a/nav-v2-status.md
+++ b/nav-v2-status.md
@@ -93,16 +93,115 @@ HtmlWriter.RenderLayout (called per page)
 
 ---
 
+## Proposed new information architecture
+
+The team provided a JSON-defined IA to translate into `navigation-v2.yml`. Below is the structure and how it maps to existing V1 content paths.
+
+### Top-level labels
+
+| Label | Status | V1 content source |
+|-------|--------|-------------------|
+| Elasticsearch fundamentals | Partial — needs decomposition | `get-started` + ES core concepts (possibly from `elasticsearch://reference`) |
+| Install, deploy, and administer | Mostly maps cleanly | `deploy-manage` (deploy, security, users-roles, monitor, upgrade, etc.) |
+| The Elasticsearch Platform | Container label — has nested labels (see below) | — |
+| Solutions and project types | Maps cleanly | `solutions` (search, observability, security, elasticsearch-solution-project) |
+| Reference and resources | Maps cleanly | `elasticsearch://reference/elasticsearch` + `kibana://reference` |
+| Troubleshooting | Maps cleanly | `troubleshoot` |
+
+**ISLAND items (omit from nav):**
+- Extension points
+- Account & preferences
+
+### Nested labels inside "The Elasticsearch Platform"
+
+These are sub-labels grouping level-1 sections, not clickable headings:
+
+```
+The Elasticsearch Platform
+  ├── [nested label] Ingest and manage data
+  │     ├── Ingest or migrate: bring your data into Elasticsearch  → manage-data/ingest + manage-data/migrate
+  │     ├── Store and manage data                                  → manage-data/data-store
+  │     ├── Manage data lifecycle                                  → manage-data/lifecycle
+  │     └── (time series use case)                                 → manage-data/use-case-timeseries
+  │
+  ├── [nested label] Search, visualize, and do stuff
+  │     ├── Query and filter                                        → explore-analyze/query-filter
+  │     ├── Discover                                               → explore-analyze/discover
+  │     ├── Dashboards                                             → explore-analyze/dashboards
+  │     ├── Visualize                                              → explore-analyze/visualize
+  │     ├── Alerting                                               → explore-analyze/alerting
+  │     ├── Cases                                                  → explore-analyze/cases
+  │     ├── Transforms                                             → explore-analyze/transforms
+  │     ├── Cross-cluster search                                   → explore-analyze/cross-cluster-search
+  │     └── Report and share                                       → explore-analyze/report-and-share
+  │
+  └── [nested label] AI and machine learning
+        ├── AI features (Agent Builder, AI Assistant)              → explore-analyze/ai-features
+        ├── Elastic Inference                                      → explore-analyze/elastic-inference
+        ├── Machine learning (anomaly detection, NLP, DFA)         → explore-analyze/machine-learning
+        └── Scripting                                              → explore-analyze/scripting
+```
+
+### Content mapping details
+
+**`manage-data` sub-trees** (single TOC root, decomposed into level-1 sections):
+- `manage-data/ingest` — ingest pipelines, agentless, tools, sample data, transform/enrich
+- `manage-data/migrate` — migration guides
+- `manage-data/data-store` — aliases, data streams, index basics, mapping, templates, text analysis
+- `manage-data/lifecycle` — ILM, data tiers, rollup, curator
+- `manage-data/use-case-use-elasticsearch-to-manage-time-series-data` — time series use case
+
+**`explore-analyze` sub-trees** (single TOC root, split across two nested labels):
+- AI & ML group: `ai-features`, `elastic-inference`, `machine-learning`, `scripting`
+- Search/Visualize group: `query-filter`, `discover`, `dashboards`, `visualize`, `alerting`, `cases`, `transforms`, `cross-cluster-search`, `report-and-share`, `find-and-organize`, `workflows`
+- Note: `geospatial-analysis` and `numeral-formatting` need placement decision
+
+**`deploy-manage` sub-trees** (single TOC root, stays under "Install, deploy, and administer"):
+- `deploy` (Elastic Cloud, ECE, ECK, self-managed)
+- `security`, `users-roles`, `manage-spaces`
+- `monitor`, `autoscaling`, `production-guidance`
+- `upgrade`, `uninstall`
+- `distributed-architecture`, `remote-clusters`, `tools`
+
+**`solutions` sub-trees** (stays together under "Solutions and project types"):
+- `search` (full-text, AI/semantic, hybrid, RAG, ranking)
+- `observability`
+- `security`
+- `elasticsearch-solution-project`
+
+### Key challenges for the YAML translation
+
+1. **`manage-data` is one TOC root** — can't reference `manage-data/ingest` as a `toc:` directly; only `manage-data` is a valid TOC root. The new IA wants to surface sub-sections as top-level nav items. Approaches:
+   - Use `manage-data` as a single `toc:` under the label, accepting the flattened tree — simple but doesn't match the IA
+   - Create new separate TOC roots for each sub-tree — requires changes to `docs-content` repo
+   - Use `title:` placeholders for sections not yet wired up
+
+2. **`explore-analyze` is one TOC root** — same issue; splitting into "AI/ML" vs "Search/Visualize" groups requires either new TOC roots or navigating the tree via sub-path `toc:` references (if the assembler supports it)
+
+3. **`get-started` scope** — "Elasticsearch fundamentals" is broader than the current `get-started` TOC; it likely needs content from `elasticsearch://reference` (concepts, architecture, etc.)
+
+### Pragmatic V2 YAML approach
+
+Given the above constraints, the most viable near-term approach:
+
+- Keep **single `toc:` references** pointing at existing roots
+- Use **nested labels** to visually group them as intended by the IA
+- Add **`title:` placeholders** for sections that don't yet have a dedicated TOC root
+- This lets the prototype render the intended IA structure immediately, with real links where content exists
+
+---
+
 ## Open items / next steps
 
-1. **`navigation-v2.yml` content** — currently mirrors V1 structure exactly. The whole point of V2 is to freely rearrange this file. The skeleton has these top-level labels:
-   - Get Started, Solutions, Manage Data, Explore & Analyze, Deploy & Manage, Cloud Account, Troubleshoot, Reference
+1. ~~**Rewrite `navigation-v2.yml`**~~ ✓ Done — 6 top-level labels, nested labels inside "The Elasticsearch Platform", `title:` placeholders for the AI/ML sub-sections that don't yet have their own toc roots.
+
+2. **Nested label support** — `navigation-v2.yml` and `NavigationV2File.cs` currently only support labels at the top level. Nested labels (labels whose parent is another label) need the YAML format and `SiteNavigationV2` builder to support arbitrary depth label nesting.
 
-2. **Current-page highlighting** — `pages-nav-v2.ts` marks the active link; verify it highlights the right item without auto-expanding parents.
+3. **Current-page highlighting** — `pages-nav-v2.ts` marks the active link; verify it highlights the right item without auto-expanding parents.
 
-3. **Placeholder / page crosslinks** — `page:` items in `navigation-v2.yml` currently render as disabled placeholders (prototype shortcut). Wire up real cross-link resolution if needed.
+4. **Placeholder / page crosslinks** — `page:` items in `navigation-v2.yml` currently render as disabled placeholders (prototype shortcut). Wire up real cross-link resolution if needed.
 
-4. **`l{depth+1}/` parallel paths** — dropped for now (content stays at V1 paths). Could be re-added later if the team wants to preview a new IA at separate URLs while keeping V1 live.
+5. **`l{depth+1}/` parallel paths** — dropped for now (content stays at V1 paths). Could be re-added later if the team wants to preview a new IA at separate URLs while keeping V1 live.
 
 ---
 

From 76657fb74d92da149bfa3469e0363d01a819f63c Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 10:38:34 +0100
Subject: [PATCH 004/226] Labels always expanded with no toggle; only TOC
 folders toggle
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Labels at any depth are now unconditionally expanded — no checkbox,
no chevron, children always visible. This applies to both top-level
labels (Elasticsearch fundamentals, The Elasticsearch Platform, etc.)
and nested labels (Ingest and manage data, Search/visualize, AI/ML).

_TocTreeNavV2.cshtml: for LabelNavigationNode, removed the peer div /
checkbox / chevron pattern; render a plain <span> heading followed by
an always-visible <ul> of children. Removed data-v2-accordion from
label <li> elements since labels no longer participate in accordion.

TOC folder nodes (INodeNavigationItem) retain their existing
checkbox-driven expand/collapse toggle unchanged.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Navigation/_TocTreeNavV2.cshtml           | 35 +++----------------
 1 file changed, 5 insertions(+), 30 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index 6471b6843b..0d8801ed91 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -16,38 +16,13 @@
 
 	if (item is LabelNavigationNode label)
 	{
-		var labelId = $"v2-label-{label.Id}";
-		<li class="flex flex-wrap @(isTopLevel ? "mt-6" : "mt-4") relative" data-v2-accordion>
-			<div class="peer grid grid-cols-[1fr_auto] w-full">
-				<span class="@(isTopLevel ? "font-semibold text-ink" : "") content-center py-1 pr-2 text-sm select-none">
-					@label.NavigationTitle
-				</span>
-				@if (label.NavigationItems.Count > 0)
-				{
-					<label for="@labelId" class="group/label flex mr-2 items-start">
-						<div class="hover:bg-grey-20 rounded-sm p-1 cursor-pointer">
-							<svg
-								xmlns="http://www.w3.org/2000/svg"
-								fill="none"
-								viewBox="0 0 24 24"
-								stroke-width="1.5"
-								stroke="currentColor"
-								class="shrink-0 -rotate-90 group-has-checked/label:rotate-0 w-3.5">
-								<path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/>
-							</svg>
-						</div>
-						<input
-							id="@labelId"
-							type="checkbox"
-							class="hidden"
-							aria-hidden="true"
-							@(label.ExpandedByDefault ? "checked" : "")>
-					</label>
-				}
-			</div>
+		<li class="@(isTopLevel ? "mt-6" : "mt-4") relative">
+			<span class="@(isTopLevel ? "font-semibold text-ink" : "font-medium text-ink/70") block py-1 text-sm select-none">
+				@label.NavigationTitle
+			</span>
 			@if (label.NavigationItems.Count > 0)
 			{
-				<ul class="w-full hidden peer-has-checked:block ml-4 relative before:content-[''] before:absolute before:-left-[calc(var(--spacing)*4-1px)] before:top-0 before:bottom-0 before:w-px before:bg-grey-20 before:peer-has-checked:block">
+				<ul class="w-full">
 					@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
 					{
 						IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,

From 3213a5cd3a367c5e8756acb58ae7c43fece698ed Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 10:39:20 +0100
Subject: [PATCH 005/226] Update nav-v2-status.md: verified behaviours, open
 items, build commands

- Verified behaviours: labels always expanded (no toggle), nested
  labels same, placeholders render as disabled, TOC folders still
  toggle, accordion scoped to TOC siblings
- Mark nested label support as done
- Correct build/serve commands to dotnet run invocations
- Note LabelNavigationNode.ExpandedByDefault is now unused

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 nav-v2-status.md | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/nav-v2-status.md b/nav-v2-status.md
index d96e1a5b02..330f22596b 100644
--- a/nav-v2-status.md
+++ b/nav-v2-status.md
@@ -85,11 +85,11 @@ HtmlWriter.RenderLayout (called per page)
 
 ## Verified behaviours ✓
 
-- Label sections visible as non-clickable headings with chevron toggle
-- `expanded: true` on "Reference" → starts open on page load
-- Clicking a collapsed section opens it
-- Opening one section collapses previously-open sibling (accordion)
-- All other sections remain collapsed until clicked
+- Label sections visible as non-clickable headings, always expanded, no toggle
+- Nested labels (e.g. "Ingest and manage data" inside "The Elasticsearch Platform") also always expanded, no toggle
+- `title:` placeholder items render as disabled grey links
+- TOC folder nodes within labels still have their own expand/collapse toggle
+- Accordion: opening one TOC folder collapses its siblings at the same level
 
 ---
 
@@ -195,7 +195,7 @@ Given the above constraints, the most viable near-term approach:
 
 1. ~~**Rewrite `navigation-v2.yml`**~~ ✓ Done — 6 top-level labels, nested labels inside "The Elasticsearch Platform", `title:` placeholders for the AI/ML sub-sections that don't yet have their own toc roots.
 
-2. **Nested label support** — `navigation-v2.yml` and `NavigationV2File.cs` currently only support labels at the top level. Nested labels (labels whose parent is another label) need the YAML format and `SiteNavigationV2` builder to support arbitrary depth label nesting.
+2. ~~**Nested label support**~~ ✓ Done — labels nest at arbitrary depth; YAML parser, builder, and Razor partial all recurse. `LabelNavigationNode.ExpandedByDefault` is now unused (labels are unconditionally expanded); can be removed in a cleanup pass.
 
 3. **Current-page highlighting** — `pages-nav-v2.ts` marks the active link; verify it highlights the right item without auto-expanding parents.
 
@@ -209,15 +209,14 @@ Given the above constraints, the most viable near-term approach:
 
 ```bash
 # from docs-builder root
-assembler clone          # if repos not yet cloned
-assembler build          # re-build with nav-v2 fixes
-assembler serve          # serve at localhost:4000
+dotnet run --no-restore --project src/tooling/docs-builder -- assembler build
+dotnet run --project src/tooling/docs-builder -- assembler serve
 ```
 
 Open `http://localhost:4000/docs/get-started/` — sidebar should show label sections
-with accordion behaviour instead of the flat V1 nav.
+always expanded, with nested labels visible immediately.
 
 To disable V2 nav temporarily without changing code:
 ```bash
-FEATURE_NAV_V2=false assembler build
+FEATURE_NAV_V2=false dotnet run --no-restore --project src/tooling/docs-builder -- assembler build
 ```

From 33502f5e0bfc7ae43b82f046c845cdb7c872e660 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 10:42:10 +0100
Subject: [PATCH 006/226] Style level-2 labels as small-caps dividers to
 distinguish from level-1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Level-1 labels (top-level sections): font-semibold text-sm text-ink — bold,
14px, full ink colour.

Level-2+ labels (sub-section dividers): text-[10px] font-semibold uppercase
tracking-widest text-ink/50 — all-caps, 10px, wide letter-spacing, 50%
opacity. This is the standard sidebar sub-group treatment (VS Code, Linear,
Notion style) and makes the hierarchy immediately legible at a glance.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Navigation/_TocTreeNavV2.cshtml                           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index 0d8801ed91..20109c5faa 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -16,8 +16,8 @@
 
 	if (item is LabelNavigationNode label)
 	{
-		<li class="@(isTopLevel ? "mt-6" : "mt-4") relative">
-			<span class="@(isTopLevel ? "font-semibold text-ink" : "font-medium text-ink/70") block py-1 text-sm select-none">
+		<li class="@(isTopLevel ? "mt-6" : "mt-5") relative">
+			<span class="@(isTopLevel ? "font-semibold text-sm text-ink" : "text-[10px] font-semibold uppercase tracking-widest text-ink/50") block py-1 select-none">
 				@label.NavigationTitle
 			</span>
 			@if (label.NavigationItems.Count > 0)

From cd3075b010a198eee527cd498f4c110c1f2f2e26 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 10:44:55 +0100
Subject: [PATCH 007/226] Level-1 labels: small-caps uppercase + ruled
 separator between groups
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Level-1 label text: text-xs uppercase tracking-widest font-semibold
  text-ink — same small-caps treatment as level-2 but full ink colour,
  making them clearly structural dividers not clickable links
- Level-1 label <li>: border-t border-grey-20 pt-4 mt-4 to draw a thin
  horizontal rule between each top-level section; first: variant removes
  the border/padding from the first item

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Navigation/_TocTreeNavV2.cshtml                           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index 20109c5faa..0bb73d066d 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -16,8 +16,8 @@
 
 	if (item is LabelNavigationNode label)
 	{
-		<li class="@(isTopLevel ? "mt-6" : "mt-5") relative">
-			<span class="@(isTopLevel ? "font-semibold text-sm text-ink" : "text-[10px] font-semibold uppercase tracking-widest text-ink/50") block py-1 select-none">
+		<li class="@(isTopLevel ? "mt-4 pt-4 border-t border-grey-20 first:border-t-0 first:pt-0 first:mt-6" : "mt-5") relative">
+			<span class="@(isTopLevel ? "text-xs font-semibold uppercase tracking-widest text-ink" : "text-[10px] font-semibold uppercase tracking-widest text-ink/50") block py-1 select-none">
 				@label.NavigationTitle
 			</span>
 			@if (label.NavigationItems.Count > 0)

From e0cc13694d114cf139188f2b20a3f7561437c6be Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 10:46:48 +0100
Subject: [PATCH 008/226] Improve level-2 label legibility: text-xs at 65%
 opacity
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Was text-[10px] text-ink/50 — too small and too dim to read comfortably.
Now text-xs (12px) text-ink/65 — same small-caps uppercase treatment,
clearly subordinate to level-1 but readable at a glance.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index 0bb73d066d..d71bb37981 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -17,7 +17,7 @@
 	if (item is LabelNavigationNode label)
 	{
 		<li class="@(isTopLevel ? "mt-4 pt-4 border-t border-grey-20 first:border-t-0 first:pt-0 first:mt-6" : "mt-5") relative">
-			<span class="@(isTopLevel ? "text-xs font-semibold uppercase tracking-widest text-ink" : "text-[10px] font-semibold uppercase tracking-widest text-ink/50") block py-1 select-none">
+			<span class="@(isTopLevel ? "text-xs font-semibold uppercase tracking-widest text-ink" : "text-xs font-semibold uppercase tracking-widest text-ink/65") block py-1 select-none">
 				@label.NavigationTitle
 			</span>
 			@if (label.NavigationItems.Count > 0)

From a870f12684192eccd195a7c1aca3c15dd7d76895 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 10:47:40 +0100
Subject: [PATCH 009/226] Update nav-v2-status.md: document label typography
 hierarchy

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 nav-v2-status.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nav-v2-status.md b/nav-v2-status.md
index 330f22596b..dd5f17fa38 100644
--- a/nav-v2-status.md
+++ b/nav-v2-status.md
@@ -91,6 +91,16 @@ HtmlWriter.RenderLayout (called per page)
 - TOC folder nodes within labels still have their own expand/collapse toggle
 - Accordion: opening one TOC folder collapses its siblings at the same level
 
+### Label typography (visual hierarchy)
+
+| Level | Style | Example |
+|-------|-------|---------|
+| Level-1 (top-level) | `text-xs font-semibold uppercase tracking-widest text-ink` + `border-t border-grey-20` separator above | `ELASTICSEARCH FUNDAMENTALS` |
+| Level-2 (nested) | `text-xs font-semibold uppercase tracking-widest text-ink/65` | `INGEST AND MANAGE DATA` |
+| TOC folder/link | sentence-case, normal weight, clickable | `Deploy and manage` |
+
+Both label levels use the same small-caps treatment; level-1 is distinguished by full ink colour and a thin horizontal rule above each group. Level-2 is 65% opacity to read as subordinate without being illegible.
+
 ---
 
 ## Proposed new information architecture

From 41c1ca22985d38e41c7c96d60eae971d1ce54e81 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 10:51:16 +0100
Subject: [PATCH 010/226] Add PR link and commit workflow to nav-v2-status.md

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 nav-v2-status.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nav-v2-status.md b/nav-v2-status.md
index dd5f17fa38..b9db70085c 100644
--- a/nav-v2-status.md
+++ b/nav-v2-status.md
@@ -215,6 +215,14 @@ Given the above constraints, the most viable near-term approach:
 
 ---
 
+## PR and commit workflow
+
+**PR:** https://github.com/elastic/docs-builder/pull/2927 (draft)
+
+After every commit:
+1. `git push` — keep remote branch in sync
+2. Update the PR description if the commit meaningfully changes scope
+
 ## How to test locally
 
 ```bash

From 858593eefe5fcd68db928122df4fbb943dc7cce0 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 11:17:43 +0100
Subject: [PATCH 011/226] Add group: placeholder folder type; build Ingest or
 migrate section
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Introduces `GroupNavV2Item` — a YAML `group:` item that renders as an
expandable folder with a disabled (cursor-not-allowed) link and a chevron
toggle. Unlike `label:` (always-expanded section heading), `group:` behaves
like a regular TOC folder but with no real URL.

Changes:
- `NavigationV2File.cs`: add `GroupNavV2Item` record + `group:` YAML parsing
- `PlaceholderNavigationNode.cs`: new nav node implementing INodeNavigationItem
- `SiteNavigationV2.cs`: `CreateGroup` builder (mirrors `CreateLabel`)
- `_TocTreeNavV2.cshtml`: render PlaceholderNavigationNode as disabled folder
- `navigation-v2.yml`: replace `toc: manage-data` in "Ingest and manage data"
  with the full "Ingest or migrate: bring your data into Elasticsearch" tree
  (placeholder titles only; no toc/page refs yet)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/navigation-v2.yml                      | 45 ++++++++++--
 .../Toc/NavigationV2File.cs                   | 17 +++++
 .../V2/PlaceholderNavigationNode.cs           | 69 +++++++++++++++++++
 .../V2/SiteNavigationV2.cs                    | 13 ++++
 .../Navigation/_TocTreeNavV2.cshtml           | 48 +++++++++++++
 5 files changed, 185 insertions(+), 7 deletions(-)
 create mode 100644 src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index a7d6279c48..36b0d9f643 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -32,15 +32,46 @@ nav:
     children:
 
       # ── Ingest and manage data ───────────────────────────────
-      # Desired level-1 sections (future toc splits of manage-data):
-      #   • Ingest or migrate your data (manage-data/ingest + migrate)
-      #   • Store and manage data (manage-data/data-store)
-      #   • Manage data lifecycle (manage-data/lifecycle)
-      #   • Time-series data (manage-data/use-case-timeseries)
-      # For now, the entire manage-data toc root maps here.
       - label: Ingest and manage data
         children:
-          - toc: manage-data
+          - group: Ingest or migrate: bring your data into Elasticsearch
+            children:
+              - title: Choose/Plan your ingest method
+              - title: Ingest architectures
+              - group: Ingest by solution (New - Crosslinks)
+                children:
+                  - title: Ingesting data for search use cases
+                  - title: Ingesting data for observability (New)
+                  - title: Ingesting data for security (Move from Solutions)
+              - title: Ingesting time series data
+              - title: Logs (Solutions / Obs)
+              - group: Ingest data from applications (New)
+                children:
+                  - title: Collect application data (Solutions / Obs)
+                  - title: APM agents
+                  - title: Ingest data with Node.js
+                  - title: Ingest data with Python
+                  - title: Ingest data from Beats with Logstash as a proxy
+                  - title: Ingest data from a relational database
+                  - title: Ingest logs from a Python application using Filebeat
+                  - title: Ingest logs from a Node.js web application using Filebeat
+              - title: Ingest data using the API (New)
+              - title: Upload data files
+              - title: Sample data
+              - title: Migrating your Elasticsearch data
+              - group: Ingest tools (from Reference)
+                children:
+                  - title: Fleet and Elastic Agent
+                  - title: Elastic Distributions of OpenTelemetry (EDOT)
+                  - title: Elastic Integrations
+                  - title: Content connectors
+                  - title: Logstash
+                  - title: APM
+                  - title: Beats
+                  - group: Other ingest tools
+                    children:
+                      - title: Elasticsearch for Apache Hadoop
+                      - title: Elastic Serverless Forwarder for AWS
 
       # ── Search, visualize, and analyze ───────────────────────
       # Desired level-1 sections (subset of explore-analyze):
diff --git a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
index 7088ee3b3b..16f7a4e084 100644
--- a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
+++ b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
@@ -27,6 +27,15 @@ IReadOnlyList<INavV2Item> Children
 /// </summary>
 public record PageNavV2Item(Uri? Page, string? Title) : INavV2Item;
 
+/// <summary>
+/// A placeholder folder node — has a title and children but no real URL.
+/// Renders like a TOC folder (with chevron expand/collapse) but with a disabled link.
+/// </summary>
+public record GroupNavV2Item(
+	string Title,
+	IReadOnlyList<INavV2Item> Children
+) : INavV2Item;
+
 public class NavigationV2File
 {
 	[YamlMember(Alias = "nav")]
@@ -130,6 +139,14 @@ private static IReadOnlyList<INavV2Item> ReadItemList(IParser parser, ObjectDese
 			return new PageNavV2Item(pageUri, title);
 		}
 
+		if (dict.TryGetValue("group", out var groupVal) && groupVal is string groupStr)
+		{
+			var groupChildren = dict.TryGetValue("children", out var gch) && gch is IReadOnlyList<INavV2Item> gChildList
+				? gChildList
+				: [];
+			return new GroupNavV2Item(groupStr, groupChildren);
+		}
+
 		if (dict.TryGetValue("title", out var titleVal) && titleVal is string titleStr)
 			return new PageNavV2Item(null, titleStr);
 
diff --git a/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs
new file mode 100644
index 0000000000..5b29a0370d
--- /dev/null
+++ b/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs
@@ -0,0 +1,69 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Documentation.Extensions;
+
+namespace Elastic.Documentation.Navigation.V2;
+
+/// <summary>
+/// A placeholder folder node in the V2 navigation sidebar.
+/// Has children and a chevron toggle but no real URL — rendered with <c>cursor-not-allowed</c>.
+/// </summary>
+public class PlaceholderNavigationNode : INodeNavigationItem<INavigationModel, INavigationItem>
+{
+	private readonly PlaceholderIndexLeaf _index;
+
+	public PlaceholderNavigationNode(
+		string title,
+		IReadOnlyCollection<INavigationItem> children,
+		INodeNavigationItem<INavigationModel, INavigationItem>? parent
+	)
+	{
+		Id = ShortId.Create("placeholder-group", title);
+		NavigationTitle = title;
+		NavigationItems = children;
+		Parent = parent;
+		NavigationRoot = parent?.NavigationRoot!;
+		_index = new PlaceholderIndexLeaf(this);
+	}
+
+	/// <inheritdoc />
+	public string Id { get; }
+
+	/// <inheritdoc />
+	public string Url => string.Empty;
+
+	/// <inheritdoc />
+	public string NavigationTitle { get; }
+
+	/// <inheritdoc />
+	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
+
+	/// <inheritdoc />
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
+
+	/// <inheritdoc />
+	public bool Hidden => false;
+
+	/// <inheritdoc />
+	public int NavigationIndex { get; set; }
+
+	/// <inheritdoc />
+	public ILeafNavigationItem<INavigationModel> Index => _index;
+
+	/// <inheritdoc />
+	public IReadOnlyCollection<INavigationItem> NavigationItems { get; }
+
+	private sealed class PlaceholderIndexLeaf(PlaceholderNavigationNode owner)
+		: ILeafNavigationItem<INavigationModel>, INavigationModel
+	{
+		public INavigationModel Model => this;
+		public string Url => string.Empty;
+		public string NavigationTitle => owner.NavigationTitle;
+		public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot => owner.NavigationRoot;
+		public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; } = owner;
+		public bool Hidden => true;
+		public int NavigationIndex { get; set; }
+	}
+}
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 61ce162d22..3278e07a85 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -60,6 +60,7 @@ int depth
 		item switch
 		{
 			LabelNavV2Item label => CreateLabel(label, nodes, parent, depth),
+			GroupNavV2Item group => CreateGroup(group, nodes, parent, depth),
 			TocNavV2Item toc => nodes.TryGetValue(toc.Source, out var node) ? node : null,
 			PageNavV2Item { Page: null, Title: var title } => new PlaceholderNavigationLeaf(title ?? "Untitled", parent),
 			PageNavV2Item { Title: var title } page => new PlaceholderNavigationLeaf(title ?? page.Page?.ToString() ?? "Unknown", parent),
@@ -78,4 +79,16 @@ int depth
 		var children = BuildV2Items(label.Children, nodes, placeholder, depth + 1);
 		return new LabelNavigationNode(label.Label, label.Expanded, children, parent);
 	}
+
+	private static PlaceholderNavigationNode CreateGroup(
+		GroupNavV2Item group,
+		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
+		INodeNavigationItem<INavigationModel, INavigationItem> parent,
+		int depth
+	)
+	{
+		var placeholder = new PlaceholderNavigationNode(group.Title, [], parent);
+		var children = BuildV2Items(group.Children, nodes, placeholder, depth + 1);
+		return new PlaceholderNavigationNode(group.Title, children, parent);
+	}
 }
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index d71bb37981..8da4fef5d5 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -47,6 +47,54 @@
 			</a>
 		</li>
 	}
+	else if (item is PlaceholderNavigationNode placeholderGroup)
+	{
+		var allHidden = placeholderGroup.NavigationItems.All(n => n.Hidden);
+		<li class="flex flex-wrap group-navigation @(isTopLevel ? "mt-6" : "mt-4") relative">
+			<div class="peer grid grid-cols-[1fr_auto] w-full">
+				<span
+					class="sidebar-link pr-2 content-center @(isTopLevel ? "font-semibold" : "") text-grey-40 cursor-not-allowed select-none"
+					aria-disabled="true">
+					@placeholderGroup.NavigationTitle
+				</span>
+				@if (!allHidden)
+				{
+					<label for="@placeholderGroup.Id" class="group/label flex mr-2 items-start">
+						<div class="hover:bg-grey-20 rounded-sm p-1 cursor-pointer">
+							<svg
+								xmlns="http://www.w3.org/2000/svg"
+								fill="none"
+								viewBox="0 0 24 24"
+								stroke-width="1.5"
+								stroke="currentColor"
+								class="shrink-0 -rotate-90 group-has-checked/label:rotate-0 w-3.5">
+								<path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/>
+							</svg>
+						</div>
+						<input
+							id="@placeholderGroup.Id"
+							type="checkbox"
+							class="hidden"
+							aria-hidden="true">
+					</label>
+				}
+			</div>
+			@if (placeholderGroup.NavigationItems.Count > 0)
+			{
+				<ul class="w-full hidden peer-has-checked:block ml-4 relative before:content-[''] before:absolute before:-left-[calc(var(--spacing)*4-1px)] before:top-0 before:bottom-0 before:w-px before:bg-grey-20 before:peer-has-checked:block">
+					@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
+					{
+						IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
+						IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
+						Level = Model.Level + 1,
+						SubTree = placeholderGroup,
+						RootNavigationId = Model.RootNavigationId,
+						Htmx = Model.Htmx
+					}))
+				</ul>
+			}
+		</li>
+	}
 	else if (item is INodeNavigationItem<INavigationModel, INavigationItem> { NavigationItems.Count: 0 } group)
 	{
 		<li class="flex group/li pr-8 @(isTopLevel ? "font-semibold mt-6" : "mt-4")">

From 027fcd7648db48824b2ab6f91d71fdaa1a39051d Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 11:19:54 +0100
Subject: [PATCH 012/226] Fix YAML quoting for group title containing colon

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/navigation-v2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 36b0d9f643..90bd3c5dce 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -34,7 +34,7 @@ nav:
       # ── Ingest and manage data ───────────────────────────────
       - label: Ingest and manage data
         children:
-          - group: Ingest or migrate: bring your data into Elasticsearch
+          - group: "Ingest or migrate: bring your data into Elasticsearch"
             children:
               - title: Choose/Plan your ingest method
               - title: Ingest architectures

From 4490cf92bf5ccf140ff5af5b2cd283a25ecd6757 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 11:31:16 +0100
Subject: [PATCH 013/226] Build full nav skeleton from JSON IA design
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Translates the complete card-sort JSON into navigation-v2.yml using
group:/title: placeholders throughout. All 6 top-level labels are
populated with the full proposed IA structure — no toc/page refs yet.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/navigation-v2.yml | 668 ++++++++++++++++++++++++++++++++-------
 1 file changed, 557 insertions(+), 111 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 90bd3c5dce..99cf88f67d 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -1,127 +1,573 @@
 nav:
-  # ─────────────────────────────────────────────────────────────
-  # Elasticsearch fundamentals
-  # Content: get-started + conceptual/architecture pages that
-  # currently live in the ES reference but belong here editorially.
-  # ─────────────────────────────────────────────────────────────
   - label: Elasticsearch fundamentals
     children:
-      - toc: get-started
-      - title: What is Elasticsearch?
-      - title: Core concepts (indices, shards, mappings)
-      - title: Architecture and scalability
-
-  # ─────────────────────────────────────────────────────────────
-  # Install, deploy, and administer
-  # Content: deploy-manage (Elastic Cloud, ECE, ECK, self-managed,
-  # security, monitoring, upgrade, tools) + cloud-account.
-  # ─────────────────────────────────────────────────────────────
+    - group: Get started in seconds (New)
+      children:
+      - title: Evaluate Elastic during a trial
+    - group: Elasticsearch concepts
+      children:
+      - title: Elasticsearch essentials (Core document database)
+      - title: Ingest data into Elasticsearch
+      - title: Core search features (indexing, mapping)
+      - title: Visualize and analyze (Kibana)
+      - group: Use cases
+        children:
+        - title: Geospatial analysis
+        - title: Add search to your site or app
+        - title: RAG
   - label: Install, deploy, and administer
     children:
-      - toc: deploy-manage
-      - toc: cloud-account
-
-  # ─────────────────────────────────────────────────────────────
-  # The Elasticsearch Platform
-  # Container label with three nested sub-sections.
-  # All real content currently lives in two monolithic toc roots
-  # (manage-data, explore-analyze); placeholders mark sections
-  # that will need dedicated toc roots when the split happens.
-  # ─────────────────────────────────────────────────────────────
+    - group: Distributed architecture
+      children:
+      - title: Clusters nodes and shards
+      - title: Discovery and cluster formation
+      - title: Kibana task management
+      - title: Reading and writing documents
+      - title: Shard allocation relocation and recovery
+      - title: The shard request cache
+    - group: Plan your install (name TBD)
+      children:
+      - title: Versioning and compatibility
+      - title: Detailed deployment comparison
+      - group: Reference architectures
+        children:
+        - title: Hot/Frozen - High Availability
+      - group: Production guidance
+        children:
+        - title: Run Elasticsearch in production
+        - title: Run Kibana in production
+    - group: Install and deploy Elasticsearch
+      children:
+      - title: Skills for installation and deployment
+      - title: Deploy in Elastic Cloud
+      - title: Elastic Cloud Enterprise
+      - title: Elastic Cloud on Kubernetes
+      - group: Self-managed cluster
+        children:
+        - title: "[XREF] Command line tools"
+    - group: Administer your deployment
+      children:
+      - title: Skills for cluster and deployment administration
+      - title: Elastic Stack settings
+      - group: Autoscaling
+        children:
+        - title: Autoscaling deciders
+        - title: Autoscaling in ECE and ECH
+        - title: Autoscaling in ECK
+        - title: Trained model autoscaling
+      - group: Backup high availability and resilience tools
+        children:
+        - title: Cross-cluster replication
+        - title: Snapshot and restore
+      - title: Cloud Connect
+      - group: Security and encryption
+        children:
+        - title: Encrypt your deployment data
+        - title: Elastic Cloud Static IPs
+        - title: Enabling cipher suites for stronger encryption
+        - title: Use a customer-managed encryption key
+        - title: Securing HTTP client applications
+        - title: Manage IP filtering in ECK and self-managed
+        - title: Manage IP filters in ECH or Serverless
+        - title: Manage HTTP certificates on ECK
+        - title: Kubernetes network policies
+        - title: Secure settings on ECK
+        - title: Manage transport certificates on ECK
+        - title: Mutual TLS between Kibana and Elasticsearch
+        - title: Kibana session management
+        - title: Security limitations
+        - title: Security logging
+        - title: Network security
+        - title: Private connectivity
+        - title: Secure other Elastic Stack components
+        - title: TLS encryption for cluster communications
+        - title: Secure Kibana saved objects
+        - title: Secure your settings
+        - title: Secure your ECK orchestrator
+        - title: Secure your ECE installation
+        - title: Set up security in self-managed
+      - group: Authentication and authorization
+        children:
+        - group: Users and roles
+          children:
+          - title: Elastic Cloud Enterprise orchestrator users
+          - title: Cloud organization users
+          - title: Cluster or deployment users
+          - title: Serverless project custom roles
+        - title: Spaces
+        - title: "[child] Using Spaces with Fleet"
+      - group: Elastic API keys
+        children:
+        - title: Elastic Cloud API keys
+        - title: Elastic Cloud Enterprise API keys
+        - title: Elasticsearch API keys
+        - title: Serverless project API keys
+      - title: Connectors
+      - group: Remote clusters
+        children:
+        - title: Remote cluster connection modes
+        - title: Remote clusters on Elastic Cloud Hosted
+        - title: Remote clusters on Elastic Cloud Enterprise
+        - title: Remote clusters on ECK
+        - title: Remote clusters on self-managed
+        - title: Remote cluster security models
+      - group: Monitoring
+        children:
+        - title: Performance metrics on Elastic Cloud
+        - title: AutoOps
+        - title: AutoOps and Stack Monitoring comparison
+        - title: Cloud deployment health and performance
+        - title: JVM memory pressure indicator
+        - title: Kibana task manager health monitoring
+        - group: Logging
+          children:
+          - title: "[REF] Audit events"
+        - title: Monitoring orchestrators
+        - title: Stack monitoring
+      - title: Configure Kibana reporting
+      - group: Cloud organization
+        children:
+        - title: Billing
+        - title: Operational emails
+        - title: Service status
+        - title: Tools and APIs for your Cloud organization
+      - group: Licenses and subscriptions
+        children:
+        - title: Manage your license in ECE
+        - title: Manage your license in ECK
+        - title: Manage your license in self-managed
+      - group: Maintenance
+        children:
+        - title: Add and remove Elasticsearch nodes
+        - title: ECE maintenance
+        - title: Start and stop routing requests
+        - title: Start and stop services
+      - group: Upgrade your deployment, cluster, or orchestrator
+        children:
+        - title: Upgrade your deployment or cluster
+        - title: Upgrade your ingest components
+        - title: Upgrade your orchestrator
+        - title: Plan your upgrade
+        - title: Prepare to upgrade
+      - group: Uninstall
+        children:
+        - title: Uninstall Elastic Cloud Enterprise
+        - title: Uninstall Elastic Cloud on Kubernetes
+    - group: Deployment and administration tools
+      children:
+      - title: Overview (roundup)
+      - title: ECCTL
+      - title: Skills
   - label: The Elasticsearch Platform
     children:
-
-      # ── Ingest and manage data ───────────────────────────────
-      - label: Ingest and manage data
+    - label: Ingest and manage data
+      children:
+      - group: "Ingest or migrate: bring your data into Elasticsearch"
         children:
-          - group: "Ingest or migrate: bring your data into Elasticsearch"
+        - title: Choose/Plan your ingest method
+        - title: Ingest architectures
+        - group: Ingest by solution (New - Crosslinks)
+          children:
+          - title: Ingesting data for search use cases
+          - title: Ingesting data for observability (New)
+          - title: Ingesting data for security (Move from Solutions)
+        - title: Ingesting time series data
+        - title: Logs (Solutions / Obs)
+        - group: Ingest data from applications (New)
+          children:
+          - title: Collect application data (Solutions / Obs)
+          - title: APM agents
+          - title: Ingest data with Node.js
+          - title: Ingest data with Python
+          - title: Ingest data from Beats with Logstash as a proxy
+          - title: Ingest data from a relational database
+          - title: Ingest logs from a Python application using Filebeat
+          - title: Ingest logs from a Node.js web application using Filebeat
+        - title: Ingest data using the API (New)
+        - title: Upload data files
+        - title: Sample data
+        - title: Migrating your Elasticsearch data
+        - group: Ingest tools (from Reference)
+          children:
+          - title: Fleet and Elastic Agent
+          - title: Elastic Distributions of OpenTelemetry (EDOT)
+          - title: Elastic Integrations
+          - title: Content connectors
+          - title: Logstash
+          - title: APM
+          - title: Beats
+          - group: Other ingest tools
+            children:
+            - title: Elasticsearch for Apache Hadoop
+            - title: Elastic Serverless Forwarder for AWS
+      - group: Data storage and lifecycle
+        children:
+        - group: The Elasticsearch data store
+          children:
+          - title: Aliases
+          - title: Data streams
+          - group: Index basics
+            children:
+            - title: "[XREF] Index settings reference"
+            - title: Index lifecycle management actions
+          - title: Manage data from the command line
+          - group: Mapping
+            children:
+            - title: Mapping reference
+          - title: Templates
+          - group: Text analysis
             children:
-              - title: Choose/Plan your ingest method
-              - title: Ingest architectures
-              - group: Ingest by solution (New - Crosslinks)
-                children:
-                  - title: Ingesting data for search use cases
-                  - title: Ingesting data for observability (New)
-                  - title: Ingesting data for security (Move from Solutions)
-              - title: Ingesting time series data
-              - title: Logs (Solutions / Obs)
-              - group: Ingest data from applications (New)
-                children:
-                  - title: Collect application data (Solutions / Obs)
-                  - title: APM agents
-                  - title: Ingest data with Node.js
-                  - title: Ingest data with Python
-                  - title: Ingest data from Beats with Logstash as a proxy
-                  - title: Ingest data from a relational database
-                  - title: Ingest logs from a Python application using Filebeat
-                  - title: Ingest logs from a Node.js web application using Filebeat
-              - title: Ingest data using the API (New)
-              - title: Upload data files
-              - title: Sample data
-              - title: Migrating your Elasticsearch data
-              - group: Ingest tools (from Reference)
-                children:
-                  - title: Fleet and Elastic Agent
-                  - title: Elastic Distributions of OpenTelemetry (EDOT)
-                  - title: Elastic Integrations
-                  - title: Content connectors
-                  - title: Logstash
-                  - title: APM
-                  - title: Beats
-                  - group: Other ingest tools
-                    children:
-                      - title: Elasticsearch for Apache Hadoop
-                      - title: Elastic Serverless Forwarder for AWS
-
-      # ── Search, visualize, and analyze ───────────────────────
-      # Desired level-1 sections (subset of explore-analyze):
-      #   • Query and filter (query-filter, discover)
-      #   • Dashboards and visualizations (dashboards, visualize)
-      #   • Alerting and cases (alerting, cases)
-      #   • Transforms and cross-cluster (transforms, cross-cluster-search)
-      #   • Reports and workflows (report-and-share, workflows)
-      # explore-analyze also contains AI/ML — those belong below.
-      - label: Search, visualize, and analyze
-        children:
-          - toc: explore-analyze
-
-      # ── AI and machine learning ───────────────────────────────
-      # Desired level-1 sections (future toc splits of explore-analyze):
-      #   • AI features and Agent Builder (explore-analyze/ai-features)
-      #   • Elastic Inference Service (explore-analyze/elastic-inference)
-      #   • Machine learning: anomaly detection, NLP, DFA
-      #     (explore-analyze/machine-learning)
-      # Shown as placeholders until content gets its own toc root.
-      - label: AI and machine learning
-        children:
-          - title: AI features and Agent Builder
+            - title: "[XREF] Text analysis components"
+        - group: Data lifecycle
+          children:
+          - title: Elasticsearch Curator
+          - title: Data stream lifecycle
+          - title: "Data tiers: hot warm cold frozen"
+          - title: Index lifecycle management (ILM)
+          - title: Rollup
+        - title: "Use case: time series data management"
+      - group: Transform and enrich data
+        children:
+        - group: Data pipelines
+          children:
+          - title: Managed pipelines (Otel / Planned)
+          - title: Elasticsearch ingest pipelines
+          - title: Logstash pipelines
+        - title: Data enrichment
+        - title: Index mapping and text analysis
+        - title: Calculate ingest lag metadata
+    - label: Search, visualize and analyze
+      children:
+      - group: Search and query
+        children:
+        - group: Get started with search
+          children:
+          - title: APIs and tools for search
+        - group: Search strategies
+          children:
+          - title: Full-text search
+          - title: AI-powered search
+          - title: Hybrid search
+          - title: Ranking and reranking
+        - group: Build search queries with APIs and query languages and search templates
+          children:
+          - title: ES|QL
+          - title: Query DSL
+          - title: "..."
+        - group: Cross-project search
+          children:
+          - title: Link projects for cross-project search
+          - title: Using project routing to limit search scope
+          - title: How search works in CPS
+          - title: Using tags to control search
+        - title: Cross-cluster search
+        - title: Add search to your site or app
+        - group: Querying and filtering in Kibana
+          children:
+          - title: Filtering in Kibana
+          - title: Query languages
+          - title: Query tools
+      - group: Explore and visualize
+        children:
+        - title: Learn data exploration and visualization
+        - group: Find and organize content
+          children:
+          - title: Data views
+          - title: Files
+          - title: Find apps and objects
+          - title: Reports
+          - title: Saved objects
+          - title: Tags
+        - group: Reporting and sharing
+          children:
+          - title: Automatically generate reports
+        - group: Panels and visualizations
+          children:
+          - title: Alert panels
+          - title: Custom visualizations with Vega
+          - title: Image panels
+          - title: Legacy editors
+          - title: Lens
+          - title: Link panels
+          - title: Maps
+          - title: Text panels
+        - group: Dashboards
+          children:
+          - title: Add filter controls
+          - title: Organize dashboard panels
+          - title: Building dashboards
+          - title: Create a dashboard
+          - title: "Tutorial: dashboard with time series charts"
+          - title: "Tutorial: dashboard to monitor website logs"
+          - title: Add drilldowns
+          - title: Duplicate a dashboard
+          - title: Import a dashboard
+          - title: Managing dashboards
+          - title: Sharing dashboards
+          - title: Exploring dashboards
+        - group: Discover
+          children:
+          - title: Run queries in the background
+          - title: Explore fields and data with Discover
+          - title: Search for relevance
+          - title: Customize the Discover view
+          - title: Run a pattern analysis on log data
+          - title: Save a search for reuse
+          - title: Using ES|QL
+      - group: Alert and trigger actions
+        children:
+        - group: Workflows
+          children:
+          - title: Author workflows
+          - title: Data and error handling
+          - title: Get started with workflows
+          - title: Steps
+          - title: Triggers
+        - title: Alerting
+        - group: Cases
+          children:
+          - title: Attach objects to cases
+          - title: Configure case settings
+          - title: Create cases
+          - title: Manage cases
+          - title: Search and share cases
+    - label: AI and machine learning
+      children:
+      - group: Machine Learning and NLP
+        children:
+        - title: Anomaly detection
+        - title: Data frame analytics
+      - group: AI framework
+        children:
+        - group: Elastic Inference Service
+          children:
           - title: Elastic Inference Service
-          - title: Machine learning
-
-  # ─────────────────────────────────────────────────────────────
-  # Solutions and project types
-  # Content: solutions (search, observability, security,
-  # elasticsearch-solution-project).
-  # ─────────────────────────────────────────────────────────────
+          - title: Inference integrations
+        - group: Agent builder
+          children:
+          - title: Elasticsearch MCP
+        - title: AI chats
+        - title: LLM guides
+        - title: Manage access to AI features
+      - title: AI agent skills for Elastic
   - label: Solutions and project types
     children:
-      - toc: solutions
-
-  # ─────────────────────────────────────────────────────────────
-  # Reference
-  # Content: Elasticsearch REST API + config reference,
-  # Kibana reference, and docs-content reference sub-tocs
-  # (clients, ingestion tools, fleet, APM, ML reference, glossary).
-  # ─────────────────────────────────────────────────────────────
+    - title: Solutions overview (NEW)
+    - group: Elasticsearch solution
+      children:
+      - title: Get started with Elasticsearch
+      - title: Playground for RAG
+      - title: Query rules
+    - group: Elastic Security solution
+      children:
+      - title: Entity analytics
+      - title: AI for security
+      - title: Elastic Security APIs
+      - title: Cloud Security
+      - title: Configure endpoint protection with Elastic Defend
+      - title: Elastic Security dashboards
+      - title: Detections and alerts
+      - title: Get started with Elastic Security
+      - title: Investigation tools
+      - title: Manage Elastic Defend
+    - group: Elastic Observability solution
+      children:
+      - title: AI for Observability
+      - title: "Application performance monitoring (APM)"
+      - title: Application and service monitoring
+      - title: Get started with Elastic Observability
+      - title: Incident management
+      - title: Infrastructure and host monitoring
+      - title: Log monitoring
+      - title: Streams
+      - title: Synthetic monitoring
+      - title: Uptime monitoring (deprecated)
   - label: Reference
-    expanded: true
     children:
-      - toc: elasticsearch://reference/elasticsearch
-      - toc: kibana://reference
-
-  # ─────────────────────────────────────────────────────────────
-  # Troubleshooting
-  # ─────────────────────────────────────────────────────────────
+    - group: Elasticsearch
+      children:
+      - title: Elasticsearch plugins
+      - title: REST APIs
+      - title: Command-line tools
+      - title: Configuration reference
+      - title: "[XREF] Index lifecycle management actions"
+      - title: Index settings
+      - title: JVM settings
+      - title: "[XREF] Mapping reference"
+      - title: Roles
+      - title: Security privileges
+    - group: Kibana
+      children:
+      - title: Advanced settings
+      - title: Audit events
+      - title: Commands
+      - title: Configuration reference
+      - title: Connectors reference
+      - title: Kibana plugins
+      - title: Accessibility statement
+      - title: Case analytics indices schema
+    - group: Cloud
+      children:
+      - title: Elastic Cloud Hosted
+      - title: Elastic Cloud Enterprise
+      - title: ECK
+      - title: "[XREF] ECCTL command reference"
+    - group: Elastic Security reference
+      children:
+      - title: Endpoint command reference
+      - title: Fields and object schemas for Security
+      - title: Prebuilt detection rules reference
+    - group: Elastic Observability reference
+      children:
+      - title: Fields and object schemas for Observability
+    - group: "Elastic Common Schema (ECS) reference"
+      children:
+      - title: Getting started
+      - title: Guidelines and best practices
+    - group: Machine learning
+      children:
+      - title: Function reference for machine learning
+      - title: Anomaly detection job wizards
+    - group: Search UI
+      children:
+      - title: Using with Vue.js
+      - title: App Search Connector
+      - title: Elasticsearch Connector
+      - title: Site Search Connector
+      - title: Workplace Search Connector
+      - title: Actions
+      - title: Configuration
+      - title: Core API
+      - title: Analytics Plugin
+      - title: State
+      - title: ErrorBoundary
+      - title: Facet
+      - title: Paging
+      - title: PagingInfo
+      - title: Result
+      - title: Results
+      - title: ResultsPerPage
+      - title: SearchBox
+      - title: Sorting
+      - title: SearchProvider
+      - title: useSearch hook
+      - title: WithSearch
+      - title: Architecture
+      - title: Customizing Styles and HTML
+      - title: E-commerce overview
+      - title: Adding search bar to header
+      - title: Analyzing performance
+      - title: Building a custom connector
+      - title: Changing component behavior
+      - title: Conditional Facets
+      - title: Debugging
+      - title: NextJS Integration
+      - title: Using search-as-you-type
+      - title: Search UI known issues
+      - title: Autocomplete
+      - title: Product Carousels
+      - title: Category Page
+      - title: Product Detail Page
+      - title: Search Page
+      - title: "Tutorial: App Search"
+      - title: "Tutorial: Elasticsearch"
+      - title: Using in Production
+      - title: "Tutorial: Workplace Search"
+    - group: Aggregations
+      children:
+      - title: Bucket aggregations
+      - title: Metrics aggregations
+      - title: Pipeline aggregations
+    - group: Elastic Cloud on Kubernetes
+      children:
+      - title: ECK API Reference
+      - title: ECK configuration flags
+      - title: Third-party dependencies
+      - title: Elasticsearch upgrade predicates
+    - title: "Elastic Cloud Control (ECCTL)"
+    - title: Elasticsearch clients
+    - group: Ingest processor reference
+      children:
+      - title: Grok processor
+    - group: Query languages
+      children:
+      - title: EQL search
+      - title: ES|QL reference
+      - title: Kibana Query Language
+      - title: Query DSL
+      - title: SQL overview
+    - title: Scripting languages
+    - title: Numeral formatting
+    - group: Text analysis components
+      children:
+      - title: Analyzer reference
+      - title: Character filter reference
+      - title: Normalizers
+      - title: Token filter reference
+      - title: Tokenizer reference
+    - title: Glossary
   - label: Troubleshooting
     children:
-      - toc: troubleshoot
+    - group: Troubleshoot Elasticsearch
+      children:
+      - title: Troubleshoot broken repositories
+      - title: Add a preferred data tier
+      - title: Allow cluster-wide shard allocation
+      - title: Allow index shard allocation
+      - title: Using the cluster allocation API
+      - title: Troubleshoot data corruption
+      - title: Troubleshoot discovery
+      - title: File-based access recovery
+      - title: Fix common cluster issues
+      - title: Fix data nodes out of disk
+      - title: Fix master nodes out of disk
+      - title: Fix other role nodes out of disk
+      - title: Watermark errors
+      - title: Total shards per node has been reached
+      - title: Total shards for an index exceeded
+      - title: Not enough nodes to allocate shard replicas
+      - title: Fix index lifecycle management errors
+      - title: Troubleshoot monitoring
+      - title: Troubleshoot remote clusters
+      - title: Fix repeated snapshot policy failures
+      - title: Restore from snapshot
+      - title: Troubleshoot snapshot and ILM
+      - title: Troubleshoot transforms
+      - title: Troubleshoot ingest pipelines
+      - title: Troubleshoot incomplete migration to data tiers
+      - title: Troubleshoot searches
+      - title: Troubleshoot shard capacity health issues
+      - title: Troubleshoot an unbalanced cluster
+      - title: Troubleshoot an unstable cluster
+      - title: Troubleshoot Watcher
+    - group: Troubleshoot Kibana
+      children:
+      - title: Check Kibana server status
+      - title: Troubleshoot Kibana alerts
+      - title: Capture Kibana diagnostics
+      - title: "Error: Kibana server is not ready yet"
+      - title: Troubleshoot graph analytics
+      - title: Troubleshoot Kibana Maps
+      - title: Troubleshoot Kibana migration and upgrades
+      - title: Troubleshoot Kibana monitoring
+      - title: Troubleshoot Kibana reporting
+      - title: Troubleshoot Kibana Task Manager
+      - title: Trace an Elasticsearch query in Kibana
+      - title: Using Kibana server logs
+    - group: Troubleshoot Observability
+      children:
+      - title: Explore data
+      - title: Inspect
+    - group: Troubleshoot Security
+      children:
+      - title: Troubleshoot agentless integrations
+      - title: Troubleshoot detection rules
+      - title: Troubleshoot Elastic Defend
+      - title: Troubleshoot indicators of compromise
+    - group: Troubleshoot ingestion tools
+      children:
+      - title: Beats logging plugin
+      - title: Troubleshoot Elastic Serverless Forwarder
+      - title: Troubleshoot Fleet
+      - title: Troubleshoot Logstash
+      - title: Troubleshoot EDOT

From c808a6e4d3308e6ea8ebbd1dae689eb4c509a7c3 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 11:44:30 +0100
Subject: [PATCH 014/226] Fix CI failures: AOT-compatible deserializer and
 unused import
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Switch NavV2Deserializer from DeserializerBuilder to
  StaticDeserializerBuilder — our NavV2FileYamlConverter parses
  manually via parser events so the static context is sufficient;
  fixes IL3050/IL2055 AOT errors in the native build
- Remove unused `$` import from pages-nav-v2.ts; fixes ESLint
  @typescript-eslint/no-unused-vars error in the npm check

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../ConfigurationFileProvider.cs                                | 2 +-
 src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs b/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs
index 643fa7aeb2..a9f0efce42 100644
--- a/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs
+++ b/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs
@@ -30,7 +30,7 @@ public partial class ConfigurationFileProvider
 		.WithTypeConverter(new SiteTableOfContentsRefYamlConverter())
 		.Build();
 
-	public static IDeserializer NavV2Deserializer { get; } = new DeserializerBuilder()
+	public static IDeserializer NavV2Deserializer { get; } = new StaticDeserializerBuilder(new YamlStaticContext())
 		.WithNamingConvention(UnderscoredNamingConvention.Instance)
 		.WithTypeConverter(new NavV2FileYamlConverter())
 		.Build();
diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 73ec01b106..9fcdb71ab3 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -1,4 +1,4 @@
-import { $, $$ } from 'select-dom'
+import { $$ } from 'select-dom'
 
 /**
  * Returns all sibling top-level accordion checkboxes for a given checkbox.

From 1e8148181096440c41b52c4d5fc46f487908dab9 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 11:45:28 +0100
Subject: [PATCH 015/226] Address code review: LINQ refactor and flatten nested
 if

- SiteNavigationV2: replace foreach loop in BuildV2Items with
  Select/Where/Cast/ToList chain
- AssemblerBuildService: combine nested ifs into single && condition

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../V2/SiteNavigationV2.cs                      | 17 ++++++-----------
 .../Building/AssemblerBuildService.cs           |  9 +++------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 3278e07a85..7e8d2fdd97 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -39,17 +39,12 @@ private static IReadOnlyList<INavigationItem> BuildV2Items(
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
 		INodeNavigationItem<INavigationModel, INavigationItem> parent,
 		int depth
-	)
-	{
-		var result = new List<INavigationItem>();
-		foreach (var item in v2Items)
-		{
-			var navItem = CreateV2NavigationItem(item, nodes, parent, depth);
-			if (navItem is not null)
-				result.Add(navItem);
-		}
-		return result;
-	}
+	) =>
+		v2Items
+			.Select(item => CreateV2NavigationItem(item, nodes, parent, depth))
+			.Where(navItem => navItem is not null)
+			.Cast<INavigationItem>()
+			.ToList();
 
 	private static INavigationItem? CreateV2NavigationItem(
 		INavV2Item item,
diff --git a/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs b/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
index 7161020555..2b783062f4 100644
--- a/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
+++ b/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
@@ -125,12 +125,9 @@ Cancel ctx
 
 		_logger.LogInformation("Validating navigation.yml does not contain colliding path prefixes");
 		// Skip path prefix validation for V2 nav — prefixes are auto-derived
-		if (navigation is not SiteNavigationV2)
-		{
-			// this validates all path prefixes are unique, early exit if duplicates are detected
-			if (!SiteNavigationFile.ValidatePathPrefixes(assembleContext.Collector, siteNavigationFile, navigationFileInfo) || assembleContext.Collector.Errors > 0)
-				return false;
-		}
+		if (navigation is not SiteNavigationV2 &&
+			(!SiteNavigationFile.ValidatePathPrefixes(assembleContext.Collector, siteNavigationFile, navigationFileInfo) || assembleContext.Collector.Errors > 0))
+			return false;
 
 		var pathProvider = new GlobalNavigationPathProvider(navigation, assembleSources, assembleContext);
 		using var htmlWriter = new GlobalNavigationHtmlWriter(logFactory, navigation, collector);

From 99670ddbaeef935c7982e681c05085dc6a998307 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 11:50:54 +0100
Subject: [PATCH 016/226] Fix Prettier formatting in pages-nav-v2.ts

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 9fcdb71ab3..c3f64d226c 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -50,10 +50,9 @@ function markCurrentPage(nav: HTMLElement) {
     $$('.current', nav).forEach((el) => el.classList.remove('current'))
 
     const pathname = window.location.pathname.replace(/\/$/, '')
-    $$(
-        `a[href="${pathname}"], a[href="${pathname}/"]`,
-        nav
-    ).forEach((el) => el.classList.add('current'))
+    $$(`a[href="${pathname}"], a[href="${pathname}/"]`, nav).forEach((el) =>
+        el.classList.add('current')
+    )
 }
 
 /**

From 5c7380b8e46d1e24e800187e09682b8b914fdc99 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 12:19:11 +0100
Subject: [PATCH 017/226] Wire up page: cross-link resolution in V2 nav
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add PageCrossLinkLeaf — resolves a page: URI to a canonical URL using
sitePrefix + URI host + path (minus .md extension). Renders as a real
clickable link via the existing ILeafNavigationItem branch in the Razor
partial, distinct from PlaceholderNavigationLeaf (disabled).

Also wires page: candidates into the "Ingest or migrate" section of
navigation-v2.yml, replacing title: placeholders where content exists.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/navigation-v2.yml                      | 60 ++++++++++++-------
 .../V2/PageCrossLinkLeaf.cs                   | 51 ++++++++++++++++
 .../V2/SiteNavigationV2.cs                    | 29 +++++----
 3 files changed, 104 insertions(+), 36 deletions(-)
 create mode 100644 src/Elastic.Documentation.Navigation/V2/PageCrossLinkLeaf.cs

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 99cf88f67d..e2455428c5 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -164,42 +164,56 @@ nav:
       children:
       - group: "Ingest or migrate: bring your data into Elasticsearch"
         children:
-        - title: Choose/Plan your ingest method
-        - title: Ingest architectures
+        - page: docs-content://manage-data/ingest.md
+          title: Choose/Plan your ingest method
+        - page: docs-content://manage-data/ingest/ingest-reference-architectures.md
+          title: Ingest architectures
         - group: Ingest by solution (New - Crosslinks)
           children:
-          - title: Ingesting data for search use cases
+          - page: docs-content://solutions/search/ingest-for-search.md
+            title: Ingesting data for search use cases
           - title: Ingesting data for observability (New)
-          - title: Ingesting data for security (Move from Solutions)
-        - title: Ingesting time series data
+          - page: docs-content://solutions/security/get-started/ingest-data-to-elastic-security.md
+            title: Ingesting data for security (Move from Solutions)
+        - page: docs-content://manage-data/ingest/ingesting-timeseries-data.md
+          title: Ingesting time series data
         - title: Logs (Solutions / Obs)
         - group: Ingest data from applications (New)
           children:
-          - title: Collect application data (Solutions / Obs)
+          - page: docs-content://manage-data/ingest/ingesting-data-from-applications.md
+            title: Collect application data (Solutions / Obs)
           - title: APM agents
-          - title: Ingest data with Node.js
-          - title: Ingest data with Python
-          - title: Ingest data from Beats with Logstash as a proxy
-          - title: Ingest data from a relational database
-          - title: Ingest logs from a Python application using Filebeat
-          - title: Ingest logs from a Node.js web application using Filebeat
+          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-with-nodejs-on-elasticsearch-service.md
+            title: Ingest data with Node.js
+          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-with-python-on-elasticsearch-service.md
+            title: Ingest data with Python
+          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-from-beats-to-elasticsearch-service-with-logstash-as-proxy.md
+            title: Ingest data from Beats with Logstash as a proxy
+          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-from-relational-database-into-elasticsearch-service.md
+            title: Ingest data from a relational database
+          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-python-application-using-filebeat.md
+            title: Ingest logs from a Python application using Filebeat
+          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-nodejs-web-application-using-filebeat.md
+            title: Ingest logs from a Node.js web application using Filebeat
         - title: Ingest data using the API (New)
-        - title: Upload data files
-        - title: Sample data
+        - page: docs-content://manage-data/ingest/upload-data-files.md
+          title: Upload data files
+        - page: docs-content://manage-data/ingest/sample-data.md
+          title: Sample data
         - title: Migrating your Elasticsearch data
         - group: Ingest tools (from Reference)
           children:
-          - title: Fleet and Elastic Agent
-          - title: Elastic Distributions of OpenTelemetry (EDOT)
-          - title: Elastic Integrations
-          - title: Content connectors
-          - title: Logstash
-          - title: APM
-          - title: Beats
+          - toc: docs-content://reference/fleet
+          - toc: opentelemetry://reference
+          - toc: integration-docs://reference
+          - toc: elasticsearch://reference/search-connectors
+          - toc: logstash://reference
+          - toc: docs-content://reference/apm
+          - toc: beats://reference
           - group: Other ingest tools
             children:
-            - title: Elasticsearch for Apache Hadoop
-            - title: Elastic Serverless Forwarder for AWS
+            - toc: elasticsearch-hadoop://reference
+            - toc: elastic-serverless-forwarder://reference
       - group: Data storage and lifecycle
         children:
         - group: The Elasticsearch data store
diff --git a/src/Elastic.Documentation.Navigation/V2/PageCrossLinkLeaf.cs b/src/Elastic.Documentation.Navigation/V2/PageCrossLinkLeaf.cs
new file mode 100644
index 0000000000..f1210849db
--- /dev/null
+++ b/src/Elastic.Documentation.Navigation/V2/PageCrossLinkLeaf.cs
@@ -0,0 +1,51 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+namespace Elastic.Documentation.Navigation.V2;
+
+/// <summary>
+/// A real cross-link leaf in the V2 sidebar — has a URL derived from the source
+/// <c>page:</c> URI and the site prefix. Renders as a normal clickable link.
+/// </summary>
+public class PageCrossLinkLeaf(
+	Uri page,
+	string title,
+	string sitePrefix,
+	INodeNavigationItem<INavigationModel, INavigationItem>? parent
+) : ILeafNavigationItem<INavigationModel>, INavigationModel
+{
+	/// <inheritdoc />
+	public INavigationModel Model => this;
+
+	/// <inheritdoc />
+	public string Url { get; } = ResolveUrl(page, sitePrefix);
+
+	/// <inheritdoc />
+	public string NavigationTitle { get; } = title;
+
+	/// <inheritdoc />
+	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; } = parent?.NavigationRoot!;
+
+	/// <inheritdoc />
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; } = parent;
+
+	/// <inheritdoc />
+	public bool Hidden => false;
+
+	/// <inheritdoc />
+	public int NavigationIndex { get; set; }
+
+	private static string ResolveUrl(Uri page, string sitePrefix)
+	{
+		// URI host carries the first path segment (e.g. docs-content://manage-data/ingest.md
+		// → host="manage-data", absolutePath="/ingest.md"), so combine both.
+		var path = (page.Host + page.AbsolutePath).Trim('/');
+		if (path.EndsWith(".md", StringComparison.OrdinalIgnoreCase))
+			path = path[..^3];
+		if (path.EndsWith("/index", StringComparison.OrdinalIgnoreCase))
+			path = path[..^6];
+		var prefix = "/" + sitePrefix.Trim('/');
+		return string.IsNullOrEmpty(path) ? prefix : $"{prefix}/{path}";
+	}
+}
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 7e8d2fdd97..6d41744aae 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -25,12 +25,12 @@ public SiteNavigationV2(
 		IReadOnlyCollection<IDocumentationSetNavigation> documentationSetNavigations,
 		string? sitePrefix
 	) : base(originalFile, context, documentationSetNavigations, sitePrefix)
-		=> V2NavigationItems = BuildV2Items(v2File.Nav, Nodes, this, depth: 0);
+		=> V2NavigationItems = BuildV2Items(v2File.Nav, Nodes, this, depth: 0, sitePrefix: sitePrefix ?? string.Empty);
 
 	/// <summary>
 	/// Label-structured navigation items for V2 sidebar rendering.
 	/// Contains <see cref="LabelNavigationNode"/>, <see cref="PlaceholderNavigationLeaf"/>,
-	/// and existing <see cref="IRootNavigationItem{TIndex,TChildNavigation}"/> nodes.
+	/// <see cref="PageCrossLinkLeaf"/>, and existing <see cref="IRootNavigationItem{TIndex,TChildNavigation}"/> nodes.
 	/// </summary>
 	public IReadOnlyList<INavigationItem> V2NavigationItems { get; }
 
@@ -38,10 +38,11 @@ private static IReadOnlyList<INavigationItem> BuildV2Items(
 		IReadOnlyList<INavV2Item> v2Items,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
 		INodeNavigationItem<INavigationModel, INavigationItem> parent,
-		int depth
+		int depth,
+		string sitePrefix
 	) =>
 		v2Items
-			.Select(item => CreateV2NavigationItem(item, nodes, parent, depth))
+			.Select(item => CreateV2NavigationItem(item, nodes, parent, depth, sitePrefix))
 			.Where(navItem => navItem is not null)
 			.Cast<INavigationItem>()
 			.ToList();
@@ -50,15 +51,16 @@ int depth
 		INavV2Item item,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
 		INodeNavigationItem<INavigationModel, INavigationItem> parent,
-		int depth
+		int depth,
+		string sitePrefix
 	) =>
 		item switch
 		{
-			LabelNavV2Item label => CreateLabel(label, nodes, parent, depth),
-			GroupNavV2Item group => CreateGroup(group, nodes, parent, depth),
+			LabelNavV2Item label => CreateLabel(label, nodes, parent, depth, sitePrefix),
+			GroupNavV2Item group => CreateGroup(group, nodes, parent, depth, sitePrefix),
 			TocNavV2Item toc => nodes.TryGetValue(toc.Source, out var node) ? node : null,
 			PageNavV2Item { Page: null, Title: var title } => new PlaceholderNavigationLeaf(title ?? "Untitled", parent),
-			PageNavV2Item { Title: var title } page => new PlaceholderNavigationLeaf(title ?? page.Page?.ToString() ?? "Unknown", parent),
+			PageNavV2Item { Page: var page, Title: var title } => new PageCrossLinkLeaf(page!, title ?? page!.ToString(), sitePrefix, parent),
 			_ => null
 		};
 
@@ -66,12 +68,12 @@ private static LabelNavigationNode CreateLabel(
 		LabelNavV2Item label,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
 		INodeNavigationItem<INavigationModel, INavigationItem> parent,
-		int depth
+		int depth,
+		string sitePrefix
 	)
 	{
-		// Build a temporary label so it can be used as parent for its children
 		var placeholder = new LabelNavigationNode(label.Label, label.Expanded, [], parent);
-		var children = BuildV2Items(label.Children, nodes, placeholder, depth + 1);
+		var children = BuildV2Items(label.Children, nodes, placeholder, depth + 1, sitePrefix);
 		return new LabelNavigationNode(label.Label, label.Expanded, children, parent);
 	}
 
@@ -79,11 +81,12 @@ private static PlaceholderNavigationNode CreateGroup(
 		GroupNavV2Item group,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
 		INodeNavigationItem<INavigationModel, INavigationItem> parent,
-		int depth
+		int depth,
+		string sitePrefix
 	)
 	{
 		var placeholder = new PlaceholderNavigationNode(group.Title, [], parent);
-		var children = BuildV2Items(group.Children, nodes, placeholder, depth + 1);
+		var children = BuildV2Items(group.Children, nodes, placeholder, depth + 1, sitePrefix);
 		return new PlaceholderNavigationNode(group.Title, children, parent);
 	}
 }

From b7172c62bf158b76d2193d698fa4ff1d2dab89d4 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 12:25:10 +0100
Subject: [PATCH 018/226] Fix IDE0370: remove unnecessary null-forgiving
 operators in SiteNavigationV2

The pattern `{ Page: var page }` combined with the prior `{ Page: null }` arm
already guarantees `page` is non-null when this arm matches.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 6d41744aae..7381636397 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -60,7 +60,7 @@ string sitePrefix
 			GroupNavV2Item group => CreateGroup(group, nodes, parent, depth, sitePrefix),
 			TocNavV2Item toc => nodes.TryGetValue(toc.Source, out var node) ? node : null,
 			PageNavV2Item { Page: null, Title: var title } => new PlaceholderNavigationLeaf(title ?? "Untitled", parent),
-			PageNavV2Item { Page: var page, Title: var title } => new PageCrossLinkLeaf(page!, title ?? page!.ToString(), sitePrefix, parent),
+			PageNavV2Item { Page: var page, Title: var title } => new PageCrossLinkLeaf(page, title ?? page.ToString(), sitePrefix, parent),
 			_ => null
 		};
 

From 18540af30bc5196f325f70ab8a505acefdc140ef Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 12:33:03 +0100
Subject: [PATCH 019/226] Expand nav to current page on direct URL load

Walk up the DOM from the matched link and check each ancestor
collapsible checkbox so the sidebar reveals the active page location
when navigating directly to a URL.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Assets/pages-nav-v2.ts                    | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index c3f64d226c..d3c4dbabb9 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -42,8 +42,6 @@ function initAccordion(nav: HTMLElement) {
 
 /**
  * Mark the current page's nav link with the "current" CSS class.
- * Unlike the V1 nav, we do NOT auto-expand parent sections —
- * progressive disclosure keeps all sections collapsed until the user opens them.
  */
 function markCurrentPage(nav: HTMLElement) {
     // Remove stale current markers
@@ -55,6 +53,29 @@ function markCurrentPage(nav: HTMLElement) {
     )
 }
 
+/**
+ * Expand all ancestor collapsible sections that contain the current page link,
+ * so that navigating directly to a URL reveals its location in the sidebar.
+ */
+function expandToCurrentPage(nav: HTMLElement) {
+    const pathname = window.location.pathname.replace(/\/$/, '')
+    const link = nav.querySelector<HTMLElement>(
+        `a[href="${pathname}"], a[href="${pathname}/"]`
+    )
+    if (!link) return
+
+    let el: Element | null = link.parentElement
+    while (el && el !== nav) {
+        if (el.matches('li')) {
+            const cb = el.querySelector<HTMLInputElement>(
+                ':scope > .peer input[type=checkbox]'
+            )
+            if (cb) cb.checked = true
+        }
+        el = el.parentElement
+    }
+}
+
 /**
  * Initialize all V2 nav behaviours on the given sidebar element.
  * Call this on every htmx:load when [data-nav-v2] is present.
@@ -62,4 +83,5 @@ function markCurrentPage(nav: HTMLElement) {
 export function initNavV2(nav: HTMLElement) {
     initAccordion(nav)
     markCurrentPage(nav)
+    expandToCurrentPage(nav)
 }

From c9160ce84ea437cdb09b80124a3f9730eb487086 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 13:30:37 +0100
Subject: [PATCH 020/226] Revert URI-derived path prefix experiment; document
 limitation in PR

The file-writing pipeline (GlobalNavigationPathProvider) uses
NavigationTocMappings populated from navigation.yml before
SiteNavigationV2 is constructed, so path prefix overrides in the
navigation model don't reach the output files. Reverted to reusing
V1 nodes directly. Added a URL scheme section to the PR description
explaining the architectural boundary and the intended final design.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../V2/SiteNavigationV2.cs                       | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 7381636397..c0cc6557f0 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -25,7 +25,7 @@ public SiteNavigationV2(
 		IReadOnlyCollection<IDocumentationSetNavigation> documentationSetNavigations,
 		string? sitePrefix
 	) : base(originalFile, context, documentationSetNavigations, sitePrefix)
-		=> V2NavigationItems = BuildV2Items(v2File.Nav, Nodes, this, depth: 0, sitePrefix: sitePrefix ?? string.Empty);
+		=> V2NavigationItems = BuildV2Items(v2File.Nav, Nodes, this, sitePrefix ?? string.Empty);
 
 	/// <summary>
 	/// Label-structured navigation items for V2 sidebar rendering.
@@ -38,11 +38,10 @@ private static IReadOnlyList<INavigationItem> BuildV2Items(
 		IReadOnlyList<INavV2Item> v2Items,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
 		INodeNavigationItem<INavigationModel, INavigationItem> parent,
-		int depth,
 		string sitePrefix
 	) =>
 		v2Items
-			.Select(item => CreateV2NavigationItem(item, nodes, parent, depth, sitePrefix))
+			.Select(item => CreateV2NavigationItem(item, nodes, parent, sitePrefix))
 			.Where(navItem => navItem is not null)
 			.Cast<INavigationItem>()
 			.ToList();
@@ -51,13 +50,12 @@ string sitePrefix
 		INavV2Item item,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
 		INodeNavigationItem<INavigationModel, INavigationItem> parent,
-		int depth,
 		string sitePrefix
 	) =>
 		item switch
 		{
-			LabelNavV2Item label => CreateLabel(label, nodes, parent, depth, sitePrefix),
-			GroupNavV2Item group => CreateGroup(group, nodes, parent, depth, sitePrefix),
+			LabelNavV2Item label => CreateLabel(label, nodes, parent, sitePrefix),
+			GroupNavV2Item group => CreateGroup(group, nodes, parent, sitePrefix),
 			TocNavV2Item toc => nodes.TryGetValue(toc.Source, out var node) ? node : null,
 			PageNavV2Item { Page: null, Title: var title } => new PlaceholderNavigationLeaf(title ?? "Untitled", parent),
 			PageNavV2Item { Page: var page, Title: var title } => new PageCrossLinkLeaf(page, title ?? page.ToString(), sitePrefix, parent),
@@ -68,12 +66,11 @@ private static LabelNavigationNode CreateLabel(
 		LabelNavV2Item label,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
 		INodeNavigationItem<INavigationModel, INavigationItem> parent,
-		int depth,
 		string sitePrefix
 	)
 	{
 		var placeholder = new LabelNavigationNode(label.Label, label.Expanded, [], parent);
-		var children = BuildV2Items(label.Children, nodes, placeholder, depth + 1, sitePrefix);
+		var children = BuildV2Items(label.Children, nodes, placeholder, sitePrefix);
 		return new LabelNavigationNode(label.Label, label.Expanded, children, parent);
 	}
 
@@ -81,12 +78,11 @@ private static PlaceholderNavigationNode CreateGroup(
 		GroupNavV2Item group,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
 		INodeNavigationItem<INavigationModel, INavigationItem> parent,
-		int depth,
 		string sitePrefix
 	)
 	{
 		var placeholder = new PlaceholderNavigationNode(group.Title, [], parent);
-		var children = BuildV2Items(group.Children, nodes, placeholder, depth + 1, sitePrefix);
+		var children = BuildV2Items(group.Children, nodes, placeholder, sitePrefix);
 		return new PlaceholderNavigationNode(group.Title, children, parent);
 	}
 }

From e7c82928172ac770dc3935d5ee00ac88c4c788bc Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 13:51:00 +0100
Subject: [PATCH 021/226] Wire Reference section in navigation-v2.yml with real
 toc and page entries

Replace all placeholder title:/group: items in the Reference label with
toc: roots derived from navigation.yml. Remove the redundant
group: Elastic Cloud on Kubernetes (covered by Cloud group) and drop
the [XREF] ECCTL cross-reference. Numeral formatting wired as a
page: cross-link since it lives under explore-analyze, not reference.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/navigation-v2.yml | 139 ++++++---------------------------------
 1 file changed, 19 insertions(+), 120 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index e2455428c5..9c0f72ffa0 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -398,128 +398,27 @@ nav:
       - title: Uptime monitoring (deprecated)
   - label: Reference
     children:
-    - group: Elasticsearch
-      children:
-      - title: Elasticsearch plugins
-      - title: REST APIs
-      - title: Command-line tools
-      - title: Configuration reference
-      - title: "[XREF] Index lifecycle management actions"
-      - title: Index settings
-      - title: JVM settings
-      - title: "[XREF] Mapping reference"
-      - title: Roles
-      - title: Security privileges
-    - group: Kibana
-      children:
-      - title: Advanced settings
-      - title: Audit events
-      - title: Commands
-      - title: Configuration reference
-      - title: Connectors reference
-      - title: Kibana plugins
-      - title: Accessibility statement
-      - title: Case analytics indices schema
+    - toc: elasticsearch://reference/elasticsearch
+    - toc: kibana://reference
     - group: Cloud
       children:
-      - title: Elastic Cloud Hosted
-      - title: Elastic Cloud Enterprise
-      - title: ECK
-      - title: "[XREF] ECCTL command reference"
-    - group: Elastic Security reference
-      children:
-      - title: Endpoint command reference
-      - title: Fields and object schemas for Security
-      - title: Prebuilt detection rules reference
-    - group: Elastic Observability reference
-      children:
-      - title: Fields and object schemas for Observability
-    - group: "Elastic Common Schema (ECS) reference"
-      children:
-      - title: Getting started
-      - title: Guidelines and best practices
-    - group: Machine learning
-      children:
-      - title: Function reference for machine learning
-      - title: Anomaly detection job wizards
-    - group: Search UI
-      children:
-      - title: Using with Vue.js
-      - title: App Search Connector
-      - title: Elasticsearch Connector
-      - title: Site Search Connector
-      - title: Workplace Search Connector
-      - title: Actions
-      - title: Configuration
-      - title: Core API
-      - title: Analytics Plugin
-      - title: State
-      - title: ErrorBoundary
-      - title: Facet
-      - title: Paging
-      - title: PagingInfo
-      - title: Result
-      - title: Results
-      - title: ResultsPerPage
-      - title: SearchBox
-      - title: Sorting
-      - title: SearchProvider
-      - title: useSearch hook
-      - title: WithSearch
-      - title: Architecture
-      - title: Customizing Styles and HTML
-      - title: E-commerce overview
-      - title: Adding search bar to header
-      - title: Analyzing performance
-      - title: Building a custom connector
-      - title: Changing component behavior
-      - title: Conditional Facets
-      - title: Debugging
-      - title: NextJS Integration
-      - title: Using search-as-you-type
-      - title: Search UI known issues
-      - title: Autocomplete
-      - title: Product Carousels
-      - title: Category Page
-      - title: Product Detail Page
-      - title: Search Page
-      - title: "Tutorial: App Search"
-      - title: "Tutorial: Elasticsearch"
-      - title: Using in Production
-      - title: "Tutorial: Workplace Search"
-    - group: Aggregations
-      children:
-      - title: Bucket aggregations
-      - title: Metrics aggregations
-      - title: Pipeline aggregations
-    - group: Elastic Cloud on Kubernetes
-      children:
-      - title: ECK API Reference
-      - title: ECK configuration flags
-      - title: Third-party dependencies
-      - title: Elasticsearch upgrade predicates
-    - title: "Elastic Cloud Control (ECCTL)"
-    - title: Elasticsearch clients
-    - group: Ingest processor reference
-      children:
-      - title: Grok processor
-    - group: Query languages
-      children:
-      - title: EQL search
-      - title: ES|QL reference
-      - title: Kibana Query Language
-      - title: Query DSL
-      - title: SQL overview
-    - title: Scripting languages
-    - title: Numeral formatting
-    - group: Text analysis components
-      children:
-      - title: Analyzer reference
-      - title: Character filter reference
-      - title: Normalizers
-      - title: Token filter reference
-      - title: Tokenizer reference
-    - title: Glossary
+      - toc: cloud://reference
+      - toc: cloud-on-k8s://reference
+    - toc: docs-content://reference/security
+    - toc: docs-content://reference/observability
+    - toc: ecs://reference
+    - toc: docs-content://reference/machine-learning
+    - toc: search-ui://reference
+    - toc: elasticsearch://reference/aggregations
+    - toc: ecctl://reference
+    - toc: docs-content://reference/elasticsearch-clients
+    - toc: elasticsearch://reference/enrich-processor
+    - toc: elasticsearch://reference/query-languages
+    - toc: elasticsearch://reference/scripting-languages
+    - page: docs-content://explore-analyze/numeral-formatting.md
+      title: Numeral formatting
+    - toc: elasticsearch://reference/text-analysis
+    - toc: docs-content://reference/glossary
   - label: Troubleshooting
     children:
     - group: Troubleshoot Elasticsearch

From 3fa5e197736c1e7abaaca1ce21d5ed4c0d0aa592 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 20 Mar 2026 14:24:04 +0100
Subject: [PATCH 022/226] Wire Troubleshooting section with page: cross-links

Replace placeholder title: items with real page: entries pointing to
individual troubleshoot pages in docs-content. Keep the five-group
structure (Elasticsearch, Kibana, Observability, Security, Ingestion
tools) rather than collapsing to a single toc: root.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/navigation-v2.yml | 159 ++++++++++++++++++++++++++-------------
 1 file changed, 106 insertions(+), 53 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 9c0f72ffa0..534c466644 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -423,64 +423,117 @@ nav:
     children:
     - group: Troubleshoot Elasticsearch
       children:
-      - title: Troubleshoot broken repositories
-      - title: Add a preferred data tier
-      - title: Allow cluster-wide shard allocation
-      - title: Allow index shard allocation
-      - title: Using the cluster allocation API
-      - title: Troubleshoot data corruption
-      - title: Troubleshoot discovery
-      - title: File-based access recovery
-      - title: Fix common cluster issues
-      - title: Fix data nodes out of disk
-      - title: Fix master nodes out of disk
-      - title: Fix other role nodes out of disk
-      - title: Watermark errors
-      - title: Total shards per node has been reached
-      - title: Total shards for an index exceeded
-      - title: Not enough nodes to allocate shard replicas
-      - title: Fix index lifecycle management errors
-      - title: Troubleshoot monitoring
-      - title: Troubleshoot remote clusters
-      - title: Fix repeated snapshot policy failures
-      - title: Restore from snapshot
-      - title: Troubleshoot snapshot and ILM
-      - title: Troubleshoot transforms
-      - title: Troubleshoot ingest pipelines
-      - title: Troubleshoot incomplete migration to data tiers
-      - title: Troubleshoot searches
-      - title: Troubleshoot shard capacity health issues
-      - title: Troubleshoot an unbalanced cluster
-      - title: Troubleshoot an unstable cluster
-      - title: Troubleshoot Watcher
+      - page: docs-content://troubleshoot/elasticsearch/add-repository.md
+        title: Troubleshoot broken repositories
+      - page: docs-content://troubleshoot/elasticsearch/add-tier.md
+        title: Add a preferred data tier
+      - page: docs-content://troubleshoot/elasticsearch/allow-all-cluster-allocation.md
+        title: Allow cluster-wide shard allocation
+      - page: docs-content://troubleshoot/elasticsearch/allow-all-index-allocation.md
+        title: Allow index shard allocation
+      - page: docs-content://troubleshoot/elasticsearch/cluster-allocation-api-examples.md
+        title: Using the cluster allocation API
+      - page: docs-content://troubleshoot/elasticsearch/corruption-troubleshooting.md
+        title: Troubleshoot data corruption
+      - page: docs-content://troubleshoot/elasticsearch/discovery-troubleshooting.md
+        title: Troubleshoot discovery
+      - page: docs-content://troubleshoot/elasticsearch/file-based-recovery.md
+        title: File-based access recovery
+      - page: docs-content://troubleshoot/elasticsearch/fix-common-cluster-issues.md
+        title: Fix common cluster issues
+      - page: docs-content://troubleshoot/elasticsearch/fix-data-node-out-of-disk.md
+        title: Fix data nodes out of disk
+      - page: docs-content://troubleshoot/elasticsearch/fix-master-node-out-of-disk.md
+        title: Fix master nodes out of disk
+      - page: docs-content://troubleshoot/elasticsearch/fix-other-node-out-of-disk.md
+        title: Fix other role nodes out of disk
+      - page: docs-content://troubleshoot/elasticsearch/fix-watermark-errors.md
+        title: Watermark errors
+      - page: docs-content://troubleshoot/elasticsearch/increase-cluster-shard-limit.md
+        title: Total shards per node has been reached
+      - page: docs-content://troubleshoot/elasticsearch/increase-shard-limit.md
+        title: Total shards for an index exceeded
+      - page: docs-content://troubleshoot/elasticsearch/diagnose-unassigned-shards.md
+        title: Not enough nodes to allocate shard replicas
+      - page: docs-content://troubleshoot/elasticsearch/index-lifecycle-management-errors.md
+        title: Fix index lifecycle management errors
+      - page: docs-content://troubleshoot/elasticsearch/monitoring-troubleshooting.md
+        title: Troubleshoot monitoring
+      - page: docs-content://troubleshoot/elasticsearch/remote-clusters.md
+        title: Troubleshoot remote clusters
+      - page: docs-content://troubleshoot/elasticsearch/repeated-snapshot-failures.md
+        title: Fix repeated snapshot policy failures
+      - page: docs-content://troubleshoot/elasticsearch/restore-from-snapshot.md
+        title: Restore from snapshot
+      - page: docs-content://troubleshoot/elasticsearch/start-ilm.md
+        title: Troubleshoot snapshot and ILM
+      - page: docs-content://troubleshoot/elasticsearch/transform-troubleshooting.md
+        title: Troubleshoot transforms
+      - page: docs-content://troubleshoot/elasticsearch/troubleshoot-ingest-pipelines.md
+        title: Troubleshoot ingest pipelines
+      - page: docs-content://troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
+        title: Troubleshoot incomplete migration to data tiers
+      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-searches.md
+        title: Troubleshoot searches
+      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md
+        title: Troubleshoot shard capacity health issues
+      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-unbalanced-cluster.md
+        title: Troubleshoot an unbalanced cluster
+      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-unstable-cluster.md
+        title: Troubleshoot an unstable cluster
+      - page: docs-content://troubleshoot/elasticsearch/watcher-troubleshooting.md
+        title: Troubleshoot Watcher
     - group: Troubleshoot Kibana
       children:
-      - title: Check Kibana server status
-      - title: Troubleshoot Kibana alerts
-      - title: Capture Kibana diagnostics
-      - title: "Error: Kibana server is not ready yet"
-      - title: Troubleshoot graph analytics
-      - title: Troubleshoot Kibana Maps
-      - title: Troubleshoot Kibana migration and upgrades
-      - title: Troubleshoot Kibana monitoring
-      - title: Troubleshoot Kibana reporting
-      - title: Troubleshoot Kibana Task Manager
-      - title: Trace an Elasticsearch query in Kibana
-      - title: Using Kibana server logs
+      - page: docs-content://troubleshoot/kibana/access.md
+        title: Check Kibana server status
+      - page: docs-content://troubleshoot/kibana/alerts.md
+        title: Troubleshoot Kibana alerts
+      - page: docs-content://troubleshoot/kibana/capturing-diagnostics.md
+        title: Capture Kibana diagnostics
+      - page: docs-content://troubleshoot/kibana/error-server-not-ready.md
+        title: "Error: Kibana server is not ready yet"
+      - page: docs-content://troubleshoot/kibana/graph.md
+        title: Troubleshoot graph analytics
+      - page: docs-content://troubleshoot/kibana/maps.md
+        title: Troubleshoot Kibana Maps
+      - page: docs-content://troubleshoot/kibana/migration-failures.md
+        title: Troubleshoot Kibana migration and upgrades
+      - page: docs-content://troubleshoot/kibana/monitoring.md
+        title: Troubleshoot Kibana monitoring
+      - page: docs-content://troubleshoot/kibana/reporting.md
+        title: Troubleshoot Kibana reporting
+      - page: docs-content://troubleshoot/kibana/task-manager.md
+        title: Troubleshoot Kibana Task Manager
+      - page: docs-content://troubleshoot/kibana/trace-elasticsearch-query-to-the-origin-in-kibana.md
+        title: Trace an Elasticsearch query in Kibana
+      - page: docs-content://troubleshoot/kibana/using-kibana-server-logs.md
+        title: Using Kibana server logs
     - group: Troubleshoot Observability
       children:
-      - title: Explore data
-      - title: Inspect
+      - page: docs-content://troubleshoot/observability/explore-data.md
+        title: Explore data
+      - page: docs-content://troubleshoot/observability/inspect.md
+        title: Inspect
     - group: Troubleshoot Security
       children:
-      - title: Troubleshoot agentless integrations
-      - title: Troubleshoot detection rules
-      - title: Troubleshoot Elastic Defend
-      - title: Troubleshoot indicators of compromise
+      - page: docs-content://troubleshoot/security/agentless-integrations.md
+        title: Troubleshoot agentless integrations
+      - page: docs-content://troubleshoot/security/detection-rules.md
+        title: Troubleshoot detection rules
+      - page: docs-content://troubleshoot/security/elastic-defend.md
+        title: Troubleshoot Elastic Defend
+      - page: docs-content://troubleshoot/security/indicators-of-compromise.md
+        title: Troubleshoot indicators of compromise
     - group: Troubleshoot ingestion tools
       children:
-      - title: Beats logging plugin
-      - title: Troubleshoot Elastic Serverless Forwarder
-      - title: Troubleshoot Fleet
-      - title: Troubleshoot Logstash
-      - title: Troubleshoot EDOT
+      - page: docs-content://troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md
+        title: Beats logging plugin
+      - page: docs-content://troubleshoot/ingest/elastic-serverless-forwarder.md
+        title: Troubleshoot Elastic Serverless Forwarder
+      - page: docs-content://troubleshoot/ingest/fleet/fleet-elastic-agent.md
+        title: Troubleshoot Fleet
+      - page: docs-content://troubleshoot/ingest/logstash.md
+        title: Troubleshoot Logstash
+      - page: docs-content://troubleshoot/ingest/opentelemetry/index.md
+        title: Troubleshoot EDOT

From 69d6c32a6a1e8123873df844c1a80a4f293de787 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 23 Mar 2026 18:36:40 +0100
Subject: [PATCH 023/226] feat(nav-v2): page-folder group node; migrate section
 and Reference/Troubleshooting nav updates

- Add PageFolderNavigationNode: a group node with a real clickable URL,
  used when a group: entry in navigation-v2.yml carries a page: key
- Extend GroupNavV2Item with optional Uri? Page and wire YAML parser
- Update SiteNavigationV2.CreateGroup to emit PageFolderNavigationNode
  when a page is present, PlaceholderNavigationNode otherwise
- Expand "Migrating your Elasticsearch data" placeholder into a real
  page-folder group (migrate.md as parent, four child pages beneath)
- Comment out Reference and Troubleshooting labels in navigation-v2.yml

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/navigation-v2.yml                      | 294 +++++++++---------
 .../Toc/NavigationV2File.cs                   |  14 +-
 .../V2/PageFolderNavigationNode.cs            |  84 +++++
 .../V2/SiteNavigationV2.cs                    |   8 +-
 4 files changed, 254 insertions(+), 146 deletions(-)
 create mode 100644 src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 534c466644..eba09c9e19 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -200,7 +200,17 @@ nav:
           title: Upload data files
         - page: docs-content://manage-data/ingest/sample-data.md
           title: Sample data
-        - title: Migrating your Elasticsearch data
+        - group: Migrating your Elasticsearch data
+          page: docs-content://manage-data/migrate.md
+          children:
+          - page: docs-content://manage-data/migrate/migrate-from-a-self-managed-cluster-with-a-self-signed-certificate-using-remote-reindex.md
+            title: Reindex using a private CA
+          - page: docs-content://manage-data/migrate/migrate-with-logstash.md
+            title: Migrate Elastic Cloud Hosted data to Serverless with Logstash
+          - page: docs-content://manage-data/migrate/migrate-data-between-elasticsearch-clusters-with-minimal-downtime.md
+            title: Minimal-downtime migration using snapshots
+          - page: docs-content://manage-data/migrate/migrate-internal-indices.md
+            title: Migrate system indices
         - group: Ingest tools (from Reference)
           children:
           - toc: docs-content://reference/fleet
@@ -396,144 +406,144 @@ nav:
       - title: Streams
       - title: Synthetic monitoring
       - title: Uptime monitoring (deprecated)
-  - label: Reference
-    children:
-    - toc: elasticsearch://reference/elasticsearch
-    - toc: kibana://reference
-    - group: Cloud
-      children:
-      - toc: cloud://reference
-      - toc: cloud-on-k8s://reference
-    - toc: docs-content://reference/security
-    - toc: docs-content://reference/observability
-    - toc: ecs://reference
-    - toc: docs-content://reference/machine-learning
-    - toc: search-ui://reference
-    - toc: elasticsearch://reference/aggregations
-    - toc: ecctl://reference
-    - toc: docs-content://reference/elasticsearch-clients
-    - toc: elasticsearch://reference/enrich-processor
-    - toc: elasticsearch://reference/query-languages
-    - toc: elasticsearch://reference/scripting-languages
-    - page: docs-content://explore-analyze/numeral-formatting.md
-      title: Numeral formatting
-    - toc: elasticsearch://reference/text-analysis
-    - toc: docs-content://reference/glossary
-  - label: Troubleshooting
-    children:
-    - group: Troubleshoot Elasticsearch
-      children:
-      - page: docs-content://troubleshoot/elasticsearch/add-repository.md
-        title: Troubleshoot broken repositories
-      - page: docs-content://troubleshoot/elasticsearch/add-tier.md
-        title: Add a preferred data tier
-      - page: docs-content://troubleshoot/elasticsearch/allow-all-cluster-allocation.md
-        title: Allow cluster-wide shard allocation
-      - page: docs-content://troubleshoot/elasticsearch/allow-all-index-allocation.md
-        title: Allow index shard allocation
-      - page: docs-content://troubleshoot/elasticsearch/cluster-allocation-api-examples.md
-        title: Using the cluster allocation API
-      - page: docs-content://troubleshoot/elasticsearch/corruption-troubleshooting.md
-        title: Troubleshoot data corruption
-      - page: docs-content://troubleshoot/elasticsearch/discovery-troubleshooting.md
-        title: Troubleshoot discovery
-      - page: docs-content://troubleshoot/elasticsearch/file-based-recovery.md
-        title: File-based access recovery
-      - page: docs-content://troubleshoot/elasticsearch/fix-common-cluster-issues.md
-        title: Fix common cluster issues
-      - page: docs-content://troubleshoot/elasticsearch/fix-data-node-out-of-disk.md
-        title: Fix data nodes out of disk
-      - page: docs-content://troubleshoot/elasticsearch/fix-master-node-out-of-disk.md
-        title: Fix master nodes out of disk
-      - page: docs-content://troubleshoot/elasticsearch/fix-other-node-out-of-disk.md
-        title: Fix other role nodes out of disk
-      - page: docs-content://troubleshoot/elasticsearch/fix-watermark-errors.md
-        title: Watermark errors
-      - page: docs-content://troubleshoot/elasticsearch/increase-cluster-shard-limit.md
-        title: Total shards per node has been reached
-      - page: docs-content://troubleshoot/elasticsearch/increase-shard-limit.md
-        title: Total shards for an index exceeded
-      - page: docs-content://troubleshoot/elasticsearch/diagnose-unassigned-shards.md
-        title: Not enough nodes to allocate shard replicas
-      - page: docs-content://troubleshoot/elasticsearch/index-lifecycle-management-errors.md
-        title: Fix index lifecycle management errors
-      - page: docs-content://troubleshoot/elasticsearch/monitoring-troubleshooting.md
-        title: Troubleshoot monitoring
-      - page: docs-content://troubleshoot/elasticsearch/remote-clusters.md
-        title: Troubleshoot remote clusters
-      - page: docs-content://troubleshoot/elasticsearch/repeated-snapshot-failures.md
-        title: Fix repeated snapshot policy failures
-      - page: docs-content://troubleshoot/elasticsearch/restore-from-snapshot.md
-        title: Restore from snapshot
-      - page: docs-content://troubleshoot/elasticsearch/start-ilm.md
-        title: Troubleshoot snapshot and ILM
-      - page: docs-content://troubleshoot/elasticsearch/transform-troubleshooting.md
-        title: Troubleshoot transforms
-      - page: docs-content://troubleshoot/elasticsearch/troubleshoot-ingest-pipelines.md
-        title: Troubleshoot ingest pipelines
-      - page: docs-content://troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
-        title: Troubleshoot incomplete migration to data tiers
-      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-searches.md
-        title: Troubleshoot searches
-      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md
-        title: Troubleshoot shard capacity health issues
-      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-unbalanced-cluster.md
-        title: Troubleshoot an unbalanced cluster
-      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-unstable-cluster.md
-        title: Troubleshoot an unstable cluster
-      - page: docs-content://troubleshoot/elasticsearch/watcher-troubleshooting.md
-        title: Troubleshoot Watcher
-    - group: Troubleshoot Kibana
-      children:
-      - page: docs-content://troubleshoot/kibana/access.md
-        title: Check Kibana server status
-      - page: docs-content://troubleshoot/kibana/alerts.md
-        title: Troubleshoot Kibana alerts
-      - page: docs-content://troubleshoot/kibana/capturing-diagnostics.md
-        title: Capture Kibana diagnostics
-      - page: docs-content://troubleshoot/kibana/error-server-not-ready.md
-        title: "Error: Kibana server is not ready yet"
-      - page: docs-content://troubleshoot/kibana/graph.md
-        title: Troubleshoot graph analytics
-      - page: docs-content://troubleshoot/kibana/maps.md
-        title: Troubleshoot Kibana Maps
-      - page: docs-content://troubleshoot/kibana/migration-failures.md
-        title: Troubleshoot Kibana migration and upgrades
-      - page: docs-content://troubleshoot/kibana/monitoring.md
-        title: Troubleshoot Kibana monitoring
-      - page: docs-content://troubleshoot/kibana/reporting.md
-        title: Troubleshoot Kibana reporting
-      - page: docs-content://troubleshoot/kibana/task-manager.md
-        title: Troubleshoot Kibana Task Manager
-      - page: docs-content://troubleshoot/kibana/trace-elasticsearch-query-to-the-origin-in-kibana.md
-        title: Trace an Elasticsearch query in Kibana
-      - page: docs-content://troubleshoot/kibana/using-kibana-server-logs.md
-        title: Using Kibana server logs
-    - group: Troubleshoot Observability
-      children:
-      - page: docs-content://troubleshoot/observability/explore-data.md
-        title: Explore data
-      - page: docs-content://troubleshoot/observability/inspect.md
-        title: Inspect
-    - group: Troubleshoot Security
-      children:
-      - page: docs-content://troubleshoot/security/agentless-integrations.md
-        title: Troubleshoot agentless integrations
-      - page: docs-content://troubleshoot/security/detection-rules.md
-        title: Troubleshoot detection rules
-      - page: docs-content://troubleshoot/security/elastic-defend.md
-        title: Troubleshoot Elastic Defend
-      - page: docs-content://troubleshoot/security/indicators-of-compromise.md
-        title: Troubleshoot indicators of compromise
-    - group: Troubleshoot ingestion tools
-      children:
-      - page: docs-content://troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md
-        title: Beats logging plugin
-      - page: docs-content://troubleshoot/ingest/elastic-serverless-forwarder.md
-        title: Troubleshoot Elastic Serverless Forwarder
-      - page: docs-content://troubleshoot/ingest/fleet/fleet-elastic-agent.md
-        title: Troubleshoot Fleet
-      - page: docs-content://troubleshoot/ingest/logstash.md
-        title: Troubleshoot Logstash
-      - page: docs-content://troubleshoot/ingest/opentelemetry/index.md
-        title: Troubleshoot EDOT
+#  - label: Reference
+#    children:
+#    - toc: elasticsearch://reference/elasticsearch
+#    - toc: kibana://reference
+#    - group: Cloud
+#      children:
+#      - toc: cloud://reference
+#      - toc: cloud-on-k8s://reference
+#    - toc: docs-content://reference/security
+#    - toc: docs-content://reference/observability
+#    - toc: ecs://reference
+#    - toc: docs-content://reference/machine-learning
+#    - toc: search-ui://reference
+#    - toc: elasticsearch://reference/aggregations
+#    - toc: ecctl://reference
+#    - toc: docs-content://reference/elasticsearch-clients
+#    - toc: elasticsearch://reference/enrich-processor
+#    - toc: elasticsearch://reference/query-languages
+#    - toc: elasticsearch://reference/scripting-languages
+#    - page: docs-content://explore-analyze/numeral-formatting.md
+#      title: Numeral formatting
+#    - toc: elasticsearch://reference/text-analysis
+#    - toc: docs-content://reference/glossary
+#  - label: Troubleshooting
+#    children:
+#    - group: Troubleshoot Elasticsearch
+#      children:
+#      - page: docs-content://troubleshoot/elasticsearch/add-repository.md
+#        title: Troubleshoot broken repositories
+#      - page: docs-content://troubleshoot/elasticsearch/add-tier.md
+#        title: Add a preferred data tier
+#      - page: docs-content://troubleshoot/elasticsearch/allow-all-cluster-allocation.md
+#        title: Allow cluster-wide shard allocation
+#      - page: docs-content://troubleshoot/elasticsearch/allow-all-index-allocation.md
+#        title: Allow index shard allocation
+#      - page: docs-content://troubleshoot/elasticsearch/cluster-allocation-api-examples.md
+#        title: Using the cluster allocation API
+#      - page: docs-content://troubleshoot/elasticsearch/corruption-troubleshooting.md
+#        title: Troubleshoot data corruption
+#      - page: docs-content://troubleshoot/elasticsearch/discovery-troubleshooting.md
+#        title: Troubleshoot discovery
+#      - page: docs-content://troubleshoot/elasticsearch/file-based-recovery.md
+#        title: File-based access recovery
+#      - page: docs-content://troubleshoot/elasticsearch/fix-common-cluster-issues.md
+#        title: Fix common cluster issues
+#      - page: docs-content://troubleshoot/elasticsearch/fix-data-node-out-of-disk.md
+#        title: Fix data nodes out of disk
+#      - page: docs-content://troubleshoot/elasticsearch/fix-master-node-out-of-disk.md
+#        title: Fix master nodes out of disk
+#      - page: docs-content://troubleshoot/elasticsearch/fix-other-node-out-of-disk.md
+#        title: Fix other role nodes out of disk
+#      - page: docs-content://troubleshoot/elasticsearch/fix-watermark-errors.md
+#        title: Watermark errors
+#      - page: docs-content://troubleshoot/elasticsearch/increase-cluster-shard-limit.md
+#        title: Total shards per node has been reached
+#      - page: docs-content://troubleshoot/elasticsearch/increase-shard-limit.md
+#        title: Total shards for an index exceeded
+#      - page: docs-content://troubleshoot/elasticsearch/diagnose-unassigned-shards.md
+#        title: Not enough nodes to allocate shard replicas
+#      - page: docs-content://troubleshoot/elasticsearch/index-lifecycle-management-errors.md
+#        title: Fix index lifecycle management errors
+#      - page: docs-content://troubleshoot/elasticsearch/monitoring-troubleshooting.md
+#        title: Troubleshoot monitoring
+#      - page: docs-content://troubleshoot/elasticsearch/remote-clusters.md
+#        title: Troubleshoot remote clusters
+#      - page: docs-content://troubleshoot/elasticsearch/repeated-snapshot-failures.md
+#        title: Fix repeated snapshot policy failures
+#      - page: docs-content://troubleshoot/elasticsearch/restore-from-snapshot.md
+#        title: Restore from snapshot
+#      - page: docs-content://troubleshoot/elasticsearch/start-ilm.md
+#        title: Troubleshoot snapshot and ILM
+#      - page: docs-content://troubleshoot/elasticsearch/transform-troubleshooting.md
+#        title: Troubleshoot transforms
+#      - page: docs-content://troubleshoot/elasticsearch/troubleshoot-ingest-pipelines.md
+#        title: Troubleshoot ingest pipelines
+#      - page: docs-content://troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
+#        title: Troubleshoot incomplete migration to data tiers
+#      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-searches.md
+#        title: Troubleshoot searches
+#      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md
+#        title: Troubleshoot shard capacity health issues
+#      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-unbalanced-cluster.md
+#        title: Troubleshoot an unbalanced cluster
+#      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-unstable-cluster.md
+#        title: Troubleshoot an unstable cluster
+#      - page: docs-content://troubleshoot/elasticsearch/watcher-troubleshooting.md
+#        title: Troubleshoot Watcher
+#    - group: Troubleshoot Kibana
+#      children:
+#      - page: docs-content://troubleshoot/kibana/access.md
+#        title: Check Kibana server status
+#      - page: docs-content://troubleshoot/kibana/alerts.md
+#        title: Troubleshoot Kibana alerts
+#      - page: docs-content://troubleshoot/kibana/capturing-diagnostics.md
+#        title: Capture Kibana diagnostics
+#      - page: docs-content://troubleshoot/kibana/error-server-not-ready.md
+#        title: "Error: Kibana server is not ready yet"
+#      - page: docs-content://troubleshoot/kibana/graph.md
+#        title: Troubleshoot graph analytics
+#      - page: docs-content://troubleshoot/kibana/maps.md
+#        title: Troubleshoot Kibana Maps
+#      - page: docs-content://troubleshoot/kibana/migration-failures.md
+#        title: Troubleshoot Kibana migration and upgrades
+#      - page: docs-content://troubleshoot/kibana/monitoring.md
+#        title: Troubleshoot Kibana monitoring
+#      - page: docs-content://troubleshoot/kibana/reporting.md
+#        title: Troubleshoot Kibana reporting
+#      - page: docs-content://troubleshoot/kibana/task-manager.md
+#        title: Troubleshoot Kibana Task Manager
+#      - page: docs-content://troubleshoot/kibana/trace-elasticsearch-query-to-the-origin-in-kibana.md
+#        title: Trace an Elasticsearch query in Kibana
+#      - page: docs-content://troubleshoot/kibana/using-kibana-server-logs.md
+#        title: Using Kibana server logs
+#    - group: Troubleshoot Observability
+#      children:
+#      - page: docs-content://troubleshoot/observability/explore-data.md
+#        title: Explore data
+#      - page: docs-content://troubleshoot/observability/inspect.md
+#        title: Inspect
+#    - group: Troubleshoot Security
+#      children:
+#      - page: docs-content://troubleshoot/security/agentless-integrations.md
+#        title: Troubleshoot agentless integrations
+#      - page: docs-content://troubleshoot/security/detection-rules.md
+#        title: Troubleshoot detection rules
+#      - page: docs-content://troubleshoot/security/elastic-defend.md
+#        title: Troubleshoot Elastic Defend
+#      - page: docs-content://troubleshoot/security/indicators-of-compromise.md
+#        title: Troubleshoot indicators of compromise
+#    - group: Troubleshoot ingestion tools
+#      children:
+#      - page: docs-content://troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md
+#        title: Beats logging plugin
+#      - page: docs-content://troubleshoot/ingest/elastic-serverless-forwarder.md
+#        title: Troubleshoot Elastic Serverless Forwarder
+#      - page: docs-content://troubleshoot/ingest/fleet/fleet-elastic-agent.md
+#        title: Troubleshoot Fleet
+#      - page: docs-content://troubleshoot/ingest/logstash.md
+#        title: Troubleshoot Logstash
+#      - page: docs-content://troubleshoot/ingest/opentelemetry/index.md
+#        title: Troubleshoot EDOT
diff --git a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
index 16f7a4e084..6312107df6 100644
--- a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
+++ b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
@@ -28,11 +28,13 @@ IReadOnlyList<INavV2Item> Children
 public record PageNavV2Item(Uri? Page, string? Title) : INavV2Item;
 
 /// <summary>
-/// A placeholder folder node — has a title and children but no real URL.
-/// Renders like a TOC folder (with chevron expand/collapse) but with a disabled link.
+/// A folder node — has a title and children, with an optional <c>page:</c> URI.
+/// When <see cref="Page"/> is set, the header is a real clickable link; otherwise it renders
+/// as a disabled placeholder (cursor-not-allowed).
 /// </summary>
 public record GroupNavV2Item(
 	string Title,
+	Uri? Page,
 	IReadOnlyList<INavV2Item> Children
 ) : INavV2Item;
 
@@ -144,7 +146,13 @@ private static IReadOnlyList<INavV2Item> ReadItemList(IParser parser, ObjectDese
 			var groupChildren = dict.TryGetValue("children", out var gch) && gch is IReadOnlyList<INavV2Item> gChildList
 				? gChildList
 				: [];
-			return new GroupNavV2Item(groupStr, groupChildren);
+			Uri? groupPage = null;
+			if (dict.TryGetValue("page", out var gpVal) && gpVal is string gpStr)
+			{
+				var gpUri = gpStr.Contains("://") ? gpStr : $"docs-content://{gpStr}";
+				_ = Uri.TryCreate(gpUri, UriKind.Absolute, out groupPage);
+			}
+			return new GroupNavV2Item(groupStr, groupPage, groupChildren);
 		}
 
 		if (dict.TryGetValue("title", out var titleVal) && titleVal is string titleStr)
diff --git a/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs
new file mode 100644
index 0000000000..a610f70a4b
--- /dev/null
+++ b/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs
@@ -0,0 +1,84 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Documentation.Extensions;
+
+namespace Elastic.Documentation.Navigation.V2;
+
+/// <summary>
+/// A folder node in the V2 navigation sidebar that also carries a real URL.
+/// Used when a <c>group:</c> entry in <c>navigation-v2.yml</c> has an associated <c>page:</c> key.
+/// Renders as an expandable section whose header is a clickable link.
+/// </summary>
+public class PageFolderNavigationNode : INodeNavigationItem<INavigationModel, INavigationItem>
+{
+	private readonly PageFolderIndexLeaf _index;
+
+	public PageFolderNavigationNode(
+		string title,
+		Uri page,
+		string sitePrefix,
+		IReadOnlyCollection<INavigationItem> children,
+		INodeNavigationItem<INavigationModel, INavigationItem>? parent
+	)
+	{
+		Id = ShortId.Create("page-folder", title);
+		NavigationTitle = title;
+		Url = ResolveUrl(page, sitePrefix);
+		NavigationItems = children;
+		Parent = parent;
+		NavigationRoot = parent?.NavigationRoot!;
+		_index = new PageFolderIndexLeaf(this);
+	}
+
+	/// <inheritdoc />
+	public string Id { get; }
+
+	/// <inheritdoc />
+	public string Url { get; }
+
+	/// <inheritdoc />
+	public string NavigationTitle { get; }
+
+	/// <inheritdoc />
+	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
+
+	/// <inheritdoc />
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
+
+	/// <inheritdoc />
+	public bool Hidden => false;
+
+	/// <inheritdoc />
+	public int NavigationIndex { get; set; }
+
+	/// <inheritdoc />
+	public ILeafNavigationItem<INavigationModel> Index => _index;
+
+	/// <inheritdoc />
+	public IReadOnlyCollection<INavigationItem> NavigationItems { get; }
+
+	private static string ResolveUrl(Uri page, string sitePrefix)
+	{
+		var path = (page.Host + page.AbsolutePath).Trim('/');
+		if (path.EndsWith(".md", StringComparison.OrdinalIgnoreCase))
+			path = path[..^3];
+		if (path.EndsWith("/index", StringComparison.OrdinalIgnoreCase))
+			path = path[..^6];
+		var prefix = "/" + sitePrefix.Trim('/');
+		return string.IsNullOrEmpty(path) ? prefix : $"{prefix}/{path}";
+	}
+
+	private sealed class PageFolderIndexLeaf(PageFolderNavigationNode owner)
+		: ILeafNavigationItem<INavigationModel>, INavigationModel
+	{
+		public INavigationModel Model => this;
+		public string Url => owner.Url;
+		public string NavigationTitle => owner.NavigationTitle;
+		public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot => owner.NavigationRoot;
+		public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; } = owner;
+		public bool Hidden => true;
+		public int NavigationIndex { get; set; }
+	}
+}
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index c0cc6557f0..43f4f11fc3 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -74,13 +74,19 @@ string sitePrefix
 		return new LabelNavigationNode(label.Label, label.Expanded, children, parent);
 	}
 
-	private static PlaceholderNavigationNode CreateGroup(
+	private static INodeNavigationItem<INavigationModel, INavigationItem> CreateGroup(
 		GroupNavV2Item group,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
 		INodeNavigationItem<INavigationModel, INavigationItem> parent,
 		string sitePrefix
 	)
 	{
+		if (group.Page is not null)
+		{
+			var folderPlaceholder = new PageFolderNavigationNode(group.Title, group.Page, sitePrefix, [], parent);
+			var folderChildren = BuildV2Items(group.Children, nodes, folderPlaceholder, sitePrefix);
+			return new PageFolderNavigationNode(group.Title, group.Page, sitePrefix, folderChildren, parent);
+		}
 		var placeholder = new PlaceholderNavigationNode(group.Title, [], parent);
 		var children = BuildV2Items(group.Children, nodes, placeholder, sitePrefix);
 		return new PlaceholderNavigationNode(group.Title, children, parent);

From 9942d3a8f806effcc9bd7c8ce2d6fba1f6ccde70 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 23 Mar 2026 18:51:41 +0100
Subject: [PATCH 024/226] fix(nav-v2): check group: before page: in YAML parser
 to support page-folder groups

When a group: item also has a page: key, the old order caused the page:
branch to fire first, returning a raw PageNavV2Item leaf instead of a
GroupNavV2Item. Swap check order so group: always wins when present.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Toc/NavigationV2File.cs                      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
index 6312107df6..9a61e1396f 100644
--- a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
+++ b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
@@ -133,14 +133,6 @@ private static IReadOnlyList<INavV2Item> ReadItemList(IParser parser, ObjectDese
 			return new TocNavV2Item(source, tocChildren);
 		}
 
-		if (dict.TryGetValue("page", out var pageVal) && pageVal is string pageStr)
-		{
-			var uriString = pageStr.Contains("://") ? pageStr : $"docs-content://{pageStr}";
-			_ = Uri.TryCreate(uriString, UriKind.Absolute, out var pageUri);
-			var title = dict.TryGetValue("title", out var t) && t is string ts ? ts : null;
-			return new PageNavV2Item(pageUri, title);
-		}
-
 		if (dict.TryGetValue("group", out var groupVal) && groupVal is string groupStr)
 		{
 			var groupChildren = dict.TryGetValue("children", out var gch) && gch is IReadOnlyList<INavV2Item> gChildList
@@ -155,6 +147,14 @@ private static IReadOnlyList<INavV2Item> ReadItemList(IParser parser, ObjectDese
 			return new GroupNavV2Item(groupStr, groupPage, groupChildren);
 		}
 
+		if (dict.TryGetValue("page", out var pageVal) && pageVal is string pageStr)
+		{
+			var uriString = pageStr.Contains("://") ? pageStr : $"docs-content://{pageStr}";
+			_ = Uri.TryCreate(uriString, UriKind.Absolute, out var pageUri);
+			var title = dict.TryGetValue("title", out var t) && t is string ts ? ts : null;
+			return new PageNavV2Item(pageUri, title);
+		}
+
 		if (dict.TryGetValue("title", out var titleVal) && titleVal is string titleStr)
 			return new PageNavV2Item(null, titleStr);
 

From 0b4bb8d019662a3dcfa8c180a2bd7904398c06f1 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 24 Mar 2026 11:16:29 +0100
Subject: [PATCH 025/226] docs: update nav-v2-status.md to reflect current
 prototype state

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 nav-v2-status.md | 250 +++++++++++++----------------------------------
 1 file changed, 66 insertions(+), 184 deletions(-)

diff --git a/nav-v2-status.md b/nav-v2-status.md
index b9db70085c..44394a8995 100644
--- a/nav-v2-status.md
+++ b/nav-v2-status.md
@@ -1,240 +1,122 @@
 # nav-v2 prototype — status & plan
 
 Branch: `nav-v2`
-Date: 2026-03-20
+PR: https://github.com/elastic/docs-builder/pull/2927 (draft)
+Last updated: 2026-03-24
 
 ---
 
 ## Goal
 
 Prototype a new information architecture sidebar without touching production nav.
-Gated behind the `nav-v2` feature flag (enabled automatically in `dev` and `preview` environments).
+Gated behind the `nav-v2` feature flag (auto-enabled in `dev` and `preview` environments).
 
 The V2 nav:
 - Shows label sections (non-clickable headings) instead of bare TOC roots
 - Renders the **full tree on every page** (not per-section like V1)
 - Has accordion collapse (open one top-level section → others collapse)
-- No auto-expand to current page (progressive disclosure)
+- Auto-expands to the current page on direct URL load
 - Disabled placeholder links styled with `cursor-not-allowed`
-
-Content is built at **the same URL paths as V1** — the V2 flag changes only the sidebar layout.
+- Content built at **the same URL paths as V1** — only sidebar layout changes
 
 ---
 
-## Current state: working ✓
+## Current state ✓
+
+Build passes. Preview at https://docs-v3-preview.elastic.dev/elastic/docs-builder/docs/2927/
+
+### New nav item types
 
-`./build.sh build` passes (lint + compile + all unit tests).
-Accordion expand/collapse verified in-browser with Playwright.
+| Type | YAML key | C# type | Renders as |
+|------|----------|---------|------------|
+| Section heading | `label:` | `LabelNavigationNode` | Non-clickable uppercase header |
+| Placeholder leaf | `title:` only | `PlaceholderNavigationLeaf` | Greyed-out disabled link |
+| Placeholder folder | `group:` (no `page:`) | `PlaceholderNavigationNode` | Greyed-out folder with chevron |
+| Page-folder | `group:` + `page:` | `PageFolderNavigationNode` | Clickable folder header with chevron |
+| Cross-link leaf | `page:` | `PageCrossLinkLeaf` | Normal clickable link |
+| TOC section | `toc:` | existing `IRootNavigationItem` | Full TOC tree (as V1) |
 
-### Bugs fixed
+### URL scheme
 
-| # | Bug | Fix |
-|---|-----|-----|
-| 1 | Feature flag never fired — `assembler.yml` sets `NAV_V2` (underscore) but `FeatureFlags(dict)` stores keys as-is; `IsEnabled("nav-v2")` never matched | Use `featureFlags.Set(key, value)` in `AssemblerBuildService` to normalise keys before lookup |
-| 2 | Content built at `/docs/l2/get-started/` instead of `/docs/get-started/` — `SiteNavigationV2` was synthesising a new nav file with `l{depth+1}/` prefixes | Pass the original `SiteNavigationFile` to the base constructor; V2 only changes sidebar rendering |
-| 3 | All label checkboxes shared the same ID (`v2-label-1ACA80E8`) — `ShortId.Create("label")` is a deterministic SHA256 hash; every `<label for="...">` targeted the same first checkbox, so only "Get Started" could ever open | `LabelNavigationNode`: `ShortId.Create("label", label)` — include the label text in the hash |
+V2 cannot control output file paths — `GlobalNavigationPathProvider` reads `NavigationTocMappings` from `navigation.yml` before `SiteNavigationV2` is constructed. So V2 reuses V1 URLs. Documented in PR description.
+
+Production migration path: wire `NavigationTocMappings` from the V2 file, with optional `path:` overrides on `toc:` entries to pin stable V1 URLs and avoid redirects.
 
 ---
 
 ## Files changed
 
 ### New files
+
 | File | Purpose |
 |------|---------|
-| `config/navigation-v2.yml` | Skeleton: 8 label sections matching current top-level nav |
-| `src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs` | YAML model (`LabelNavV2Item`, `TocNavV2Item`, `PageNavV2Item`) + `NavV2FileYamlConverter` |
-| `src/Elastic.Documentation.Navigation/V2/LabelNavigationNode.cs` | Non-clickable section heading; implements `INodeNavigationItem` |
-| `src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationLeaf.cs` | Disabled placeholder link; implements `ILeafNavigationItem` |
-| `src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs` | Extends `SiteNavigation`; passes original nav file to base; builds V2 label tree from `navigation-v2.yml` |
-| `src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml` | V2 Razor partial: labels as `<span>`, placeholders as `aria-disabled`, folders/leaves same as V1 |
-| `src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts` | Accordion collapse + current-page marking (no auto-expand) |
+| `config/navigation-v2.yml` | Full IA structure — 6 top-level labels, nested labels, real `toc:`/`page:` wiring |
+| `src/.../Toc/NavigationV2File.cs` | YAML model + `NavV2FileYamlConverter` |
+| `src/.../V2/LabelNavigationNode.cs` | Non-clickable section heading |
+| `src/.../V2/PlaceholderNavigationLeaf.cs` | Disabled placeholder link |
+| `src/.../V2/PlaceholderNavigationNode.cs` | Disabled placeholder folder |
+| `src/.../V2/PageCrossLinkLeaf.cs` | Real cross-link leaf (from `page:`) |
+| `src/.../V2/PageFolderNavigationNode.cs` | Clickable folder with real URL (from `group:` + `page:`) |
+| `src/.../V2/SiteNavigationV2.cs` | Extends `SiteNavigation`; builds V2 label tree |
+| `src/.../Navigation/_TocTreeNavV2.cshtml` | V2 Razor partial |
+| `src/.../Assets/pages-nav-v2.ts` | Accordion + current-page marking + auto-expand on load |
 
 ### Modified files
+
 | File | Change |
 |------|--------|
-| `config/assembler.yml` | `NAV_V2: true` under `dev:` and `preview:` feature_flags |
-| `src/.../Builder/FeatureFlags.cs` | Added `NavV2Enabled` property |
-| `src/.../ConfigurationFileProvider.cs` | `NavV2Deserializer` (reflection-based); optional `NavigationV2File` property; `TryCreateTemporaryConfigurationFile` helper |
-| `src/.../NavigationViewModel.cs` | Added `IsNavV2` bool (default `false`) |
-| `src/.../Navigation/_TocTree.cshtml` | Branches on `IsNavV2`; wraps V2 tree in `<nav data-nav-v2>` |
-| `src/.../AssemblerBuildService.cs` | Normalises feature flag keys; loads `navigation-v2.yml` + instantiates `SiteNavigationV2` when flag on; skips path-prefix duplicate validation for V2 |
-| `src/.../GlobalNavigationHtmlWriter.cs` | Detects `SiteNavigationV2`; always returns full V2 nav HTML (cached once as `"nav-v2"`); `SiteNavigationV2Wrapper` exposes `V2NavigationItems` as the tree root |
-| `src/.../main.ts` | On `htmx:load`, calls `initNavV2(nav)` when `[data-nav-v2]` is present; otherwise falls back to `initNav()` |
+| `config/assembler.yml` | `NAV_V2: true` under `dev:` and `preview:` |
+| `src/.../FeatureFlags.cs` | `NavV2Enabled` property |
+| `src/.../ConfigurationFileProvider.cs` | `NavV2Deserializer`; `NavigationV2File` property |
+| `src/.../NavigationViewModel.cs` | `IsNavV2` bool |
+| `src/.../Navigation/_TocTree.cshtml` | Branches on `IsNavV2` |
+| `src/.../AssemblerBuildService.cs` | Loads nav-v2 file; instantiates `SiteNavigationV2` |
+| `src/.../GlobalNavigationHtmlWriter.cs` | Full V2 nav HTML cached once as `"nav-v2"` |
+| `src/.../main.ts` | `initNavV2(nav)` when `[data-nav-v2]` present |
 
 ---
 
-## How the V2 nav renders on every page
+## navigation-v2.yml wiring status
 
-```
-HtmlWriter.RenderLayout (called per page)
-  → NavigationHtmlWriter.RenderNavigation(root, navigationItem)
-    → GlobalNavigationHtmlWriter detects `globalNavigation is SiteNavigationV2`
-      → RenderV2Navigation: renders full V2 tree once, cached as "nav-v2"
-      → returns same HTML for every page
-```
+| Section | Status |
+|---------|--------|
+| Elasticsearch fundamentals | Placeholders |
+| Install, deploy, and administer | Placeholders |
+| The Elasticsearch Platform → Ingest and manage data | Partially wired — "Ingest or migrate" group real pages + tocs; rest placeholders |
+| The Elasticsearch Platform → Search, visualize and analyze | Placeholders |
+| The Elasticsearch Platform → AI and machine learning | Placeholders |
+| Solutions and project types | Placeholders |
+| Reference | Commented out (18 real `toc:` entries ready, hidden while team reviews IA) |
+| Troubleshooting | Commented out (real `page:` entries ready, hidden while team reviews IA) |
 
-`_TocTree.cshtml` checks `Model.IsNavV2`:
-- **true** → `<nav data-nav-v2><ul id="nav-tree"> ... _TocTreeNavV2 ... </ul></nav>`
-- **false** → existing V1 `<ul id="nav-tree"> ... _TocTreeNav ... </ul>`
+### "Ingest or migrate" detail
 
-`main.ts` on `htmx:load`:
-- `[data-nav-v2]` present → `initNavV2(nav)` (accordion + current-page marker, no auto-expand)
-- absent → `initNav()` (V1 behaviour unchanged)
+- Explicit `page:` entries for all current pages in `manage-data/ingest` and `manage-data/migrate`
+- "Migrating your Elasticsearch data" uses `group:` + `page:` (page-folder): parent links to `manage-data/migrate`, four child pages beneath
+- "Ingest tools (from Reference)" group: wired with 7 `toc:` entries (fleet, EDOT, integration-docs, search-connectors, logstash, apm, beats) + "Other ingest tools" sub-group (elasticsearch-hadoop, elastic-serverless-forwarder)
+- `integration-docs` is `private: true` — absent in PR preview, present in production and localhost
 
 ---
 
-## Verified behaviours ✓
-
-- Label sections visible as non-clickable headings, always expanded, no toggle
-- Nested labels (e.g. "Ingest and manage data" inside "The Elasticsearch Platform") also always expanded, no toggle
-- `title:` placeholder items render as disabled grey links
-- TOC folder nodes within labels still have their own expand/collapse toggle
-- Accordion: opening one TOC folder collapses its siblings at the same level
-
-### Label typography (visual hierarchy)
-
-| Level | Style | Example |
-|-------|-------|---------|
-| Level-1 (top-level) | `text-xs font-semibold uppercase tracking-widest text-ink` + `border-t border-grey-20` separator above | `ELASTICSEARCH FUNDAMENTALS` |
-| Level-2 (nested) | `text-xs font-semibold uppercase tracking-widest text-ink/65` | `INGEST AND MANAGE DATA` |
-| TOC folder/link | sentence-case, normal weight, clickable | `Deploy and manage` |
-
-Both label levels use the same small-caps treatment; level-1 is distinguished by full ink colour and a thin horizontal rule above each group. Level-2 is 65% opacity to read as subordinate without being illegible.
-
----
-
-## Proposed new information architecture
-
-The team provided a JSON-defined IA to translate into `navigation-v2.yml`. Below is the structure and how it maps to existing V1 content paths.
-
-### Top-level labels
-
-| Label | Status | V1 content source |
-|-------|--------|-------------------|
-| Elasticsearch fundamentals | Partial — needs decomposition | `get-started` + ES core concepts (possibly from `elasticsearch://reference`) |
-| Install, deploy, and administer | Mostly maps cleanly | `deploy-manage` (deploy, security, users-roles, monitor, upgrade, etc.) |
-| The Elasticsearch Platform | Container label — has nested labels (see below) | — |
-| Solutions and project types | Maps cleanly | `solutions` (search, observability, security, elasticsearch-solution-project) |
-| Reference and resources | Maps cleanly | `elasticsearch://reference/elasticsearch` + `kibana://reference` |
-| Troubleshooting | Maps cleanly | `troubleshoot` |
-
-**ISLAND items (omit from nav):**
-- Extension points
-- Account & preferences
-
-### Nested labels inside "The Elasticsearch Platform"
-
-These are sub-labels grouping level-1 sections, not clickable headings:
-
-```
-The Elasticsearch Platform
-  ├── [nested label] Ingest and manage data
-  │     ├── Ingest or migrate: bring your data into Elasticsearch  → manage-data/ingest + manage-data/migrate
-  │     ├── Store and manage data                                  → manage-data/data-store
-  │     ├── Manage data lifecycle                                  → manage-data/lifecycle
-  │     └── (time series use case)                                 → manage-data/use-case-timeseries
-  │
-  ├── [nested label] Search, visualize, and do stuff
-  │     ├── Query and filter                                        → explore-analyze/query-filter
-  │     ├── Discover                                               → explore-analyze/discover
-  │     ├── Dashboards                                             → explore-analyze/dashboards
-  │     ├── Visualize                                              → explore-analyze/visualize
-  │     ├── Alerting                                               → explore-analyze/alerting
-  │     ├── Cases                                                  → explore-analyze/cases
-  │     ├── Transforms                                             → explore-analyze/transforms
-  │     ├── Cross-cluster search                                   → explore-analyze/cross-cluster-search
-  │     └── Report and share                                       → explore-analyze/report-and-share
-  │
-  └── [nested label] AI and machine learning
-        ├── AI features (Agent Builder, AI Assistant)              → explore-analyze/ai-features
-        ├── Elastic Inference                                      → explore-analyze/elastic-inference
-        ├── Machine learning (anomaly detection, NLP, DFA)         → explore-analyze/machine-learning
-        └── Scripting                                              → explore-analyze/scripting
-```
-
-### Content mapping details
-
-**`manage-data` sub-trees** (single TOC root, decomposed into level-1 sections):
-- `manage-data/ingest` — ingest pipelines, agentless, tools, sample data, transform/enrich
-- `manage-data/migrate` — migration guides
-- `manage-data/data-store` — aliases, data streams, index basics, mapping, templates, text analysis
-- `manage-data/lifecycle` — ILM, data tiers, rollup, curator
-- `manage-data/use-case-use-elasticsearch-to-manage-time-series-data` — time series use case
-
-**`explore-analyze` sub-trees** (single TOC root, split across two nested labels):
-- AI & ML group: `ai-features`, `elastic-inference`, `machine-learning`, `scripting`
-- Search/Visualize group: `query-filter`, `discover`, `dashboards`, `visualize`, `alerting`, `cases`, `transforms`, `cross-cluster-search`, `report-and-share`, `find-and-organize`, `workflows`
-- Note: `geospatial-analysis` and `numeral-formatting` need placement decision
-
-**`deploy-manage` sub-trees** (single TOC root, stays under "Install, deploy, and administer"):
-- `deploy` (Elastic Cloud, ECE, ECK, self-managed)
-- `security`, `users-roles`, `manage-spaces`
-- `monitor`, `autoscaling`, `production-guidance`
-- `upgrade`, `uninstall`
-- `distributed-architecture`, `remote-clusters`, `tools`
-
-**`solutions` sub-trees** (stays together under "Solutions and project types"):
-- `search` (full-text, AI/semantic, hybrid, RAG, ranking)
-- `observability`
-- `security`
-- `elasticsearch-solution-project`
-
-### Key challenges for the YAML translation
-
-1. **`manage-data` is one TOC root** — can't reference `manage-data/ingest` as a `toc:` directly; only `manage-data` is a valid TOC root. The new IA wants to surface sub-sections as top-level nav items. Approaches:
-   - Use `manage-data` as a single `toc:` under the label, accepting the flattened tree — simple but doesn't match the IA
-   - Create new separate TOC roots for each sub-tree — requires changes to `docs-content` repo
-   - Use `title:` placeholders for sections not yet wired up
-
-2. **`explore-analyze` is one TOC root** — same issue; splitting into "AI/ML" vs "Search/Visualize" groups requires either new TOC roots or navigating the tree via sub-path `toc:` references (if the assembler supports it)
-
-3. **`get-started` scope** — "Elasticsearch fundamentals" is broader than the current `get-started` TOC; it likely needs content from `elasticsearch://reference` (concepts, architecture, etc.)
-
-### Pragmatic V2 YAML approach
-
-Given the above constraints, the most viable near-term approach:
+## Known limitations
 
-- Keep **single `toc:` references** pointing at existing roots
-- Use **nested labels** to visually group them as intended by the IA
-- Add **`title:` placeholders** for sections that don't yet have a dedicated TOC root
-- This lets the prototype render the intended IA structure immediately, with real links where content exists
+- **Private repos in PR preview**: `integration-docs` (Elastic integrations) is absent from preview builds; appears correctly in production and localhost. Same limitation affects V1.
+- **URL paths**: V2 cannot assign new URL prefixes without wiring `NavigationTocMappings` from the V2 file (architectural blocker, documented in PR).
 
 ---
 
-## Open items / next steps
+## Open items
 
-1. ~~**Rewrite `navigation-v2.yml`**~~ ✓ Done — 6 top-level labels, nested labels inside "The Elasticsearch Platform", `title:` placeholders for the AI/ML sub-sections that don't yet have their own toc roots.
-
-2. ~~**Nested label support**~~ ✓ Done — labels nest at arbitrary depth; YAML parser, builder, and Razor partial all recurse. `LabelNavigationNode.ExpandedByDefault` is now unused (labels are unconditionally expanded); can be removed in a cleanup pass.
-
-3. **Current-page highlighting** — `pages-nav-v2.ts` marks the active link; verify it highlights the right item without auto-expanding parents.
-
-4. **Placeholder / page crosslinks** — `page:` items in `navigation-v2.yml` currently render as disabled placeholders (prototype shortcut). Wire up real cross-link resolution if needed.
-
-5. **`l{depth+1}/` parallel paths** — dropped for now (content stays at V1 paths). Could be re-added later if the team wants to preview a new IA at separate URLs while keeping V1 live.
+1. **Remaining placeholders** — most sections still use `title:` placeholders pending IA decisions.
+2. **Production migration** — wire `NavigationTocMappings` from V2 file; optional `path:` key on `toc:` entries for zero-redirect URL pinning.
+3. **Re-enable Reference / Troubleshooting** — currently commented out; uncomment once team approves structure.
 
 ---
 
-## PR and commit workflow
-
-**PR:** https://github.com/elastic/docs-builder/pull/2927 (draft)
-
-After every commit:
-1. `git push` — keep remote branch in sync
-2. Update the PR description if the commit meaningfully changes scope
-
 ## How to test locally
 
 ```bash
-# from docs-builder root
 dotnet run --no-restore --project src/tooling/docs-builder -- assembler build
 dotnet run --project src/tooling/docs-builder -- assembler serve
-```
-
-Open `http://localhost:4000/docs/get-started/` — sidebar should show label sections
-always expanded, with nested labels visible immediately.
-
-To disable V2 nav temporarily without changing code:
-```bash
-FEATURE_NAV_V2=false dotnet run --no-restore --project src/tooling/docs-builder -- assembler build
+# open http://localhost:4000
 ```

From 15b3befb226eb923dcbf5e053c76f964ecb5f268 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 24 Mar 2026 12:05:39 +0100
Subject: [PATCH 026/226] feat(nav-v2): generate stub pages for placeholder nav
 items
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Each PlaceholderNavigationLeaf and PlaceholderNavigationNode now gets a
computed URL (/{sitePrefix}/_placeholder/{hash}) and a corresponding
generated stub page (H1 title + "coming soon" paragraph) with the full
site chrome including the V2 nav sidebar.

PlaceholderPageWriter walks the V2 nav tree after the main build and
writes one HTML file per unique placeholder URL to the output directory.
The nav sidebar now renders placeholder links as clickable greyed hrefs
instead of aria-disabled spans — cursor-not-allowed is removed.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../V2/PlaceholderNavigationLeaf.cs           |  17 +-
 .../V2/PlaceholderNavigationNode.cs           |  16 +-
 .../V2/SiteNavigationV2.cs                    |   6 +-
 .../Navigation/_TocTreeNavV2.cshtml           |  15 +-
 .../Page/PlaceholderPage.cshtml               |   9 +
 .../Building/AssemblerBuildService.cs         |   9 +
 .../Building/PlaceholderPageWriter.cs         | 155 ++++++++++++++++++
 7 files changed, 211 insertions(+), 16 deletions(-)
 create mode 100644 src/Elastic.Markdown/Page/PlaceholderPage.cshtml
 create mode 100644 src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs

diff --git a/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationLeaf.cs b/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationLeaf.cs
index cdc42adca8..e1213a7316 100644
--- a/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationLeaf.cs
+++ b/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationLeaf.cs
@@ -2,14 +2,18 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using Elastic.Documentation.Extensions;
+
 namespace Elastic.Documentation.Navigation.V2;
 
 /// <summary>
-/// A disabled placeholder link in the V2 navigation sidebar.
-/// Has a title but no URL — rendered with <c>cursor-not-allowed</c>.
+/// A placeholder link in the V2 navigation sidebar.
+/// Has a URL pointing to a generated stub page but is rendered greyed-out
+/// to indicate the content is not yet finalised.
 /// </summary>
 public class PlaceholderNavigationLeaf(
 	string title,
+	string sitePrefix,
 	INodeNavigationItem<INavigationModel, INavigationItem>? parent
 ) : ILeafNavigationItem<INavigationModel>, INavigationModel
 {
@@ -17,7 +21,7 @@ public class PlaceholderNavigationLeaf(
 	public INavigationModel Model => this;
 
 	/// <inheritdoc />
-	public string Url => string.Empty;
+	public string Url { get; } = ComputeUrl(title, sitePrefix);
 
 	/// <inheritdoc />
 	public string NavigationTitle { get; } = title;
@@ -33,4 +37,11 @@ public class PlaceholderNavigationLeaf(
 
 	/// <inheritdoc />
 	public int NavigationIndex { get; set; }
+
+	private static string ComputeUrl(string title, string sitePrefix)
+	{
+		var hash = ShortId.Create("placeholder", title);
+		var prefix = string.IsNullOrEmpty(sitePrefix) ? "" : "/" + sitePrefix.Trim('/');
+		return $"{prefix}/_placeholder/{hash}";
+	}
 }
diff --git a/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs
index 5b29a0370d..5835f191ae 100644
--- a/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs
+++ b/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs
@@ -8,7 +8,8 @@ namespace Elastic.Documentation.Navigation.V2;
 
 /// <summary>
 /// A placeholder folder node in the V2 navigation sidebar.
-/// Has children and a chevron toggle but no real URL — rendered with <c>cursor-not-allowed</c>.
+/// Has a URL pointing to a generated stub page; rendered greyed-out
+/// to indicate the content is not yet finalised.
 /// </summary>
 public class PlaceholderNavigationNode : INodeNavigationItem<INavigationModel, INavigationItem>
 {
@@ -16,12 +17,14 @@ public class PlaceholderNavigationNode : INodeNavigationItem<INavigationModel, I
 
 	public PlaceholderNavigationNode(
 		string title,
+		string sitePrefix,
 		IReadOnlyCollection<INavigationItem> children,
 		INodeNavigationItem<INavigationModel, INavigationItem>? parent
 	)
 	{
 		Id = ShortId.Create("placeholder-group", title);
 		NavigationTitle = title;
+		Url = ComputeUrl(title, sitePrefix);
 		NavigationItems = children;
 		Parent = parent;
 		NavigationRoot = parent?.NavigationRoot!;
@@ -32,7 +35,7 @@ public PlaceholderNavigationNode(
 	public string Id { get; }
 
 	/// <inheritdoc />
-	public string Url => string.Empty;
+	public string Url { get; }
 
 	/// <inheritdoc />
 	public string NavigationTitle { get; }
@@ -55,11 +58,18 @@ public PlaceholderNavigationNode(
 	/// <inheritdoc />
 	public IReadOnlyCollection<INavigationItem> NavigationItems { get; }
 
+	private static string ComputeUrl(string title, string sitePrefix)
+	{
+		var hash = ShortId.Create("placeholder", title);
+		var prefix = string.IsNullOrEmpty(sitePrefix) ? "" : "/" + sitePrefix.Trim('/');
+		return $"{prefix}/_placeholder/{hash}";
+	}
+
 	private sealed class PlaceholderIndexLeaf(PlaceholderNavigationNode owner)
 		: ILeafNavigationItem<INavigationModel>, INavigationModel
 	{
 		public INavigationModel Model => this;
-		public string Url => string.Empty;
+		public string Url => owner.Url;
 		public string NavigationTitle => owner.NavigationTitle;
 		public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot => owner.NavigationRoot;
 		public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; } = owner;
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 43f4f11fc3..9f02805257 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -57,7 +57,7 @@ string sitePrefix
 			LabelNavV2Item label => CreateLabel(label, nodes, parent, sitePrefix),
 			GroupNavV2Item group => CreateGroup(group, nodes, parent, sitePrefix),
 			TocNavV2Item toc => nodes.TryGetValue(toc.Source, out var node) ? node : null,
-			PageNavV2Item { Page: null, Title: var title } => new PlaceholderNavigationLeaf(title ?? "Untitled", parent),
+			PageNavV2Item { Page: null, Title: var title } => new PlaceholderNavigationLeaf(title ?? "Untitled", sitePrefix, parent),
 			PageNavV2Item { Page: var page, Title: var title } => new PageCrossLinkLeaf(page, title ?? page.ToString(), sitePrefix, parent),
 			_ => null
 		};
@@ -87,8 +87,8 @@ string sitePrefix
 			var folderChildren = BuildV2Items(group.Children, nodes, folderPlaceholder, sitePrefix);
 			return new PageFolderNavigationNode(group.Title, group.Page, sitePrefix, folderChildren, parent);
 		}
-		var placeholder = new PlaceholderNavigationNode(group.Title, [], parent);
+		var placeholder = new PlaceholderNavigationNode(group.Title, sitePrefix, [], parent);
 		var children = BuildV2Items(group.Children, nodes, placeholder, sitePrefix);
-		return new PlaceholderNavigationNode(group.Title, children, parent);
+		return new PlaceholderNavigationNode(group.Title, sitePrefix, children, parent);
 	}
 }
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index 8da4fef5d5..4e5444024f 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -40,9 +40,9 @@
 	{
 		<li class="flex group/li pr-8 @(isTopLevel ? "font-semibold mt-6" : "mt-4")">
 			<a
-				class="sidebar-link grow text-grey-40 cursor-not-allowed"
-				aria-disabled="true"
-				tabindex="-1">
+				href="@placeholder.Url"
+				@Model.Htmx.GetNavHxAttributes(true)
+				class="sidebar-link grow text-grey-40">
 				@placeholder.NavigationTitle
 			</a>
 		</li>
@@ -52,11 +52,12 @@
 		var allHidden = placeholderGroup.NavigationItems.All(n => n.Hidden);
 		<li class="flex flex-wrap group-navigation @(isTopLevel ? "mt-6" : "mt-4") relative">
 			<div class="peer grid grid-cols-[1fr_auto] w-full">
-				<span
-					class="sidebar-link pr-2 content-center @(isTopLevel ? "font-semibold" : "") text-grey-40 cursor-not-allowed select-none"
-					aria-disabled="true">
+				<a
+					href="@placeholderGroup.Url"
+					@Model.Htmx.GetNavHxAttributes(true)
+					class="sidebar-link pr-2 content-center @(isTopLevel ? "font-semibold" : "") text-grey-40">
 					@placeholderGroup.NavigationTitle
-				</span>
+				</a>
 				@if (!allHidden)
 				{
 					<label for="@placeholderGroup.Id" class="group/label flex mr-2 items-start">
diff --git a/src/Elastic.Markdown/Page/PlaceholderPage.cshtml b/src/Elastic.Markdown/Page/PlaceholderPage.cshtml
new file mode 100644
index 0000000000..d70b34c1c8
--- /dev/null
+++ b/src/Elastic.Markdown/Page/PlaceholderPage.cshtml
@@ -0,0 +1,9 @@
+@inherits RazorSlice<Elastic.Markdown.MarkdownLayoutViewModel>
+@implements IUsesLayout<Elastic.Markdown._Layout, Elastic.Markdown.MarkdownLayoutViewModel>
+@functions {
+	public Elastic.Markdown.MarkdownLayoutViewModel LayoutModel => Model;
+}
+<section id="elastic-docs-v3">
+	<h1>@Model.Title</h1>
+	<p class="text-grey-50 text-sm mt-6">This content is coming soon.</p>
+</section>
diff --git a/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs b/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
index 2b783062f4..1be45f3cbe 100644
--- a/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
+++ b/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
@@ -16,6 +16,7 @@
 using Elastic.Documentation.Navigation.Assembler;
 using Elastic.Documentation.Navigation.V2;
 using Elastic.Documentation.Services;
+using Elastic.Documentation.Site.FileProviders;
 using Microsoft.Extensions.Logging;
 
 namespace Elastic.Documentation.Assembler.Building;
@@ -138,6 +139,14 @@ Cancel ctx
 
 		await builder.BuildAllAsync(assembleSources.AssembleSets, exporters, ctx);
 
+		if (exporters.Contains(Exporter.Html) && navigation is SiteNavigationV2 navV2)
+		{
+			var firstBuildContext = assembleSources.AssembleSets.Values.First().BuildContext;
+			var staticHashProvider = new StaticFileContentHashProvider(new EmbeddedOrPhysicalFileProvider(firstBuildContext));
+			var placeholderWriter = new PlaceholderPageWriter(logFactory, navV2, htmlWriter, assembleContext, featureFlags, staticHashProvider);
+			await placeholderWriter.WriteAllAsync(ctx);
+		}
+
 		if (exporters.Contains(Exporter.LinkMetadata))
 			await cloner.WriteLinkRegistrySnapshot(checkoutResult.LinkRegistrySnapshot, ctx);
 
diff --git a/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs b/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs
new file mode 100644
index 0000000000..b0da45a8c5
--- /dev/null
+++ b/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs
@@ -0,0 +1,155 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Documentation;
+using Elastic.Documentation.Assembler.Navigation;
+using Elastic.Documentation.Configuration;
+using Elastic.Documentation.Configuration.Assembler;
+using Elastic.Documentation.Configuration.Builder;
+using Elastic.Documentation.Configuration.Versions;
+using Elastic.Documentation.Extensions;
+using Elastic.Documentation.Navigation;
+using Elastic.Documentation.Navigation.V2;
+using Elastic.Documentation.Site;
+using Elastic.Documentation.Site.FileProviders;
+using Elastic.Markdown;
+using Elastic.Markdown.Page;
+using Microsoft.Extensions.Logging;
+using RazorSlices;
+
+namespace Elastic.Documentation.Assembler.Building;
+
+/// <summary>
+/// Generates stub HTML pages for all <see cref="PlaceholderNavigationLeaf"/> and
+/// <see cref="PlaceholderNavigationNode"/> items in the V2 navigation tree.
+/// Each stub renders the full site chrome (header, nav sidebar, footer) with an H1
+/// title and "coming soon" body, using the computed placeholder URL.
+/// </summary>
+public class PlaceholderPageWriter(
+	ILoggerFactory logFactory,
+	SiteNavigationV2 navigation,
+	GlobalNavigationHtmlWriter htmlWriter,
+	AssembleContext context,
+	FeatureFlags featureFlags,
+	StaticFileContentHashProvider staticFileHashProvider
+)
+{
+	private readonly ILogger _logger = logFactory.CreateLogger<PlaceholderPageWriter>();
+
+	public async Task WriteAllAsync(Cancel ctx)
+	{
+		var navHtml = (await htmlWriter.RenderNavigation(navigation, navigation.Index, ctx)).Html;
+
+		var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+		var placeholders = CollectPlaceholders(navigation.V2NavigationItems);
+
+		foreach (var (title, navItem) in placeholders)
+		{
+			if (!seen.Add(navItem.Url))
+				continue;
+			await WritePlaceholderPageAsync(title, navItem, navHtml, ctx);
+		}
+
+		_logger.LogInformation("Wrote {Count} placeholder pages", seen.Count);
+	}
+
+	private static IEnumerable<(string Title, ILeafNavigationItem<INavigationModel> Item)> CollectPlaceholders(
+		IReadOnlyList<INavigationItem> items
+	)
+	{
+		foreach (var item in items)
+		{
+			switch (item)
+			{
+				case PlaceholderNavigationLeaf leaf:
+					yield return (leaf.NavigationTitle, leaf);
+					break;
+				case PlaceholderNavigationNode group:
+					yield return (group.NavigationTitle, group.Index);
+					foreach (var child in CollectPlaceholders(group.NavigationItems.ToList()))
+						yield return child;
+					break;
+				case LabelNavigationNode label:
+					foreach (var child in CollectPlaceholders(label.NavigationItems.ToList()))
+						yield return child;
+					break;
+			}
+		}
+	}
+
+	private async Task WritePlaceholderPageAsync(
+		string title,
+		ILeafNavigationItem<INavigationModel> navItem,
+		string navHtml,
+		Cancel ctx
+	)
+	{
+		var model = CreateViewModel(title, navItem, navHtml);
+		var slice = PlaceholderPage.Create(model);
+		var html = await slice.RenderAsync(cancellationToken: ctx);
+
+		// item.Url is like "/docs/_placeholder/AABBCCDD" — write to outputDir + url + /index.html
+		var relativePath = navItem.Url.TrimStart('/');
+		var outputPath = Path.Combine(context.OutputDirectory.FullName, relativePath, "index.html");
+		var outputDir = Path.GetDirectoryName(outputPath)!;
+		if (!context.WriteFileSystem.Directory.Exists(outputDir))
+			_ = context.WriteFileSystem.Directory.CreateDirectory(outputDir);
+
+		await context.WriteFileSystem.File.WriteAllTextAsync(outputPath, html, ctx);
+	}
+
+	private MarkdownLayoutViewModel CreateViewModel(
+		string title,
+		ILeafNavigationItem<INavigationModel> navItem,
+		string navHtml
+	)
+	{
+		var env = context.Environment;
+		var urlPathPrefix = env.PathPrefix;
+		var rootPath = string.IsNullOrEmpty(urlPathPrefix) ? "/" : $"/{urlPathPrefix.Trim('/')}/";
+
+		return new MarkdownLayoutViewModel
+		{
+			DocsBuilderVersion = ShortId.Create(BuildContext.Version),
+			DocSetName = "Elastic Docs",
+			Title = title,
+			Description = string.Empty,
+			CurrentNavigationItem = navItem,
+			Previous = null,
+			Next = null,
+			NavigationHtml = navHtml,
+			UrlPathPrefix = urlPathPrefix,
+			Htmx = new DefaultHtmxAttributeProvider(rootPath),
+			CanonicalBaseUrl = context.CanonicalBaseUrl,
+			Features = featureFlags,
+			GoogleTagManager = new GoogleTagManagerConfiguration
+			{
+				Enabled = env.GoogleTagManager.Enabled,
+				Id = env.GoogleTagManager.Id,
+				Auth = env.GoogleTagManager.Auth,
+				Preview = env.GoogleTagManager.Preview,
+				CookiesWin = env.GoogleTagManager.CookiesWin
+			},
+			Optimizely = new OptimizelyConfiguration
+			{
+				Enabled = env.Optimizely.Enabled,
+				Id = env.Optimizely.Id
+			},
+			AllowIndexing = false,
+			StaticFileContentHashProvider = staticFileHashProvider,
+			BuildType = BuildType.Assembler,
+			GithubEditUrl = null,
+			MarkdownUrl = string.Empty,
+			HideEditThisPage = true,
+			ReportIssueUrl = null,
+			Breadcrumbs = [],
+			PageTocItems = [],
+			Layout = null,
+			VersioningSystem = context.VersionsConfiguration.GetVersioningSystem(VersioningSystemId.All),
+			VersionDropdownSerializedModel = null,
+			CurrentVersion = null,
+			AllVersionsUrl = null
+		};
+	}
+}

From eea7a087616df1bdd03598cef137373198e86b12 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 24 Mar 2026 12:06:07 +0100
Subject: [PATCH 027/226] =?UTF-8?q?docs(nav-v2):=20update=20status=20?=
 =?UTF-8?q?=E2=80=94=20placeholder=20items=20now=20generate=20stub=20pages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 nav-v2-status.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nav-v2-status.md b/nav-v2-status.md
index 44394a8995..6f13560244 100644
--- a/nav-v2-status.md
+++ b/nav-v2-status.md
@@ -30,8 +30,8 @@ Build passes. Preview at https://docs-v3-preview.elastic.dev/elastic/docs-builde
 | Type | YAML key | C# type | Renders as |
 |------|----------|---------|------------|
 | Section heading | `label:` | `LabelNavigationNode` | Non-clickable uppercase header |
-| Placeholder leaf | `title:` only | `PlaceholderNavigationLeaf` | Greyed-out disabled link |
-| Placeholder folder | `group:` (no `page:`) | `PlaceholderNavigationNode` | Greyed-out folder with chevron |
+| Placeholder leaf | `title:` only | `PlaceholderNavigationLeaf` | Greyed link → generated stub page |
+| Placeholder folder | `group:` (no `page:`) | `PlaceholderNavigationNode` | Greyed folder header → generated stub page |
 | Page-folder | `group:` + `page:` | `PageFolderNavigationNode` | Clickable folder header with chevron |
 | Cross-link leaf | `page:` | `PageCrossLinkLeaf` | Normal clickable link |
 | TOC section | `toc:` | existing `IRootNavigationItem` | Full TOC tree (as V1) |
@@ -107,7 +107,7 @@ Production migration path: wire `NavigationTocMappings` from the V2 file, with o
 
 ## Open items
 
-1. **Remaining placeholders** — most sections still use `title:` placeholders pending IA decisions.
+1. **Remaining placeholders** — most sections still use `title:` placeholders pending IA decisions. Each now generates a greyed-but-clickable stub page at `/_placeholder/{hash}/`.
 2. **Production migration** — wire `NavigationTocMappings` from V2 file; optional `path:` key on `toc:` entries for zero-redirect URL pinning.
 3. **Re-enable Reference / Troubleshooting** — currently commented out; uncomment once team approves structure.
 

From db10774b857c6353a7e219a17cd9d0d95305ed8b Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 24 Mar 2026 12:19:59 +0100
Subject: [PATCH 028/226] fix(nav-v2): use absolute URL path prefix for
 placeholder page static assets

env.PathPrefix is "docs" (no leading slash); UrlPathPrefix must be "/docs"
so Static() generates absolute paths like /docs/_static/styles.css instead
of relative paths that resolve incorrectly from /_placeholder/HASH/ depth.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Building/PlaceholderPageWriter.cs                        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs b/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs
index b0da45a8c5..a4f8a54109 100644
--- a/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs
@@ -106,8 +106,9 @@ string navHtml
 	)
 	{
 		var env = context.Environment;
-		var urlPathPrefix = env.PathPrefix;
-		var rootPath = string.IsNullOrEmpty(urlPathPrefix) ? "/" : $"/{urlPathPrefix.Trim('/')}/";
+		var rawPrefix = env.PathPrefix;
+		var urlPathPrefix = string.IsNullOrEmpty(rawPrefix) ? string.Empty : $"/{rawPrefix.TrimStart('/')}";
+		var rootPath = string.IsNullOrEmpty(urlPathPrefix) ? "/" : $"{urlPathPrefix.TrimEnd('/')}/";
 
 		return new MarkdownLayoutViewModel
 		{

From 6b953fd6e7425e8d3d2c094eec344ac15e7e721a Mon Sep 17 00:00:00 2001
From: florent-leborgne <florent.leborgne@elastic.co>
Date: Tue, 24 Mar 2026 13:52:59 +0100
Subject: [PATCH 029/226] feat(nav-v2): wire Explore/Visualize,
 Share/Alert/Automate, and AI/ML sections (#2957)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace placeholder title: entries with full-depth page: references for
three navigation sections:

- **Explore and visualize**: Discover, Dashboards, Panels & visualizations
  (Lens, Maps, Canvas, Graph, Legacy editors), Find and organize content.
  Reordered to: Learn → Discover → Dashboards → Panels → Find & organize.

- **Share, alert, and automate** (renamed from "Alert and trigger actions"):
  Reporting and sharing (moved from Explore), Workflows (full depth incl.
  triggers, steps, data handling), Alerting (alerts + full Watcher tree),
  Cases.

- **AI and machine learning**: ML/NLP (anomaly detection, data frame
  analytics, NLP, ML in Kibana), AI framework (Elastic Inference, Agent
  Builder with full tool/agent/programmatic-access tree, AI chats, LLM
  guides), AI agent skills.

All 313 page: entries include title: overrides derived from each file's
navigation_title frontmatter field or cleaned H1 heading.

Both "Explore and visualize" and "Share, alert, and automate" groups now
link to new overview landing pages added in docs-content (hidden pages,
merged via elastic/docs-content#5601).

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 739 +++++++++++++++++++++++++++++++++++----
 1 file changed, 678 insertions(+), 61 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index eba09c9e19..22fa928575 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -292,88 +292,705 @@ nav:
           - title: Query languages
           - title: Query tools
       - group: Explore and visualize
+        page: docs-content://explore-analyze/explore-and-visualize.md
         children:
-        - title: Learn data exploration and visualization
-        - group: Find and organize content
+        - page: docs-content://explore-analyze/kibana-data-exploration-learning-tutorial.md
+          title: Learn data exploration and visualization
+        - group: Discover
+          page: docs-content://explore-analyze/discover.md
           children:
-          - title: Data views
-          - title: Files
-          - title: Find apps and objects
-          - title: Reports
-          - title: Saved objects
-          - title: Tags
-        - group: Reporting and sharing
+          - page: docs-content://explore-analyze/discover/discover-get-started.md
+            title: Explore fields and data with Discover
+          - page: docs-content://explore-analyze/discover/document-explorer.md
+            title: Customize the Discover view
+          - page: docs-content://explore-analyze/discover/discover-search-for-relevance.md
+            title: Search for relevance
+          - page: docs-content://explore-analyze/discover/save-open-search.md
+            title: Save a search for reuse
+          - page: docs-content://explore-analyze/discover/show-field-statistics.md
+            title: View field statistics
+          - page: docs-content://explore-analyze/discover/run-pattern-analysis-discover.md
+            title: Run a pattern analysis on your log data
+          - page: docs-content://explore-analyze/discover/background-search.md
+            title: Run queries in the background
+          - page: docs-content://explore-analyze/discover/try-esql.md
+            title: "Using ES|QL"
+        - group: Dashboards
+          page: docs-content://explore-analyze/dashboards.md
           children:
-          - title: Automatically generate reports
+          - page: docs-content://explore-analyze/dashboards/using.md
+            title: Exploring dashboards
+          - group: Building dashboards
+            page: docs-content://explore-analyze/dashboards/building.md
+            children:
+            - page: docs-content://explore-analyze/dashboards/create-dashboard.md
+              title: Create a dashboard
+            - page: docs-content://explore-analyze/dashboards/open-dashboard.md
+              title: Edit a dashboard
+            - page: docs-content://explore-analyze/dashboards/add-controls.md
+              title: Add filter controls
+            - page: docs-content://explore-analyze/dashboards/drilldowns.md
+              title: Add drilldowns
+            - page: docs-content://explore-analyze/dashboards/arrange-panels.md
+              title: Organize dashboard panels
+            - page: docs-content://explore-analyze/dashboards/duplicate-dashboards.md
+              title: Duplicate a dashboard
+            - page: docs-content://explore-analyze/dashboards/import-dashboards.md
+              title: Import a dashboard
+          - page: docs-content://explore-analyze/dashboards/managing.md
+            title: Managing dashboards
+          - page: docs-content://explore-analyze/dashboards/sharing.md
+            title: Sharing dashboards
+          - group: Tutorials
+            page: docs-content://explore-analyze/dashboards/tutorials.md
+            children:
+            - page: docs-content://explore-analyze/dashboards/create-dashboard-of-panels-with-web-server-data.md
+              title: Create a simple dashboard to monitor website logs
+            - page: docs-content://explore-analyze/dashboards/create-dashboard-of-panels-with-ecommerce-data.md
+              title: Create a dashboard with time series charts
         - group: Panels and visualizations
+          page: docs-content://explore-analyze/visualize.md
           children:
-          - title: Alert panels
-          - title: Custom visualizations with Vega
-          - title: Image panels
-          - title: Legacy editors
-          - title: Lens
-          - title: Link panels
-          - title: Maps
-          - title: Text panels
-        - group: Dashboards
-          children:
-          - title: Add filter controls
-          - title: Organize dashboard panels
-          - title: Building dashboards
-          - title: Create a dashboard
-          - title: "Tutorial: dashboard with time series charts"
-          - title: "Tutorial: dashboard to monitor website logs"
-          - title: Add drilldowns
-          - title: Duplicate a dashboard
-          - title: Import a dashboard
-          - title: Managing dashboards
-          - title: Sharing dashboards
-          - title: Exploring dashboards
-        - group: Discover
+          - page: docs-content://explore-analyze/visualize/visualize-library.md
+            title: Visualize Library
+          - page: docs-content://explore-analyze/visualize/manage-panels.md
+            title: Manage panels
+          - group: Lens
+            page: docs-content://explore-analyze/visualize/lens.md
+            children:
+            - page: docs-content://explore-analyze/visualize/charts/area-charts.md
+              title: Area charts
+            - page: docs-content://explore-analyze/visualize/charts/bar-charts.md
+              title: Bar charts
+            - page: docs-content://explore-analyze/visualize/charts/heat-map-charts.md
+              title: Heat map charts
+            - page: docs-content://explore-analyze/visualize/charts/gauge-charts.md
+              title: Gauge charts
+            - page: docs-content://explore-analyze/visualize/charts/line-charts.md
+              title: Line charts
+            - page: docs-content://explore-analyze/visualize/charts/metric-charts.md
+              title: Metric charts
+            - page: docs-content://explore-analyze/visualize/charts/mosaic-charts.md
+              title: Mosaic charts
+            - page: docs-content://explore-analyze/visualize/charts/pie-charts.md
+              title: Pie charts
+            - page: docs-content://explore-analyze/visualize/charts/region-map-charts.md
+              title: Region map charts
+            - page: docs-content://explore-analyze/visualize/charts/tables.md
+              title: Tables
+            - page: docs-content://explore-analyze/visualize/charts/waffle-charts.md
+              title: Waffle charts
+            - page: docs-content://explore-analyze/visualize/charts/tag-cloud-charts.md
+              title: Tag cloud charts
+            - page: docs-content://explore-analyze/visualize/charts/treemap-charts.md
+              title: Treemap charts
+          - page: docs-content://explore-analyze/visualize/esorql.md
+            title: "ES|QL"
+          - page: docs-content://explore-analyze/visualize/custom-visualizations-with-vega.md
+            title: Custom visualizations with Vega
+          - page: docs-content://explore-analyze/visualize/text-panels.md
+            title: Text panels
+          - page: docs-content://explore-analyze/visualize/image-panels.md
+            title: Image panels
+          - page: docs-content://explore-analyze/visualize/link-panels.md
+            title: Link panels
+          - page: docs-content://explore-analyze/visualize/alert-panels.md
+            title: Alert panels
+          - group: Canvas
+            page: docs-content://explore-analyze/visualize/canvas.md
+            children:
+            - page: docs-content://explore-analyze/visualize/canvas/edit-workpads.md
+              title: Edit workpads
+            - page: docs-content://explore-analyze/visualize/canvas/canvas-present-workpad.md
+              title: Present your workpad
+            - page: docs-content://explore-analyze/visualize/canvas/canvas-tutorial.md
+              title: "Tutorial: Create a workpad for monitoring sales"
+            - group: Canvas function reference
+              page: docs-content://explore-analyze/visualize/canvas/canvas-function-reference.md
+              children:
+              - page: docs-content://explore-analyze/visualize/canvas/canvas-tinymath-functions.md
+                title: TinyMath functions
+          - group: Maps
+            page: docs-content://explore-analyze/visualize/maps.md
+            children:
+            - page: docs-content://explore-analyze/visualize/maps/maps-getting-started.md
+              title: Build a map to compare metrics by country or region
+            - page: docs-content://explore-analyze/visualize/maps/asset-tracking-tutorial.md
+              title: Track, visualize, and alert on assets in real time
+            - page: docs-content://explore-analyze/visualize/maps/reverse-geocoding-tutorial.md
+              title: Map custom regions with reverse geocoding
+            - page: docs-content://explore-analyze/visualize/maps/heatmap-layer.md
+              title: Heat map layer
+            - page: docs-content://explore-analyze/visualize/maps/tile-layer.md
+              title: Tile layer
+            - group: Vector layer
+              page: docs-content://explore-analyze/visualize/maps/vector-layer.md
+              children:
+              - page: docs-content://explore-analyze/visualize/maps/vector-style.md
+                title: Vector styling
+              - page: docs-content://explore-analyze/visualize/maps/maps-vector-style-properties.md
+                title: Vector style properties
+              - page: docs-content://explore-analyze/visualize/maps/vector-tooltip.md
+                title: Vector tooltips
+            - group: Map aggregations
+              page: docs-content://explore-analyze/visualize/maps/maps-aggregations.md
+              children:
+              - page: docs-content://explore-analyze/visualize/maps/maps-grid-aggregation.md
+                title: Clusters
+              - page: docs-content://explore-analyze/visualize/maps/maps-top-hits-aggregation.md
+                title: Display the most relevant documents per entity
+              - page: docs-content://explore-analyze/visualize/maps/point-to-point.md
+                title: Point to point
+              - page: docs-content://explore-analyze/visualize/maps/terms-join.md
+                title: Term join
+            - group: Search and filter maps
+              page: docs-content://explore-analyze/visualize/maps/maps-search.md
+              children:
+              - page: docs-content://explore-analyze/visualize/maps/maps-create-filter-from-map.md
+                title: Create filters from a map
+              - page: docs-content://explore-analyze/visualize/maps/maps-layer-based-filtering.md
+                title: Filter a single layer
+              - page: docs-content://explore-analyze/visualize/maps/maps-search-across-multiple-indices.md
+                title: Search across multiple indices
+            - page: docs-content://explore-analyze/visualize/maps/maps-settings.md
+              title: Configure map settings
+            - page: docs-content://explore-analyze/visualize/maps/maps-connect-to-ems.md
+              title: Connect to Elastic Maps Service
+            - group: Import geospatial data
+              page: docs-content://explore-analyze/visualize/maps/import-geospatial-data.md
+              children:
+              - page: docs-content://explore-analyze/visualize/maps/maps-clean-data.md
+                title: Clean your data
+              - page: docs-content://explore-analyze/visualize/maps/indexing-geojson-data-tutorial.md
+                title: "Tutorial: Index GeoJSON data"
+            - page: docs-content://explore-analyze/visualize/maps/maps-troubleshooting.md
+              title: Troubleshoot
+          - group: Graph
+            page: docs-content://explore-analyze/visualize/graph.md
+            children:
+            - page: docs-content://explore-analyze/visualize/graph/graph-configuration.md
+              title: Configure Graph
+            - page: docs-content://explore-analyze/visualize/graph/graph-troubleshooting.md
+              title: Troubleshooting and limitations
+          - group: Legacy editors
+            page: docs-content://explore-analyze/visualize/legacy-editors.md
+            children:
+            - page: docs-content://explore-analyze/visualize/legacy-editors/aggregation-based.md
+              title: Aggregation-based
+            - page: docs-content://explore-analyze/visualize/legacy-editors/tsvb.md
+              title: TSVB
+            - page: docs-content://explore-analyze/visualize/legacy-editors/timelion.md
+              title: Timelion
+        - group: Find and organize content
+          page: docs-content://explore-analyze/find-and-organize.md
           children:
-          - title: Run queries in the background
-          - title: Explore fields and data with Discover
-          - title: Search for relevance
-          - title: Customize the Discover view
-          - title: Run a pattern analysis on log data
-          - title: Save a search for reuse
-          - title: Using ES|QL
-      - group: Alert and trigger actions
+          - page: docs-content://explore-analyze/find-and-organize/data-views.md
+            title: Data views
+          - page: docs-content://explore-analyze/find-and-organize/saved-objects.md
+            title: Saved objects
+          - page: docs-content://explore-analyze/find-and-organize/files.md
+            title: Files
+          - page: docs-content://explore-analyze/find-and-organize/reports.md
+            title: Reports
+          - page: docs-content://explore-analyze/find-and-organize/tags.md
+            title: Tags
+          - page: docs-content://explore-analyze/find-and-organize/find-apps-and-objects.md
+            title: Find apps and objects
+      - group: Share, alert, and automate
+        page: docs-content://explore-analyze/share-alert-and-automate.md
         children:
+        - group: Reporting and sharing
+          page: docs-content://explore-analyze/report-and-share.md
+          children:
+          - page: docs-content://explore-analyze/report-and-share/automating-report-generation.md
+            title: Automatically generate reports
+          - group: Reporting troubleshooting
+            page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting.md
+            children:
+            - page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting-csv.md
+              title: CSV
+            - page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting-pdf.md
+              title: PDF/PNG
         - group: Workflows
+          page: docs-content://explore-analyze/workflows.md
           children:
-          - title: Author workflows
-          - title: Data and error handling
-          - title: Get started with workflows
-          - title: Steps
-          - title: Triggers
-        - title: Alerting
+          - page: docs-content://explore-analyze/workflows/setup.md
+            title: Set up workflows
+          - page: docs-content://explore-analyze/workflows/get-started.md
+            title: Get started with workflows
+          - group: Core components
+            page: docs-content://explore-analyze/workflows/core-components.md
+            children:
+            - group: Triggers
+              page: docs-content://explore-analyze/workflows/triggers.md
+              children:
+              - page: docs-content://explore-analyze/workflows/triggers/manual-triggers.md
+                title: Manual triggers
+              - page: docs-content://explore-analyze/workflows/triggers/scheduled-triggers.md
+                title: Scheduled triggers
+              - page: docs-content://explore-analyze/workflows/triggers/alert-triggers.md
+                title: Alert triggers
+            - group: Steps
+              page: docs-content://explore-analyze/workflows/steps.md
+              children:
+              - group: Action steps
+                page: docs-content://explore-analyze/workflows/steps/action-steps.md
+                children:
+                - page: docs-content://explore-analyze/workflows/steps/elasticsearch.md
+                  title: Elasticsearch
+                - page: docs-content://explore-analyze/workflows/steps/kibana.md
+                  title: Kibana
+                - page: docs-content://explore-analyze/workflows/steps/external-systems-apps.md
+                  title: External systems and apps
+              - group: Flow control steps
+                page: docs-content://explore-analyze/workflows/steps/flow-control-steps.md
+                children:
+                - page: docs-content://explore-analyze/workflows/steps/if.md
+                  title: If
+                - page: docs-content://explore-analyze/workflows/steps/foreach.md
+                  title: Foreach
+                - page: docs-content://explore-analyze/workflows/steps/wait.md
+                  title: Wait
+              - page: docs-content://explore-analyze/workflows/steps/ai-steps.md
+                title: AI steps
+          - group: Data and error handling
+            page: docs-content://explore-analyze/workflows/data.md
+            children:
+            - page: docs-content://explore-analyze/workflows/data/templating.md
+              title: Templating engine
+          - page: docs-content://explore-analyze/workflows/author-workflows.md
+            title: Author workflows
+          - page: docs-content://explore-analyze/workflows/monitor-troubleshoot.md
+            title: Monitor and troubleshoot workflows
+          - page: docs-content://explore-analyze/workflows/manage-workflows.md
+            title: Manage workflows
+          - page: docs-content://explore-analyze/workflows/templates.md
+            title: Workflow templates
+        - group: Alerting
+          page: docs-content://explore-analyze/alerting.md
+          children:
+          - group: Alerts
+            page: docs-content://explore-analyze/alerting/alerts.md
+            children:
+            - page: docs-content://explore-analyze/alerting/alerts/alerting-getting-started.md
+              title: Getting started with alerts
+            - page: docs-content://explore-analyze/alerting/alerts/alerting-setup.md
+              title: Set up
+            - page: docs-content://explore-analyze/alerting/alerts/create-manage-rules.md
+              title: Create and manage rules
+            - page: docs-content://explore-analyze/alerting/alerts/view-alerts.md
+              title: View and manage alerts
+            - page: docs-content://explore-analyze/alerting/alerts/query-alerts.md
+              title: Query alert indices
+            - group: Rule types
+              page: docs-content://explore-analyze/alerting/alerts/rule-types.md
+              children:
+              - page: docs-content://explore-analyze/alerting/alerts/rule-type-index-threshold.md
+                title: Index threshold
+              - page: docs-content://explore-analyze/alerting/alerts/rule-type-es-query.md
+                title: Elasticsearch query
+              - page: docs-content://explore-analyze/alerting/alerts/geo-alerting.md
+                title: Tracking containment
+            - page: docs-content://explore-analyze/alerting/alerts/rule-action-variables.md
+              title: Rule action variables
+            - page: docs-content://explore-analyze/alerting/alerts/notifications-domain-allowlist.md
+              title: Notifications domain allowlist
+            - group: Alerting troubleshooting
+              page: docs-content://explore-analyze/alerting/alerts/alerting-troubleshooting.md
+              children:
+              - page: docs-content://explore-analyze/alerting/alerts/alerting-common-issues.md
+                title: Common issues
+              - page: docs-content://explore-analyze/alerting/alerts/event-log-index.md
+                title: Event log index
+              - page: docs-content://explore-analyze/alerting/alerts/testing-connectors.md
+                title: Test connectors
+            - page: docs-content://explore-analyze/alerting/alerts/maintenance-windows.md
+              title: Maintenance windows
+          - group: Watcher
+            page: docs-content://explore-analyze/alerting/watcher.md
+            children:
+            - page: docs-content://explore-analyze/alerting/watcher/watcher-getting-started.md
+              title: Getting started with Watcher
+            - page: docs-content://explore-analyze/alerting/watcher/how-watcher-works.md
+              title: How Watcher works
+            - page: docs-content://explore-analyze/alerting/watcher/enable-watcher.md
+              title: Enable Watcher
+            - page: docs-content://explore-analyze/alerting/watcher/watcher-ui.md
+              title: Watcher UI
+            - page: docs-content://explore-analyze/alerting/watcher/encrypting-data.md
+              title: Encrypting sensitive data in Watcher
+            - group: Input
+              page: docs-content://explore-analyze/alerting/watcher/input.md
+              children:
+              - page: docs-content://explore-analyze/alerting/watcher/input-simple.md
+                title: Simple input
+              - page: docs-content://explore-analyze/alerting/watcher/input-search.md
+                title: Search input
+              - page: docs-content://explore-analyze/alerting/watcher/input-http.md
+                title: HTTP input
+              - page: docs-content://explore-analyze/alerting/watcher/input-chain.md
+                title: Chain input
+            - group: Trigger
+              page: docs-content://explore-analyze/alerting/watcher/trigger.md
+              children:
+              - page: docs-content://explore-analyze/alerting/watcher/trigger-schedule.md
+                title: Schedule trigger
+              - page: docs-content://explore-analyze/alerting/watcher/throttling.md
+                title: Throttling
+              - page: docs-content://explore-analyze/alerting/watcher/schedule-types.md
+                title: Schedule Types
+            - group: Condition
+              page: docs-content://explore-analyze/alerting/watcher/condition.md
+              children:
+              - page: docs-content://explore-analyze/alerting/watcher/condition-always.md
+                title: Always condition
+              - page: docs-content://explore-analyze/alerting/watcher/condition-never.md
+                title: Never condition
+              - page: docs-content://explore-analyze/alerting/watcher/condition-compare.md
+                title: Compare condition
+              - page: docs-content://explore-analyze/alerting/watcher/condition-array-compare.md
+                title: Array compare condition
+              - page: docs-content://explore-analyze/alerting/watcher/condition-script.md
+                title: Script condition
+            - group: Actions
+              page: docs-content://explore-analyze/alerting/watcher/actions.md
+              children:
+              - page: docs-content://explore-analyze/alerting/watcher/action-foreach.md
+                title: Running an action for each element in an array
+              - page: docs-content://explore-analyze/alerting/watcher/action-conditions.md
+                title: Adding conditions to actions
+              - page: docs-content://explore-analyze/alerting/watcher/actions-email.md
+                title: Email action
+              - page: docs-content://explore-analyze/alerting/watcher/actions-webhook.md
+                title: Webhook action
+              - page: docs-content://explore-analyze/alerting/watcher/actions-index.md
+                title: Index action
+              - page: docs-content://explore-analyze/alerting/watcher/actions-logging.md
+                title: Logging action
+              - page: docs-content://explore-analyze/alerting/watcher/actions-slack.md
+                title: Slack action
+              - page: docs-content://explore-analyze/alerting/watcher/actions-pagerduty.md
+                title: PagerDuty action
+              - page: docs-content://explore-analyze/alerting/watcher/actions-jira.md
+                title: Jira action
+            - group: Transform
+              page: docs-content://explore-analyze/alerting/watcher/transform.md
+              children:
+              - page: docs-content://explore-analyze/alerting/watcher/transform-search.md
+                title: Search payload transform
+              - page: docs-content://explore-analyze/alerting/watcher/transform-script.md
+                title: Script payload transform
+              - page: docs-content://explore-analyze/alerting/watcher/transform-chain.md
+                title: Chain payload transform
+            - page: docs-content://explore-analyze/alerting/watcher/managing-watches.md
+              title: Managing watches
+            - group: Example watches
+              page: docs-content://explore-analyze/alerting/watcher/example-watches.md
+              children:
+              - page: docs-content://explore-analyze/alerting/watcher/watch-cluster-status.md
+                title: Watching the status of an Elasticsearch cluster
+              - page: docs-content://explore-analyze/alerting/watcher/execute-watch.md
+                title: Execute a watch
+            - page: docs-content://explore-analyze/alerting/watcher/watcher-limitations.md
+              title: Limitations
         - group: Cases
+          page: docs-content://explore-analyze/cases.md
           children:
-          - title: Attach objects to cases
-          - title: Configure case settings
-          - title: Create cases
-          - title: Manage cases
-          - title: Search and share cases
+          - page: docs-content://explore-analyze/cases/control-case-access.md
+            title: Control access
+          - page: docs-content://explore-analyze/cases/create-cases.md
+            title: Create cases
+          - page: docs-content://explore-analyze/cases/manage-cases.md
+            title: Manage cases
+          - page: docs-content://explore-analyze/cases/attach-objects-to-cases.md
+            title: Attach objects
+          - page: docs-content://explore-analyze/cases/search-share-cases.md
+            title: Search and share
+          - page: docs-content://explore-analyze/cases/configure-case-settings.md
+            title: Configure settings
+          - page: docs-content://explore-analyze/cases/cases-as-data.md
+            title: Cases as data
     - label: AI and machine learning
       children:
       - group: Machine Learning and NLP
+        page: docs-content://explore-analyze/machine-learning.md
         children:
-        - title: Anomaly detection
-        - title: Data frame analytics
+        - page: docs-content://explore-analyze/machine-learning/setting-up-machine-learning.md
+          title: Setup and security
+        - group: Anomaly detection
+          page: docs-content://explore-analyze/machine-learning/anomaly-detection.md
+          children:
+          - group: Finding anomalies
+            page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-finding-anomalies.md
+            children:
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-plan.md
+              title: Plan your analysis
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-run-jobs.md
+              title: Run a job
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-view-results.md
+              title: View the results
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-forecast.md
+              title: Forecast future behavior
+          - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-getting-started.md
+            title: Tutorial
+          - group: Concepts
+            page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-concepts.md
+            children:
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-algorithms.md
+              title: Anomaly detection algorithms
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-explain.md
+              title: Anomaly score explanation
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-anomaly-detection-job-types.md
+              title: Job types
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/anomaly-detection-scale.md
+              title: Working with anomaly detection at scale
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-delayed-data-detection.md
+              title: Handling delayed data
+          - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-api-quickref.md
+            title: API quick reference
+          - group: How-tos
+            page: docs-content://explore-analyze/machine-learning/anomaly-detection/anomaly-how-tos.md
+            children:
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-alerts.md
+              title: Generating alerts for anomaly detection jobs
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-aggregation.md
+              title: Aggregating data for faster performance
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-transform.md
+              title: Altering data in your datafeed with runtime fields
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-detector-custom-rules.md
+              title: Customizing detectors with custom rules
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-categories.md
+              title: Detecting anomalous categories of data
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-populations.md
+              title: Performing population analysis
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-reverting-model-snapshot.md
+              title: Reverting to a model snapshot
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/geographic-anomalies.md
+              title: Detecting anomalous locations in geographic data
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/mapping-anomalies.md
+              title: Mapping anomalies by location
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-url.md
+              title: Adding custom URLs to machine learning results
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-jobs-from-lens.md
+              title: Anomaly detection jobs from visualizations
+          - group: Resources
+            page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-resources.md
+            children:
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-limitations.md
+              title: Limitations
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-functions.md
+              title: Analysis function reference
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ootb-ml-jobs.md
+              title: Supplied configurations
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-troubleshooting.md
+              title: Troubleshooting and FAQ
+        - group: Data frame analytics
+          page: docs-content://explore-analyze/machine-learning/data-frame-analytics.md
+          children:
+          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-overview.md
+            title: Overview
+          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-finding-outliers.md
+            title: Finding outliers
+          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-regression.md
+            title: Predicting numerical values with regression
+          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-classification.md
+            title: Predicting classes with classification
+          - group: Concepts
+            page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-concepts.md
+            children:
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-phases.md
+              title: How data frame analytics jobs work
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-scale.md
+              title: Working with data frame analytics at scale
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-custom-urls.md
+              title: Adding custom URLs to data frame analytics jobs
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-encoding.md
+              title: Feature encoding
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-processors.md
+              title: Feature processors
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-importance.md
+              title: Feature importance
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/dfa-regression-lossfunction.md
+              title: Loss functions for regression analyses
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/hyperparameters.md
+              title: Hyperparameter optimization
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-trained-models.md
+              title: Trained models
+          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfanalytics-apis.md
+            title: API quick reference
+          - group: Resources
+            page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-resources.md
+            children:
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-limitations.md
+              title: Limitations
+        - group: NLP
+          page: docs-content://explore-analyze/machine-learning/nlp.md
+          children:
+          - group: Overview
+            page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-overview.md
+            children:
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-extract-info.md
+              title: Extract information
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-classify-text.md
+              title: Classify text
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-search-compare.md
+              title: Search and compare text
+          - group: Deploy models
+            page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-deploy-models.md
+            children:
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-select-model.md
+              title: Select a trained model
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-import-model.md
+              title: Import the trained model and vocabulary
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-deploy-model.md
+              title: Deploy the model in your cluster
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-test-inference.md
+              title: Try it out
+          - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-inference.md
+            title: Add NLP inference to ingest pipelines
+          - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-apis.md
+            title: API quick reference
+          - group: Built-in models
+            page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-built-in-models.md
+            children:
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-elser.md
+              title: ELSER
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-jina.md
+              title: Jina
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-rerank.md
+              title: Elastic Rerank
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-e5.md
+              title: E5
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-lang-ident.md
+              title: Language identification
+          - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-model-ref.md
+            title: Compatible third party models
+          - group: Examples
+            page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-examples.md
+            children:
+            - page: docs-content://explore-analyze/machine-learning/nlp/nlp-end-to-end-tutorial.md
+              title: End-to-end tutorial
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-ner-example.md
+              title: Named entity recognition
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-text-emb-vector-search-example.md
+              title: Text embedding and semantic search
+          - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-limitations.md
+            title: Limitations
+        - group: Machine learning in Kibana
+          page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana.md
+          children:
+          - page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-aiops.md
+            title: AIOps Labs
+          - page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana/inference-processing.md
+            title: Inference processing
       - group: AI framework
+        page: docs-content://explore-analyze/ai-features.md
         children:
         - group: Elastic Inference Service
+          page: docs-content://explore-analyze/elastic-inference.md
           children:
-          - title: Elastic Inference Service
-          - title: Inference integrations
+          - group: Elastic Inference Service
+            page: docs-content://explore-analyze/elastic-inference/eis.md
+            children:
+            - page: docs-content://explore-analyze/elastic-inference/connect-self-managed-cluster-to-eis.md
+              title: EIS for self-managed clusters
+          - page: docs-content://explore-analyze/elastic-inference/inference-api.md
+            title: Inference integrations
         - group: Agent builder
+          page: docs-content://explore-analyze/ai-features/elastic-agent-builder.md
           children:
-          - title: Elasticsearch MCP
-        - title: AI chats
-        - title: LLM guides
-        - title: Manage access to AI features
-      - title: AI agent skills for Elastic
+          - page: docs-content://explore-analyze/ai-features/agent-builder/get-started.md
+            title: Get started
+          - page: docs-content://explore-analyze/ai-features/agent-builder/models.md
+            title: Models
+          - group: Chat
+            page: docs-content://explore-analyze/ai-features/agent-builder/chat.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/agent-builder/standalone-and-flyout-modes.md
+              title: Chat UI modes
+          - group: Agents
+            page: docs-content://explore-analyze/ai-features/agent-builder/agent-builder-agents.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/agent-builder/custom-agents.md
+              title: Custom agents
+            - page: docs-content://explore-analyze/ai-features/agent-builder/builtin-agents-reference.md
+              title: Built-in agents
+            - page: docs-content://explore-analyze/ai-features/agent-builder/prompt-engineering.md
+              title: Prompting best practices
+            - page: docs-content://explore-analyze/ai-features/agent-builder/agents-and-workflows.md
+              title: Call agents from workflows
+          - group: Tools
+            page: docs-content://explore-analyze/ai-features/agent-builder/tools.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/builtin-tools-reference.md
+              title: Built-in tools
+            - group: Custom tools
+              page: docs-content://explore-analyze/ai-features/agent-builder/tools/custom-tools.md
+              children:
+              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/esql-tools.md
+                title: "ES|QL tools"
+              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/index-search-tools.md
+                title: Index search tools
+              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/mcp-tools.md
+                title: MCP tools
+              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/workflow-tools.md
+                title: Workflow tools
+          - group: Programmatic access
+            page: docs-content://explore-analyze/ai-features/agent-builder/programmatic-access.md
+            children:
+            - group: Kibana API
+              page: docs-content://explore-analyze/ai-features/agent-builder/kibana-api.md
+              children:
+              - page: docs-content://explore-analyze/ai-features/agent-builder/agent-builder-api-tutorial.md
+                title: Kibana API tutorial
+            - page: docs-content://explore-analyze/ai-features/agent-builder/a2a-server.md
+              title: A2A server
+            - page: docs-content://explore-analyze/ai-features/agent-builder/mcp-server.md
+              title: MCP server
+          - page: docs-content://explore-analyze/ai-features/agent-builder/monitor-usage.md
+            title: Monitor token usage
+          - page: docs-content://explore-analyze/ai-features/agent-builder/permissions.md
+            title: Permissions
+          - group: Troubleshooting
+            page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting/context-length-exceeded.md
+              title: Context length exceeded
+            - page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting/api-calls-return-403-forbidden.md
+              title: 403 Forbidden
+          - page: docs-content://explore-analyze/ai-features/agent-builder/limitations-known-issues.md
+            title: Limitations
+        - group: AI chats
+          page: docs-content://explore-analyze/ai-features/ai-chat-experiences.md
+          children:
+          - page: docs-content://explore-analyze/ai-features/ai-chat-experiences/ai-agent-or-ai-assistant.md
+            title: Compare Agent Builder and AI Assistant
+          - page: docs-content://explore-analyze/ai-features/ai-chat-experiences/ai-assistant.md
+            title: AI assistants
+        - group: LLM guides
+          page: docs-content://explore-analyze/ai-features/llm-guides/llm-connectors.md
+          children:
+          - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-azure-openai.md
+            title: Connect to Azure OpenAI
+          - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-amazon-bedrock.md
+            title: Connect to Amazon Bedrock
+          - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-openai.md
+            title: Connect to OpenAI
+          - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-google-vertex.md
+            title: Connect to Google Vertex
+          - group: Local LLMs
+            page: docs-content://explore-analyze/ai-features/llm-guides/local-llms-overview.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-lmstudio-observability.md
+              title: Connect to LM Studio for Observability
+            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-lmstudio-security.md
+              title: Connect to LM Studio for Elastic Security
+            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-vLLM.md
+              title: Connect to vLLM for Elastic Security
+        - page: docs-content://explore-analyze/ai-features/manage-access-to-ai-assistant.md
+          title: Manage access to AI features
+      - page: docs-content://explore-analyze/ai-features/agent-skills.md
+        title: AI agent skills for Elastic
   - label: Solutions and project types
     children:
     - title: Solutions overview (NEW)

From 8c2d0d845ed296f46f9982e9ee984d2111956730 Mon Sep 17 00:00:00 2001
From: florent-leborgne <florent.leborgne@elastic.co>
Date: Tue, 24 Mar 2026 14:00:02 +0100
Subject: [PATCH 030/226] feat(nav-v2): wire Solutions and project types
 section with full depth (#2958)

Replace placeholder title: entries with full-depth page: references for
the Solutions and project types section:

- Solutions overview linked to existing solutions/index.md
- Elasticsearch solution: full hierarchy (Get started, Playground,
  AI Assistant, Query rules, Search Applications, Add-ons)
- Observability solution: full hierarchy (Get started, Applications/APM,
  Synthetics, Logs, Infrastructure, Streams, Incident management, Cloud,
  AI for Observability)
- Security solution: full hierarchy (Get started, AI for Security,
  Detections and alerts, Configure/Manage Elastic Defend, Cloud Security,
  Investigation tools, Dashboards, Entity analytics)
- Search use case excluded per the new IA design

All page: entries include title: overrides from navigation_title or H1.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 1320 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 1294 insertions(+), 26 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 22fa928575..b4e288ed4b 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -993,36 +993,1304 @@ nav:
         title: AI agent skills for Elastic
   - label: Solutions and project types
     children:
-    - title: Solutions overview (NEW)
+    - page: docs-content://solutions/index.md
+      title: Solutions overview
     - group: Elasticsearch solution
+      page: docs-content://solutions/elasticsearch-solution-project.md
       children:
-      - title: Get started with Elasticsearch
-      - title: Playground for RAG
-      - title: Query rules
-    - group: Elastic Security solution
+      - group: Get started
+        page: docs-content://solutions/elasticsearch-solution-project/get-started.md
+        children:
+        - page: docs-content://solutions/elasticsearch-solution-project/search-connection-details.md
+          title: Find connection details
+      - group: Playground
+        page: docs-content://solutions/elasticsearch-solution-project/playground.md
+        children:
+        - page: docs-content://solutions/elasticsearch-solution-project/playground-context.md
+          title: Optimize model context
+        - page: docs-content://solutions/elasticsearch-solution-project/playground-query.md
+          title: View and modify queries
+        - page: docs-content://solutions/elasticsearch-solution-project/playground-troubleshooting.md
+          title: Troubleshooting
+      - page: docs-content://solutions/elasticsearch-solution-project/ai-assistant.md
+        title: AI Assistant
+      - page: docs-content://solutions/elasticsearch-solution-project/query-rules-ui.md
+        title: Query rules UI
+      - group: Search Applications
+        page: docs-content://solutions/elasticsearch-solution-project/search-applications.md
+        children:
+        - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-api.md
+          title: Search API and templates
+        - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-security.md
+          title: Security
+        - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-client.md
+          title: Search Application client guide
+      - page: docs-content://solutions/elasticsearch-solution-project/es-serverless-add-ons.md
+        title: Add-ons
+    - group: Observability solution
+      page: docs-content://solutions/observability.md
       children:
-      - title: Entity analytics
-      - title: AI for security
-      - title: Elastic Security APIs
-      - title: Cloud Security
-      - title: Configure endpoint protection with Elastic Defend
-      - title: Elastic Security dashboards
-      - title: Detections and alerts
-      - title: Get started with Elastic Security
-      - title: Investigation tools
-      - title: Manage Elastic Defend
-    - group: Elastic Observability solution
+      - group: Get started
+        page: docs-content://solutions/observability/get-started.md
+        children:
+        - group: Elastic Observability quickstarts
+          page: docs-content://solutions/observability/get-started/quickstarts.md
+          children:
+          - page: docs-content://solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md
+            title: "Quickstart: Monitor hosts with OpenTelemetry"
+          - page: docs-content://solutions/observability/get-started/quickstart-monitor-your-application-performance.md
+            title: "Quickstart: Monitor your application performance"
+          - page: docs-content://solutions/observability/get-started/quickstart-unified-kubernetes-observability-with-elastic-distributions-of-opentelemetry-edot.md
+            title: "Quickstart: Unified Kubernetes Observability with Elastic Distributions of OpenTelemetry (EDOT)"
+          - page: docs-content://solutions/observability/get-started/quickstart-elastic-cloud-otel-endpoint.md
+            title: "Quickstart: Send OTLP data to Elastic Serverless or Elastic Cloud Hosted"
+          - page: docs-content://solutions/observability/get-started/quickstart-create-synthetic-monitor.md
+            title: "Quickstart: Create a Synthetic Monitor"
+          - page: docs-content://solutions/observability/get-started/quickstart-monitor-hosts-with-elastic-agent.md
+            title: "Quickstart: Monitor hosts with Elastic Agent"
+          - page: docs-content://solutions/observability/get-started/quickstart-monitor-kubernetes-cluster-with-elastic-agent.md
+            title: "Quickstart: Monitor your Kubernetes cluster with Elastic Agent"
+          - page: docs-content://solutions/observability/get-started/quickstart-collect-data-with-aws-firehose.md
+            title: "Quickstart: Collect data with AWS Firehose"
+        - group: OpenTelemetry quickstarts
+          page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/index.md
+          children:
+          - page: docs-content://solutions/observability/get-started/opentelemetry/custom-metrics-quickstart.md
+            title: Ingest custom metrics with EDOT
+          - group: Self-managed
+            page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/index.md
+            children:
+            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/k8s.md
+              title: Kubernetes
+            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/hosts_vms.md
+              title: Hosts / VMs
+            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/docker.md
+              title: Docker
+          - group: Elastic Cloud Serverless
+            page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/index.md
+            children:
+            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/k8s.md
+              title: Kubernetes
+            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/hosts_vms.md
+              title: Hosts and VMs
+            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/docker.md
+              title: Docker
+          - group: Elastic Cloud Hosted
+            page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/index.md
+            children:
+            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/k8s.md
+              title: Kubernetes
+            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/hosts_vms.md
+              title: Hosts and VMs
+            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/docker.md
+              title: Docker
+        - group: OpenTelemetry use cases
+          page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/index.md
+          children:
+          - group: Kubernetes observability
+            page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/index.md
+            children:
+            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/prerequisites-compatibility.md
+              title: Prerequisites and compatibility
+            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/components.md
+              title: Components description
+            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/deployment.md
+              title: Deployment
+            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/instrumenting-applications.md
+              title: Instrumenting Applications
+            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/upgrade.md
+              title: Upgrade
+            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/customization.md
+              title: Customization
+        - group: Other Observability tutorials
+          page: docs-content://solutions/observability/get-started/other-tutorials/index.md
+          children:
+          - page: docs-content://solutions/observability/get-started/other-tutorials/tutorial-monitor-java-application.md
+            title: "Tutorial: Monitor a Java application"
+        - page: docs-content://solutions/observability/get-started/logs-essentials.md
+          title: Logs Essentials
+      - group: Applications and services
+        page: docs-content://solutions/observability/applications/index.md
+        children:
+        - group: Application performance monitoring (APM)
+          page: docs-content://solutions/observability/apm/index.md
+          children:
+          - page: docs-content://solutions/observability/apm/get-started.md
+            title: Get started with traces and APM
+          - group: Application data types
+            page: docs-content://solutions/observability/apm/data-types.md
+            children:
+            - page: docs-content://solutions/observability/apm/spans.md
+              title: Spans
+            - group: Transactions
+              page: docs-content://solutions/observability/apm/transactions.md
+              children:
+              - page: docs-content://solutions/observability/apm/transaction-sampling.md
+                title: Transaction sampling
+            - page: docs-content://solutions/observability/apm/traces.md
+              title: Traces
+            - page: docs-content://solutions/observability/apm/errors.md
+              title: Errors
+            - page: docs-content://solutions/observability/apm/metrics.md
+              title: Metrics
+            - page: docs-content://solutions/observability/apm/metadata.md
+              title: Metadata
+          - group: Collect application data
+            page: docs-content://solutions/observability/apm/ingest/index.md
+            children:
+            - group: OpenTelemetry
+              page: docs-content://solutions/observability/apm/opentelemetry/index.md
+              children:
+              - page: docs-content://solutions/observability/apm/opentelemetry/upstream-opentelemetry-collectors-language-sdks.md
+                title: Contrib OpenTelemetry Collectors and language SDKs
+              - page: docs-content://solutions/observability/apm/opentelemetry/collect-metrics.md
+                title: Collect metrics
+              - page: docs-content://solutions/observability/apm/opentelemetry/create-apm-agent-key-for-edot-sdks.md
+                title: Create APM agent key for EDOT SDKs
+              - page: docs-content://solutions/observability/apm/opentelemetry/edot-sdks-central-configuration.md
+                title: Centrally configure EDOT SDKs
+              - page: docs-content://solutions/observability/apm/opentelemetry/limitations.md
+                title: Limitations
+              - page: docs-content://solutions/observability/apm/opentelemetry/attributes.md
+                title: Attributes and labels
+              - page: docs-content://solutions/observability/apm/opentelemetry/data-stream-routing.md
+                title: Data stream routing
+            - group: APM agents
+              page: docs-content://solutions/observability/apm/apm-agents/index.md
+              children:
+              - page: docs-content://solutions/observability/apm/apm-agents/central-configuration.md
+                title: Centrally configure APM agents
+              - page: docs-content://solutions/observability/apm/apm-agents/real-user-monitoring-rum.md
+                title: Real User Monitoring (RUM)
+              - page: docs-content://solutions/observability/apm/apm-agents/create-upload-source-maps-rum.md
+                title: Create and upload source maps (RUM)
+            - page: docs-content://solutions/observability/apm/ingest/apm-k8s-attacher.md
+              title: Kubernetes
+            - page: docs-content://solutions/observability/apm/ingest/monitor-aws-lambda-functions.md
+              title: AWS Lambda Functions
+            - page: docs-content://solutions/observability/apm/ingest/jaeger.md
+              title: Jaeger (deprecated)
+          - group: View and analyze data
+            page: docs-content://solutions/observability/apm/view-analyze-data.md
+            children:
+            - group: Overviews
+              page: docs-content://solutions/observability/apm/overviews.md
+              children:
+              - page: docs-content://solutions/observability/apm/services.md
+                title: Services
+              - page: docs-content://solutions/observability/apm/traces-ui.md
+                title: Traces UI
+              - page: docs-content://solutions/observability/apm/dependencies.md
+                title: Dependencies
+              - page: docs-content://solutions/observability/apm/service-map.md
+                title: Service Map
+              - page: docs-content://solutions/observability/apm/service-overview.md
+                title: Service overview
+              - page: docs-content://solutions/observability/apm/mobile-service-overview.md
+                title: Mobile service overview
+            - group: Drill down into data
+              page: docs-content://solutions/observability/apm/drill-down-into-data.md
+              children:
+              - page: docs-content://solutions/observability/apm/transactions-ui.md
+                title: Transactions UI
+              - page: docs-content://solutions/observability/apm/trace-sample-timeline.md
+                title: Trace sample timeline
+              - page: docs-content://solutions/observability/apm/errors-ui.md
+                title: Errors UI
+              - page: docs-content://solutions/observability/apm/metrics-ui.md
+                title: Metrics UI
+              - page: docs-content://solutions/observability/apm/infrastructure.md
+                title: Infrastructure
+              - page: docs-content://solutions/observability/apm/logs.md
+                title: Logs
+            - group: Filter and search data
+              page: docs-content://solutions/observability/apm/filter-search-data.md
+              children:
+              - page: docs-content://solutions/observability/apm/filter-data.md
+                title: Filters
+              - page: docs-content://solutions/observability/apm/advanced-queries.md
+                title: Advanced queries
+              - page: docs-content://solutions/observability/apm/cross-cluster-search.md
+                title: Cross-cluster search
+            - group: Interpret data
+              page: docs-content://solutions/observability/apm/interpret-data.md
+              children:
+              - page: docs-content://solutions/observability/apm/find-transaction-latency-failure-correlations.md
+                title: Find transaction latency and failure correlations
+              - page: docs-content://solutions/observability/apm/track-deployments-with-annotations.md
+                title: Track deployments with annotations
+              - page: docs-content://solutions/observability/apm/explore-mobile-sessions.md
+                title: Explore mobile sessions with Discover
+              - page: docs-content://solutions/observability/apm/observe-lambda-functions.md
+                title: Observe Lambda functions
+            - page: docs-content://solutions/observability/apm/machine-learning.md
+              title: Integrate with machine learning
+            - page: docs-content://solutions/observability/apm/apm-agent-explorer.md
+              title: APM Agent explorer
+            - page: docs-content://solutions/observability/apm/applications-ui-settings.md
+              title: Settings
+          - group: Act on data
+            page: docs-content://solutions/observability/apm/act-on-data.md
+            children:
+            - page: docs-content://solutions/observability/apm/create-apm-rules-alerts.md
+              title: Create rules and alerts
+            - page: docs-content://solutions/observability/apm/create-custom-links.md
+              title: Create custom links
+          - group: Use APM securely
+            page: docs-content://solutions/observability/apm/use-apm-securely.md
+            children:
+            - group: Secure data
+              page: docs-content://solutions/observability/apm/secure-data.md
+              children:
+              - page: docs-content://solutions/observability/apm/control-access-to-apm-data.md
+                title: Control access to APM data
+              - page: docs-content://solutions/observability/apm/built-in-data-filters.md
+                title: Built-in data filters
+              - page: docs-content://solutions/observability/apm/custom-filters.md
+                title: Custom filters
+              - page: docs-content://solutions/observability/apm/delete-sensitive-data.md
+                title: Delete sensitive data
+            - group: Secure communication with APM agents
+              page: docs-content://solutions/observability/apm/secure-communication-with-apm-agents.md
+              children:
+              - page: docs-content://solutions/observability/apm/apm-agent-tls-communication.md
+                title: APM agent TLS communication
+              - page: docs-content://solutions/observability/apm/api-keys.md
+                title: API keys
+              - page: docs-content://solutions/observability/apm/secret-token.md
+                title: Secret token
+              - page: docs-content://solutions/observability/apm/anonymous-authentication.md
+                title: Anonymous authentication
+            - group: Secure communication with the Elastic Stack
+              page: docs-content://solutions/observability/apm/secure-communication-with-elastic-stack.md
+              children:
+              - page: docs-content://solutions/observability/apm/create-assign-feature-roles-to-apm-server-users.md
+                title: Use feature roles
+              - page: docs-content://solutions/observability/apm/grant-access-using-api-keys.md
+                title: Grant access using API keys
+            - group: Secure access to the Applications UI
+              page: docs-content://solutions/observability/apm/secure-access-to-applications-ui.md
+              children:
+              - page: docs-content://solutions/observability/apm/ui-user-reader.md
+                title: Create an APM reader user
+              - page: docs-content://solutions/observability/apm/ui-user-annotation.md
+                title: Create an annotation user
+              - page: docs-content://solutions/observability/apm/ui-user-api.md
+                title: Create an API user
+              - page: docs-content://solutions/observability/apm/ui-user-central-config.md
+                title: Create a central config user
+              - page: docs-content://solutions/observability/apm/ui-user-storage-explorer.md
+                title: Create a storage explorer user
+          - group: Manage storage
+            page: docs-content://solutions/observability/apm/manage-storage.md
+            children:
+            - page: docs-content://solutions/observability/apm/storage-explorer.md
+              title: Storage Explorer
+            - page: docs-content://solutions/observability/apm/data-streams.md
+              title: Data streams
+            - page: docs-content://solutions/observability/apm/index-lifecycle-management.md
+              title: Index lifecycle management
+            - page: docs-content://solutions/observability/apm/view-elasticsearch-index-template.md
+              title: View the Elasticsearch index template
+            - page: docs-content://solutions/observability/apm/parse-data-using-ingest-pipelines.md
+              title: Parse data using ingest pipelines
+            - page: docs-content://solutions/observability/apm/storage-sizing-guide.md
+              title: Storage and sizing guide
+            - page: docs-content://solutions/observability/apm/reduce-storage.md
+              title: Reduce storage
+            - page: docs-content://solutions/observability/apm/explore-data-in-elasticsearch.md
+              title: Explore data in Elasticsearch
+          - group: "Work with {{apm-server}}"
+            page: docs-content://solutions/observability/apm/apm-server/index.md
+            children:
+            - group: Set up
+              page: docs-content://solutions/observability/apm/apm-server/setup.md
+              children:
+              - page: docs-content://solutions/observability/apm/apm-server/fleet-managed.md
+                title: Fleet-managed APM Server
+              - page: docs-content://solutions/observability/apm/apm-server/binary.md
+                title: APM Server binary
+            - group: Configure
+              page: docs-content://solutions/observability/apm/apm-server/configure.md
+              children:
+              - page: docs-content://solutions/observability/apm/apm-server/general-configuration-options.md
+                title: General configuration options
+              - page: docs-content://solutions/observability/apm/apm-server/configure-anonymous-authentication.md
+                title: Anonymous authentication
+              - page: docs-content://solutions/observability/apm/apm-server/apm-agent-authorization.md
+                title: APM agent authorization
+              - page: docs-content://solutions/observability/apm/apm-server/apm-agent-central-configuration.md
+                title: Configure APM Agent Central Configuration
+              - page: docs-content://solutions/observability/apm/apm-server/configure-apm-instrumentation.md
+                title: Instrumentation
+              - page: docs-content://solutions/observability/apm/apm-server/configure-kibana-endpoint.md
+                title: Kibana endpoint
+              - page: docs-content://solutions/observability/apm/apm-server/configure-logging.md
+                title: Logging
+              - group: Output
+                page: docs-content://solutions/observability/apm/apm-server/configure-output.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-server/configure-output-for-elasticsearch-service-on-elastic-cloud.md
+                  title: Elastic Cloud Hosted
+                - page: docs-content://solutions/observability/apm/apm-server/configure-elasticsearch-output.md
+                  title: Elasticsearch
+                - page: docs-content://solutions/observability/apm/apm-server/configure-logstash-output.md
+                  title: "{{ls}}"
+                - page: docs-content://solutions/observability/apm/apm-server/configure-kafka-output.md
+                  title: Kafka
+                - page: docs-content://solutions/observability/apm/apm-server/configure-redis-output.md
+                  title: Redis
+                - page: docs-content://solutions/observability/apm/apm-server/configure-console-output.md
+                  title: Console
+              - page: docs-content://solutions/observability/apm/apm-server/configure-project-paths.md
+                title: Project paths
+              - page: docs-content://solutions/observability/apm/apm-server/configure-real-user-monitoring-rum.md
+                title: Real User Monitoring (RUM)
+              - group: SSL/TLS settings
+                page: docs-content://solutions/observability/apm/apm-server/ssl-tls-settings.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-server/ssl-tls-output-settings.md
+                  title: SSL/TLS output settings
+                - page: docs-content://solutions/observability/apm/apm-server/ssl-tls-input-settings.md
+                  title: SSL/TLS input settings
+              - page: docs-content://solutions/observability/apm/apm-server/tail-based-sampling.md
+                title: Tail-based sampling
+              - page: docs-content://solutions/observability/apm/apm-server/use-environment-variables-in-configuration.md
+                title: Use environment variables in the configuration
+              - group: Advanced setup
+                page: docs-content://solutions/observability/apm/apm-server/advanced-setup.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-server/installation-layout.md
+                  title: Installation layout
+                - page: docs-content://solutions/observability/apm/apm-server/secrets-keystore-for-secure-settings.md
+                  title: Secrets keystore
+                - page: docs-content://solutions/observability/apm/apm-server/command-reference.md
+                  title: Command reference
+                - page: docs-content://solutions/observability/apm/apm-server/tune-data-ingestion.md
+                  title: Tune data ingestion
+                - page: docs-content://solutions/observability/apm/apm-server/high-availability.md
+                  title: High Availability
+                - page: docs-content://solutions/observability/apm/apm-server/systemd.md
+                  title: APM Server and systemd
+            - group: Monitor
+              page: docs-content://solutions/observability/apm/apm-server/monitor.md
+              children:
+              - page: docs-content://solutions/observability/apm/apm-server/monitor-fleet-managed.md
+                title: Fleet-managed
+              - group: APM Server binary
+                page: docs-content://solutions/observability/apm/apm-server/monitor-binary.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-server/use-internal-collection-to-send-monitoring-data.md
+                  title: Use internal collection
+                - page: docs-content://solutions/observability/apm/apm-server/use-metricbeat-to-send-monitoring-data.md
+                  title: "Use {{metricbeat}} collection"
+                - page: docs-content://solutions/observability/apm/apm-server/use-select-metrics-emitted-directly-to-monitoring-cluster.md
+                  title: Use local collection
+          - group: APM APIs
+            page: docs-content://solutions/observability/apm/apis.md
+            children:
+            - page: docs-content://solutions/observability/apm/apm-ui-api.md
+              title: APM UI API
+            - group: "{{apm-server}} API"
+              page: docs-content://solutions/observability/apm/apm-server/api.md
+              children:
+              - page: docs-content://solutions/observability/apm/apm-server/information-api.md
+                title: APM Server information API
+              - page: docs-content://solutions/observability/apm/elastic-apm-events-intake-api.md
+                title: Elastic APM events intake API
+              - page: docs-content://solutions/observability/apm/elastic-apm-agent-configuration-api.md
+                title: Elastic APM agent configuration API
+              - page: docs-content://solutions/observability/apm/opentelemetry-intake-api.md
+                title: OpenTelemetry intake API
+              - page: docs-content://solutions/observability/apm/jaeger-event-intake.md
+                title: Jaeger event intake
+            - page: docs-content://solutions/observability/apm/managed-intake-service-event-api.md
+              title: Managed intake service event API
+          - group: Upgrade
+            page: docs-content://solutions/observability/apm/upgrade.md
+            children:
+            - page: docs-content://solutions/observability/apm/apm-agent-compatibility.md
+              title: APM agent compatibility
+            - group: "Upgrade to version 9.0 [apm-upgrading-to-9.0]"
+              page: docs-content://solutions/observability/apm/upgrade-to-version-9.md
+              children:
+              - page: docs-content://solutions/observability/apm/upgrade-self-installation-of-apm-server-standalone-to-9.md
+                title: Self-installation standalone
+              - page: docs-content://solutions/observability/apm/upgrade-self-installation-of-apm-integration-to-9.md
+                title: Self-installation APM integration
+              - page: docs-content://solutions/observability/apm/upgrade-elastic-cloud-apm-server-standalone-to-9.md
+                title: "{{ecloud}} standalone"
+              - page: docs-content://solutions/observability/apm/upgrade-elastic-cloud-with-apm-integration-to-9.md
+                title: "{{ecloud}} APM integration"
+            - group: Switch to the Elastic APM integration
+              page: docs-content://solutions/observability/apm/switch-to-elastic-apm-integration.md
+              children:
+              - page: docs-content://solutions/observability/apm/switch-self-installation-to-apm-integration.md
+                title: Switch a self-installation
+              - page: docs-content://solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md
+                title: "Switch an {{ecloud}} cluster"
+        - group: Synthetic monitoring
+          page: docs-content://solutions/observability/synthetics/index.md
+          children:
+          - group: Get started
+            page: docs-content://solutions/observability/synthetics/get-started.md
+            children:
+            - page: docs-content://solutions/observability/synthetics/create-monitors-with-projects.md
+              title: Use a Synthetics project
+            - page: docs-content://solutions/observability/synthetics/create-monitors-ui.md
+              title: Use the Synthetics UI
+          - group: Scripting browser monitors
+            page: docs-content://solutions/observability/synthetics/scripting-browser-monitors.md
+            children:
+            - page: docs-content://solutions/observability/synthetics/write-synthetic-test.md
+              title: Write a synthetic test
+            - page: docs-content://solutions/observability/synthetics/configure-individual-browser-monitors.md
+              title: Configure individual monitors
+            - page: docs-content://solutions/observability/synthetics/use-synthetics-recorder.md
+              title: Use the Synthetics Recorder
+          - page: docs-content://solutions/observability/synthetics/configure-lightweight-monitors.md
+            title: Configure lightweight monitors
+          - page: docs-content://solutions/observability/synthetics/manage-monitors.md
+            title: Manage monitors
+          - page: docs-content://solutions/observability/synthetics/work-with-params-secrets.md
+            title: Work with params and secrets
+          - page: docs-content://solutions/observability/synthetics/analyze-data.md
+            title: Analyze monitor data
+          - page: docs-content://solutions/observability/synthetics/monitor-resources-on-private-networks.md
+            title: Monitor resources on private networks
+          - page: docs-content://solutions/observability/synthetics/cli.md
+            title: Use the CLI
+          - page: docs-content://solutions/observability/synthetics/configure-projects.md
+            title: Configure a Synthetics project
+          - page: docs-content://solutions/observability/synthetics/mfa-for-browser-monitors.md
+            title: Multi-factor Authentication
+          - page: docs-content://solutions/observability/synthetics/configure-settings.md
+            title: Configure Synthetics settings
+          - group: Grant users access to secured resources
+            page: docs-content://solutions/observability/synthetics/grant-access-to-secured-resources.md
+            children:
+            - page: docs-content://solutions/observability/synthetics/setup-role.md
+              title: Setup role
+            - page: docs-content://solutions/observability/synthetics/writer-role.md
+              title: Writer role
+            - page: docs-content://solutions/observability/synthetics/reader-role.md
+              title: Reader role
+          - page: docs-content://solutions/observability/synthetics/manage-data-retention.md
+            title: Manage data retention
+          - page: docs-content://solutions/observability/synthetics/network-security.md
+            title: Use Synthetics with network security
+          - page: docs-content://solutions/observability/synthetics/migrate-from-elastic-synthetics-integration.md
+            title: Migrate from the Elastic Synthetics integration
+          - page: docs-content://solutions/observability/synthetics/scale-architect-synthetics-deployment.md
+            title: Scale and architect a deployment
+          - page: docs-content://solutions/observability/synthetics/support-matrix.md
+            title: Synthetics support matrix
+          - page: docs-content://solutions/observability/synthetics/encryption-security.md
+            title: Synthetics Encryption and Security
+        - group: Real user monitoring
+          page: docs-content://solutions/observability/applications/user-experience.md
+          children:
+          - page: docs-content://solutions/observability/applications/otel-rum.md
+            title: OpenTelemetry for Real User Monitoring (RUM)
+        - page: docs-content://solutions/observability/applications/llm-observability.md
+          title: LLM and agentic AI observability
+        - group: Uptime monitoring (deprecated)
+          page: docs-content://solutions/observability/uptime/index.md
+          children:
+          - page: docs-content://solutions/observability/uptime/get-started.md
+            title: Get started
+          - group: Analyze
+            page: docs-content://solutions/observability/uptime/analyze.md
+            children:
+            - page: docs-content://solutions/observability/uptime/view-monitor-status.md
+              title: View monitor status
+            - page: docs-content://solutions/observability/uptime/analyze-monitors.md
+              title: Analyze monitors
+            - page: docs-content://solutions/observability/uptime/inspect-duration-anomalies.md
+              title: Inspect uptime duration anomalies
+          - page: docs-content://solutions/observability/uptime/configure-settings.md
+            title: Configure settings
+        - page: docs-content://solutions/observability/otlp-visualize.md
+          title: Visualize OpenTelemetry data
+      - page: docs-content://solutions/observability/cicd.md
+        title: CI/CD
+      - group: Cloud
+        page: docs-content://solutions/observability/cloud.md
+        children:
+        - group: AWS
+          page: docs-content://solutions/observability/cloud/amazon-web-services-aws-monitoring.md
+          children:
+          - page: docs-content://solutions/observability/cloud/ingestion-options.md
+            title: Ingestion options
+          - group: "Monitor {{aws}} with Elastic Agent"
+            page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-agent.md
+            children:
+            - page: docs-content://solutions/observability/cloud/monitor-amazon-cloud-compute-ec2.md
+              title: EC2
+            - page: docs-content://solutions/observability/cloud/monitor-amazon-kinesis-data-streams.md
+              title: Kinesis data streams
+            - page: docs-content://solutions/observability/cloud/monitor-amazon-simple-storage-service-s3.md
+              title: S3
+            - page: docs-content://solutions/observability/cloud/monitor-amazon-simple-queue-service-sqs.md
+              title: SQS
+          - page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md
+            title: "Monitor {{aws}} with {{beats}}"
+          - group: "Monitor {{aws}} with Amazon Data Firehose"
+            page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-amazon-data-firehose.md
+            children:
+            - page: docs-content://solutions/observability/cloud/monitor-virtual-private-cloud-vpc-flow-logs.md
+              title: VPC Flow Logs
+            - page: docs-content://solutions/observability/cloud/monitor-cloudtrail-logs.md
+              title: CloudTrail logs
+            - page: docs-content://solutions/observability/cloud/monitor-aws-network-firewall-logs.md
+              title: Network Firewall logs
+            - page: docs-content://solutions/observability/cloud/monitor-web-application-firewall-waf-logs.md
+              title: WAF logs
+            - page: docs-content://solutions/observability/cloud/monitor-cloudwatch-logs.md
+              title: CloudWatch logs
+          - page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-serverless-forwarder.md
+            title: "Monitor {{aws}} with Elastic Serverless Forwarder"
+        - group: Azure
+          page: docs-content://solutions/observability/cloud/azure-monitoring.md
+          children:
+          - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-elastic-agent.md
+            title: Monitor Microsoft Azure with Elastic Agent
+          - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-beats.md
+            title: Monitor Microsoft Azure with Beats
+          - page: docs-content://solutions/observability/cloud/multi-tenant-data-ingestion-with-beats.md
+            title: Ingest multi-tenant Azure Event Hub logs with Filebeat
+          - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-azure-native-isv-service.md
+            title: Monitor Microsoft Azure with the Azure Native ISV Service
+          - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-openai.md
+            title: Monitor Microsoft Azure OpenAI
+        - group: GCP
+          page: docs-content://solutions/observability/cloud/monitor-google-cloud-platform-gcp.md
+          children:
+          - page: docs-content://solutions/observability/cloud/gcp-dataflow-templates.md
+            title: GCP Dataflow templates
+      - group: Infrastructure and hosts
+        page: docs-content://solutions/observability/infra-and-hosts.md
+        children:
+        - group: Analyze infrastructure and host metrics
+          page: docs-content://solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md
+          children:
+          - page: docs-content://solutions/observability/infra-and-hosts/get-started-with-system-metrics.md
+            title: Get started with system metrics
+          - page: docs-content://solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
+            title: View infrastructure metrics by resource type
+          - page: docs-content://solutions/observability/infra-and-hosts/discover-metrics.md
+            title: Explore metrics data with Discover in Kibana
+          - page: docs-content://solutions/observability/infra-and-hosts/explore-infrastructure-metrics-over-time.md
+            title: Explore infrastructure metrics over time
+          - page: docs-content://solutions/observability/infra-and-hosts/analyze-compare-hosts.md
+            title: Analyze and compare hosts
+          - page: docs-content://solutions/observability/infra-and-hosts/detect-metric-anomalies.md
+            title: Detect metric anomalies
+          - page: docs-content://solutions/observability/infra-and-hosts/configure-settings.md
+            title: Configure settings
+        - group: Universal Profiling
+          page: docs-content://solutions/observability/infra-and-hosts/universal-profiling.md
+          children:
+          - page: docs-content://solutions/observability/infra-and-hosts/get-started-with-universal-profiling.md
+            title: Get started
+          - group: Manage data storage
+            page: docs-content://solutions/observability/infra-and-hosts/manage-data-storage.md
+            children:
+            - page: docs-content://solutions/observability/infra-and-hosts/universal-profiling-index-life-cycle-management.md
+              title: Index lifecycle management
+            - page: docs-content://solutions/observability/infra-and-hosts/configure-probabilistic-profiling.md
+              title: Configure probabilistic profiling
+          - group: Advanced configuration
+            page: docs-content://solutions/observability/infra-and-hosts/advanced-configuration.md
+            children:
+            - page: docs-content://solutions/observability/infra-and-hosts/tag-data-for-querying.md
+              title: Tag data for querying
+            - page: docs-content://solutions/observability/infra-and-hosts/add-symbols-for-native-frames.md
+              title: Add symbols for native frames
+            - page: docs-content://solutions/observability/infra-and-hosts/use-proxy-with-universal-profiling-agent.md
+              title: Use a proxy
+            - page: docs-content://solutions/observability/infra-and-hosts/override-kernel-version-check.md
+              title: Override kernel version check
+            - page: docs-content://solutions/observability/infra-and-hosts/environment-variables-to-configure-universal-profiling-agent.md
+              title: Environment variables to configure the Universal Profiling Agent
+            - page: docs-content://solutions/observability/infra-and-hosts/configuration-file-of-universal-profiling-agent.md
+              title: Configuration file of the Universal Profiling Agent
+          - page: docs-content://solutions/observability/infra-and-hosts/upgrade-universal-profiling.md
+            title: Upgrade
+          - page: docs-content://solutions/observability/infra-and-hosts/run-universal-profiling-on-self-hosted-elastic-stack.md
+            title: Self-hosted infrastructure
+          - group: Install the backend
+            page: docs-content://solutions/observability/infra-and-hosts/install-backend.md
+            children:
+            - page: docs-content://solutions/observability/infra-and-hosts/step-1-update-stack.md
+              title: "Step 1: Update the stack"
+            - page: docs-content://solutions/observability/infra-and-hosts/step-2-enable-universal-profiling-in-kibana.md
+              title: "Step 2: Enable Universal Profiling in Kibana"
+            - page: docs-content://solutions/observability/infra-and-hosts/step-3-set-up-universal-profiling-in-kibana.md
+              title: "Step 3: Set up Universal Profiling in Kibana"
+            - page: docs-content://solutions/observability/infra-and-hosts/step-4-run-backend-applications.md
+              title: "Step 4: Run the backend applications"
+            - page: docs-content://solutions/observability/infra-and-hosts/step-5-next-steps.md
+              title: "Step 5: Next steps"
+          - page: docs-content://solutions/observability/infra-and-hosts/operate-universal-profiling-backend.md
+            title: Operate the backend
+        - page: docs-content://solutions/observability/infra-and-hosts/tutorial-observe-kubernetes-deployments.md
+          title: "Tutorial: Observe your Kubernetes deployments"
+        - group: "Tutorial: Observe your nginx instances"
+          page: docs-content://solutions/observability/infra-and-hosts/tutorial-observe-nginx-instances.md
+          children:
+          - page: docs-content://solutions/observability/infra-and-hosts/understanding-no-results-found-message.md
+            title: Understanding "no results found" message
+        - page: docs-content://solutions/observability/infra-and-hosts/collect-nginx-data-otel-integration-fleet-managed.md
+          title: Collect NGINX data with OpenTelemetry integrations (Fleet-managed)
+        - page: docs-content://solutions/observability/infra-and-hosts/collect-nginx-data-otel-integration-standalone.md
+          title: Collect NGINX data with OpenTelemetry integrations (standalone)
+      - group: Logs
+        page: docs-content://solutions/observability/logs.md
+        children:
+        - page: docs-content://solutions/observability/logs/get-started-with-system-logs.md
+          title: Get started with system logs
+        - page: docs-content://solutions/observability/logs/stream-any-log-file.md
+          title: Send any log file using Elastic Agent
+        - page: docs-content://solutions/observability/logs/stream-any-log-file-using-edot-collector.md
+          title: Send any log file using OTel Collector
+        - group: Send application log data
+          page: docs-content://solutions/observability/logs/stream-application-logs.md
+          children:
+          - page: docs-content://solutions/observability/logs/plaintext-application-logs.md
+            title: Plaintext application logs
+          - page: docs-content://solutions/observability/logs/ecs-formatted-application-logs.md
+            title: ECS formatted application logs
+          - page: docs-content://solutions/observability/logs/apm-agent-log-sending.md
+            title: APM agent log sending
+        - page: docs-content://solutions/observability/logs/parse-route-logs.md
+          title: Parse and route logs using ingest pipelines
+        - page: docs-content://solutions/observability/logs/filter-aggregate-logs.md
+          title: Filter and aggregate logs
+        - group: Explore logs
+          page: docs-content://solutions/observability/logs/explore-logs.md
+          children:
+          - page: docs-content://solutions/observability/logs/discover-logs.md
+            title: Explore logs in Discover
+          - page: docs-content://solutions/observability/logs/categorize-log-entries.md
+            title: Categorize log entries
+          - page: docs-content://solutions/observability/logs/inspect-log-anomalies.md
+            title: Inspect log anomalies
+        - page: docs-content://solutions/observability/logs/run-pattern-analysis-on-log-data.md
+          title: Run a pattern analysis on log data
+        - page: docs-content://solutions/observability/logs/log-data-sources.md
+          title: Configure log data sources
+        - page: docs-content://solutions/observability/logs/logs-data-retention.md
+          title: Configure log data retention
+        - page: docs-content://solutions/observability/logs/add-service-name-to-logs.md
+          title: Add a service name to logs
+        - group: Logs index template reference
+          page: docs-content://solutions/observability/logs/logs-index-template-reference.md
+          children:
+          - page: docs-content://solutions/observability/logs/logs-index-template-defaults.md
+            title: Default `logs` index template
+      - page: docs-content://solutions/observability/streams/streams.md
+        title: Streams
+      - page: docs-content://solutions/observability/streams/management/retention.md
+        title: Manage data retention
+      - group: Process documents
+        page: docs-content://solutions/observability/streams/management/extract.md
+        children:
+        - page: docs-content://solutions/observability/streams/management/extract/drop.md
+          title: Drop document processor
+        - page: docs-content://solutions/observability/streams/management/extract/remove.md
+          title: Remove processor
+        - page: docs-content://solutions/observability/streams/management/extract/date.md
+          title: Date processor
+        - page: docs-content://solutions/observability/streams/management/extract/convert.md
+          title: Convert processor
+        - page: docs-content://solutions/observability/streams/management/extract/replace.md
+          title: Replace processor
+        - page: docs-content://solutions/observability/streams/management/extract/dissect.md
+          title: Dissect processor
+        - page: docs-content://solutions/observability/streams/management/extract/grok.md
+          title: Grok processor
+        - page: docs-content://solutions/observability/streams/management/extract/set.md
+          title: Set processor
+        - page: docs-content://solutions/observability/streams/management/extract/math.md
+          title: Math processor
+        - page: docs-content://solutions/observability/streams/management/extract/rename.md
+          title: Rename processor
+        - page: docs-content://solutions/observability/streams/management/extract/append.md
+          title: Append processor
+        - page: docs-content://solutions/observability/streams/management/extract/manual-pipeline-configuration.md
+          title: Manual pipeline configuration
+      - page: docs-content://solutions/observability/streams/management/partitioning.md
+        title: Partition data into child streams
+      - page: docs-content://solutions/observability/streams/management/schema.md
+        title: Map fields
+      - page: docs-content://solutions/observability/streams/management/data-quality.md
+        title: Manage data quality
+      - page: docs-content://solutions/observability/streams/management/advanced.md
+        title: Configure advanced settings
+      - page: docs-content://solutions/observability/streams/wired-streams.md
+        title: Wired streams
+      - group: Incident management
+        page: docs-content://solutions/observability/incident-management.md
+        children:
+        - group: Alerting
+          page: docs-content://solutions/observability/incident-management/alerting.md
+          children:
+          - group: Create and manage rules
+            page: docs-content://solutions/observability/incident-management/create-manage-rules.md
+            children:
+            - page: docs-content://solutions/observability/incident-management/create-an-anomaly-detection-rule.md
+              title: Anomaly detection
+            - page: docs-content://solutions/observability/incident-management/create-an-apm-anomaly-rule.md
+              title: APM anomaly
+            - page: docs-content://solutions/observability/incident-management/create-custom-threshold-rule.md
+              title: Custom threshold
+            - page: docs-content://solutions/observability/incident-management/create-a-degraded-docs-rule.md
+              title: Degraded docs
+            - page: docs-content://solutions/observability/incident-management/create-an-elasticsearch-query-rule.md
+              title: Elasticsearch query
+            - page: docs-content://solutions/observability/incident-management/create-an-error-count-threshold-rule.md
+              title: Error count threshold
+            - page: docs-content://solutions/observability/incident-management/create-failed-transaction-rate-threshold-rule.md
+              title: Failed transaction rate threshold
+            - page: docs-content://solutions/observability/incident-management/create-a-failed-docs-rule.md
+              title: Failed docs
+            - page: docs-content://solutions/observability/incident-management/create-an-inventory-rule.md
+              title: Inventory
+            - page: docs-content://solutions/observability/incident-management/create-latency-threshold-rule.md
+              title: Latency threshold
+            - page: docs-content://solutions/observability/incident-management/create-log-threshold-rule.md
+              title: Log threshold
+            - page: docs-content://solutions/observability/incident-management/create-metric-threshold-rule.md
+              title: Metric threshold
+            - page: docs-content://solutions/observability/incident-management/create-monitor-status-rule.md
+              title: Monitor Status
+            - page: docs-content://solutions/observability/incident-management/create-tls-certificate-rule.md
+              title: TLS certificate
+            - page: docs-content://solutions/observability/incident-management/create-an-uptime-duration-anomaly-rule.md
+              title: Uptime duration anomaly
+            - page: docs-content://solutions/observability/incident-management/create-an-slo-burn-rate-rule.md
+              title: SLO burn rate
+          - group: Aggregation options
+            page: docs-content://solutions/observability/incident-management/aggregation-options.md
+            children:
+            - page: docs-content://solutions/observability/incident-management/rate-aggregation.md
+              title: Rate aggregation
+          - group: View and manage alerts
+            page: docs-content://solutions/observability/incident-management/view-alerts.md
+            children:
+            - page: docs-content://solutions/observability/incident-management/triage-slo-burn-rate-breaches.md
+              title: SLO burn rate breaches
+            - page: docs-content://solutions/observability/incident-management/triage-threshold-breaches.md
+              title: Threshold breaches
+        - page: docs-content://solutions/observability/incident-management/observability-cases.md
+          title: Cases
+        - group: Service-level objectives (SLOs)
+          page: docs-content://solutions/observability/incident-management/service-level-objectives-slos.md
+          children:
+          - page: docs-content://solutions/observability/incident-management/configure-service-level-objective-slo-access.md
+            title: Configure SLO access
+          - page: docs-content://solutions/observability/incident-management/create-an-slo.md
+            title: Create an SLO
+          - page: docs-content://solutions/observability/incident-management/slo-management.md
+            title: View and manage SLOs
+          - page: docs-content://solutions/observability/incident-management/configure-slo-settings.md
+            title: Configure SLOs settings
+      - page: docs-content://solutions/observability/data-set-quality-monitoring.md
+        title: Data set quality
+      - group: AI for Observability
+        page: docs-content://solutions/observability/ai/observability-ai.md
+        children:
+        - page: docs-content://solutions/observability/ai/observability-ai-assistant.md
+          title: AI Assistant
+        - page: docs-content://solutions/observability/ai/agent-builder-observability.md
+          title: Agent Builder for Observability
+        - page: docs-content://solutions/observability/ai/llm-performance-matrix.md
+          title: Large language model performance matrix
+      - page: docs-content://solutions/observability/observability-serverless-feature-tiers.md
+        title: Serverless feature tiers
+      - page: docs-content://solutions/observability/apis.md
+        title: APIs
+    - group: Security solution
+      page: docs-content://solutions/security.md
       children:
-      - title: AI for Observability
-      - title: "Application performance monitoring (APM)"
-      - title: Application and service monitoring
-      - title: Get started with Elastic Observability
-      - title: Incident management
-      - title: Infrastructure and host monitoring
-      - title: Log monitoring
-      - title: Streams
-      - title: Synthetic monitoring
-      - title: Uptime monitoring (deprecated)
+      - group: Get started
+        page: docs-content://solutions/security/get-started.md
+        children:
+        - group: Elastic Security quickstarts
+          page: docs-content://solutions/security/get-started/quickstarts.md
+          children:
+          - page: docs-content://solutions/security/get-started/get-started-detect-with-siem.md
+            title: Detect and respond to threats with SIEM
+          - page: docs-content://solutions/security/get-started/get-started-endpoint-security.md
+            title: Protect your hosts with endpoint security
+          - page: docs-content://solutions/security/get-started/get-started-cloud-security.md
+            title: Secure your cloud assets with cloud security posture management
+        - page: docs-content://solutions/security/get-started/elastic-security-requirements.md
+          title: Elastic Security requirements
+        - page: docs-content://solutions/security/get-started/elastic-security-ui.md
+          title: Elastic Security UI
+        - group: Ingest data to Elastic Security
+          page: docs-content://solutions/security/get-started/ingest-data-to-elastic-security.md
+          children:
+          - page: docs-content://solutions/security/get-started/enable-threat-intelligence-integrations.md
+            title: Enable threat intelligence integrations
+          - page: docs-content://solutions/security/get-started/automatic-migration.md
+            title: Automatic migration
+          - page: docs-content://solutions/security/get-started/automatic-import.md
+            title: Automatic import
+          - page: docs-content://solutions/security/get-started/content-connectors.md
+            title: Content connectors
+        - group: Spaces and Elastic Security
+          page: docs-content://solutions/security/get-started/spaces-elastic-security.md
+          children:
+          - page: docs-content://solutions/security/get-started/spaces-defend-faq.md
+            title: "Spaces and {{elastic-defend}} FAQ"
+        - page: docs-content://solutions/security/get-started/data-views-elastic-security.md
+          title: "{{data-sources-cap}} and Elastic Security"
+        - page: docs-content://solutions/security/get-started/create-runtime-fields-in-elastic-security.md
+          title: Create runtime fields in Elastic Security
+        - page: docs-content://solutions/security/get-started/configure-advanced-settings.md
+          title: Configure advanced settings
+      - group: "ES|QL for security"
+        page: docs-content://solutions/security/esql-for-security.md
+        children:
+        - page: docs-content://solutions/security/esql-for-security/esql-threat-hunting-tutorial.md
+          title: "Tutorial: Threat hunting with ES|QL"
+      - group: AI for security
+        page: docs-content://solutions/security/ai.md
+        children:
+        - group: Elastic AI SOC Engine
+          page: docs-content://solutions/security/ai/ease/ease-intro.md
+          children:
+          - page: docs-content://solutions/security/ai/ease/ease-alerts.md
+            title: Triage alerts
+          - page: docs-content://solutions/security/ai/ease/ease-upgrade.md
+            title: Upgrade from EASE to Elastic Security
+        - group: AI Assistant for Security
+          page: docs-content://solutions/security/ai/ai-assistant.md
+          children:
+          - page: docs-content://solutions/security/ai/ai-assistant-knowledge-base.md
+            title: AI Assistant Knowledge Base
+          - page: docs-content://solutions/security/ai/usecase-knowledge-base-walkthrough.md
+            title: Use AI Assistant's Knowledge Base to improve response quality
+        - page: docs-content://solutions/security/ai/agent-builder/agent-builder.md
+          title: Agent Builder for Elastic Security
+        - page: docs-content://solutions/security/ai/attack-discovery.md
+          title: Attack Discovery
+        - page: docs-content://solutions/security/ai/large-language-model-performance-matrix.md
+          title: Large language model performance matrix
+        - group: AI use cases
+          page: docs-content://solutions/security/ai/use-cases.md
+          children:
+          - page: docs-content://solutions/security/ai/triage-alerts.md
+            title: Triage alerts
+          - page: docs-content://solutions/security/ai/identify-investigate-document-threats.md
+            title: Identify, investigate, and document threats
+          - page: docs-content://solutions/security/ai/generate-customize-learn-about-esorql-queries.md
+            title: "Generate, customize, and learn about ES|QL queries"
+        - page: docs-content://solutions/security/ai/ease/ease-value-report.md
+          title: Value report
+      - group: Detections and alerts
+        page: docs-content://solutions/security/detect-and-alert.md
+        children:
+        - group: Before you begin
+          page: docs-content://solutions/security/detect-and-alert/before-you-begin.md
+          children:
+          - page: docs-content://solutions/security/detect-and-alert/turn-on-detections.md
+            title: Turn on detections
+          - page: docs-content://solutions/security/detect-and-alert/detections-privileges.md
+            title: Detections privileges
+          - page: docs-content://solutions/security/detect-and-alert/detection-rule-concepts.md
+            title: Detection rule concepts
+          - group: Advanced data source configuration
+            page: docs-content://solutions/security/detect-and-alert/advanced-data-source-configuration.md
+            children:
+            - page: docs-content://solutions/security/detect-and-alert/cross-cluster-search-detection-rules.md
+              title: Cross-cluster search and detection rules
+            - page: docs-content://solutions/security/detect-and-alert/using-logsdb-index-mode-with-elastic-security.md
+              title: Using logsdb index mode with Elastic Security
+        - page: docs-content://solutions/security/detect-and-alert/mitre-attack-coverage.md
+          title: "MITRE ATT&CK coverage"
+        - group: Prebuilt rules
+          page: docs-content://solutions/security/detect-and-alert/prebuilt-rules.md
+          children:
+          - page: docs-content://solutions/security/detect-and-alert/prebuilt-rule-components.md
+            title: Prebuilt rule components
+          - page: docs-content://solutions/security/detect-and-alert/install-prebuilt-rules.md
+            title: Install prebuilt rules
+          - page: docs-content://solutions/security/detect-and-alert/update-prebuilt-rules.md
+            title: Update prebuilt rules
+          - page: docs-content://solutions/security/detect-and-alert/prebuilt-rules-airgapped.md
+            title: Prebuilt rules in air-gapped environments
+          - page: docs-content://solutions/security/detect-and-alert/customize-prebuilt-rules.md
+            title: Customize prebuilt rules
+        - group: Author rules
+          page: docs-content://solutions/security/detect-and-alert/author-rules.md
+          children:
+          - group: Choose the right rule type
+            page: docs-content://solutions/security/detect-and-alert/choose-the-right-rule-type.md
+            children:
+            - page: docs-content://solutions/security/detect-and-alert/about-building-block-rules.md
+              title: About building block rules
+          - group: Rule type guides
+            page: docs-content://solutions/security/detect-and-alert/rule-types.md
+            children:
+            - page: docs-content://solutions/security/detect-and-alert/esql.md
+              title: "ES|QL rules"
+            - page: docs-content://solutions/security/detect-and-alert/custom-query.md
+              title: Custom query rules
+            - page: docs-content://solutions/security/detect-and-alert/eql.md
+              title: Event correlation (EQL) rules
+            - page: docs-content://solutions/security/detect-and-alert/indicator-match.md
+              title: Indicator match rules
+            - page: docs-content://solutions/security/detect-and-alert/threshold.md
+              title: Threshold rules
+            - page: docs-content://solutions/security/detect-and-alert/machine-learning.md
+              title: "{{ml-cap}} rules"
+            - page: docs-content://solutions/security/detect-and-alert/new-terms.md
+              title: New terms rules
+          - page: docs-content://solutions/security/detect-and-alert/using-the-rule-ui.md
+            title: Using the UI
+          - page: docs-content://solutions/security/detect-and-alert/using-the-api.md
+            title: Using the API
+          - page: docs-content://solutions/security/detect-and-alert/common-rule-settings.md
+            title: Common rule settings
+          - page: docs-content://solutions/security/detect-and-alert/set-rule-data-sources.md
+            title: Set rule data sources
+          - page: docs-content://solutions/security/detect-and-alert/write-investigation-guides.md
+            title: Write investigation guides
+          - page: docs-content://solutions/security/detect-and-alert/validate-and-test-rules.md
+            title: Validate and test rules
+        - page: docs-content://solutions/security/detect-and-alert/manage-detection-rules.md
+          title: Manage detection rules
+        - group: Monitor rule executions
+          page: docs-content://solutions/security/detect-and-alert/monitor-rule-executions.md
+          children:
+          - page: docs-content://solutions/security/detect-and-alert/fill-rule-gaps.md
+            title: Fill rule execution gaps
+        - group: Reduce noise and false positives
+          page: docs-content://solutions/security/detect-and-alert/reduce-noise-and-false-positives.md
+          children:
+          - page: docs-content://solutions/security/detect-and-alert/tune-detection-rules.md
+            title: Tune detection rules
+          - group: Rule exceptions
+            page: docs-content://solutions/security/detect-and-alert/rule-exceptions.md
+            children:
+            - page: docs-content://solutions/security/detect-and-alert/create-manage-value-lists.md
+              title: Create and manage value lists
+            - page: docs-content://solutions/security/detect-and-alert/add-manage-exceptions.md
+              title: Add and manage exceptions
+            - page: docs-content://solutions/security/detect-and-alert/create-manage-shared-exception-lists.md
+              title: Create and manage shared exception lists
+          - page: docs-content://solutions/security/detect-and-alert/alert-suppression.md
+            title: Suppress detection alerts
+        - group: Manage detection alerts
+          page: docs-content://solutions/security/detect-and-alert/manage-detection-alerts.md
+          children:
+          - page: docs-content://solutions/security/detect-and-alert/visualize-detection-alerts.md
+            title: Visualize detection alerts
+          - page: docs-content://solutions/security/detect-and-alert/view-detection-alert-details.md
+            title: View detection alert details
+          - page: docs-content://solutions/security/detect-and-alert/query-alert-indices.md
+            title: Query alert indices
+      - group: "Configure endpoint protection with {{elastic-defend}}"
+        page: docs-content://solutions/security/configure-elastic-defend.md
+        children:
+        - page: docs-content://solutions/security/configure-elastic-defend/elastic-defend-requirements.md
+          title: "{{elastic-defend}} requirements"
+        - group: "Install {{elastic-defend}}"
+          page: docs-content://solutions/security/configure-elastic-defend/install-elastic-defend.md
+          children:
+          - page: docs-content://solutions/security/configure-elastic-defend/enable-access-for-macos.md
+            title: Enable access on macOS
+          - page: docs-content://solutions/security/configure-elastic-defend/deploy-on-macos-with-mdm.md
+            title: Deploy on macOS with MDM
+          - page: docs-content://solutions/security/configure-elastic-defend/prevent-elastic-agent-uninstallation.md
+            title: Prevent Elastic Agent uninstallation
+        - page: docs-content://solutions/security/configure-elastic-defend/elastic-defend-feature-privileges.md
+          title: "{{elastic-defend}} feature privileges"
+        - group: "Configure an integration policy for {{elastic-defend}}"
+          page: docs-content://solutions/security/configure-elastic-defend/configure-an-integration-policy-for-elastic-defend.md
+          children:
+          - page: docs-content://solutions/security/configure-elastic-defend/configure-updates-for-protection-artifacts.md
+            title: Configure updates for protection artifacts
+          - page: docs-content://solutions/security/configure-elastic-defend/turn-off-diagnostic-data-for-elastic-defend.md
+            title: "Turn off diagnostic data for {{elastic-defend}}"
+          - page: docs-content://solutions/security/configure-elastic-defend/configure-self-healing-rollback-for-windows-endpoints.md
+            title: Configure self-healing rollback for Windows endpoints
+          - page: docs-content://solutions/security/configure-elastic-defend/configure-linux-file-system-monitoring.md
+            title: Configure Linux file system monitoring
+          - page: docs-content://solutions/security/configure-elastic-defend/configure-data-volume-for-elastic-endpoint.md
+            title: Configure data volume
+          - page: docs-content://solutions/security/configure-elastic-defend/create-an-elastic-defend-policy-using-api.md
+            title: Create an Elastic Defend policy using API
+        - page: docs-content://solutions/security/configure-elastic-defend/configure-offline-endpoints-air-gapped-environments.md
+          title: Configure offline endpoints and air-gapped environments
+        - page: docs-content://solutions/security/configure-elastic-defend/uninstall-elastic-agent.md
+          title: Uninstall Elastic Agent
+      - group: "Manage {{elastic-defend}}"
+        page: docs-content://solutions/security/manage-elastic-defend.md
+        children:
+        - page: docs-content://solutions/security/manage-elastic-defend/endpoints.md
+          title: Endpoints
+        - page: docs-content://solutions/security/manage-elastic-defend/policies.md
+          title: Policies
+        - page: docs-content://solutions/security/manage-elastic-defend/trusted-applications.md
+          title: Trusted applications
+        - page: docs-content://solutions/security/manage-elastic-defend/trusted-devices.md
+          title: Trusted devices
+        - page: docs-content://solutions/security/manage-elastic-defend/event-filters.md
+          title: Event filters
+        - page: docs-content://solutions/security/manage-elastic-defend/host-isolation-exceptions.md
+          title: Host isolation exceptions
+        - page: docs-content://solutions/security/manage-elastic-defend/blocklist.md
+          title: Blocklist
+        - page: docs-content://solutions/security/manage-elastic-defend/optimize-elastic-defend.md
+          title: "Optimize {{elastic-defend}}"
+        - page: docs-content://solutions/security/manage-elastic-defend/event-capture-elastic-defend.md
+          title: "Event capture and {{elastic-defend}}"
+        - page: docs-content://solutions/security/manage-elastic-defend/endpoint-protection-rules.md
+          title: Endpoint protection rules
+        - page: docs-content://solutions/security/manage-elastic-defend/automatic-troubleshooting.md
+          title: Automatic troubleshooting
+        - page: docs-content://solutions/security/manage-elastic-defend/allowlist-elastic-endpoint-in-third-party-antivirus-apps.md
+          title: "Allowlist {{elastic-endpoint}} in third-party antivirus apps"
+        - page: docs-content://solutions/security/manage-elastic-defend/elastic-endpoint-self-protection-features.md
+          title: "{{elastic-endpoint}} self-protection features"
+      - group: Endpoint response actions
+        page: docs-content://solutions/security/endpoint-response-actions.md
+        children:
+        - page: docs-content://solutions/security/endpoint-response-actions/automated-response-actions.md
+          title: Automated response actions
+        - page: docs-content://solutions/security/endpoint-response-actions/isolate-host.md
+          title: Isolate a host
+        - page: docs-content://solutions/security/endpoint-response-actions/response-actions-history.md
+          title: Response actions history
+        - page: docs-content://solutions/security/endpoint-response-actions/third-party-response-actions.md
+          title: Third-party response actions
+        - page: docs-content://solutions/security/endpoint-response-actions/configure-third-party-response-actions.md
+          title: Configure third-party response actions
+      - group: Cloud Security
+        page: docs-content://solutions/security/cloud.md
+        children:
+        - page: docs-content://solutions/security/cloud/security-posture-management-overview.md
+          title: Security posture management overview
+        - page: docs-content://solutions/security/cloud/enable-cloud-security-features.md
+          title: "Enable cloud security features in {{serverless-short}}"
+        - group: Cloud security posture management
+          page: docs-content://solutions/security/cloud/cloud-security-posture-management.md
+          children:
+          - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-aws.md
+            title: Get started with CSPM for AWS
+          - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-gcp.md
+            title: Get started with CSPM for GCP
+          - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-azure.md
+            title: Get started with CSPM for Azure
+          - page: docs-content://solutions/security/cloud/cspm-privilege-requirements.md
+            title: CSPM privilege requirements
+          - page: docs-content://solutions/security/cloud/findings-page.md
+            title: CSPM Findings
+          - page: docs-content://solutions/security/cloud/benchmarks.md
+            title: CSPM benchmarks
+          - page: docs-content://solutions/security/cloud/cspm-dashboard.md
+            title: Cloud Security Posture dashboard
+          - page: docs-content://solutions/security/cloud/cspm-frequently-asked-questions-faq.md
+            title: Frequently asked questions (FAQ)
+        - group: Kubernetes security posture management
+          page: docs-content://solutions/security/cloud/kubernetes-security-posture-management.md
+          children:
+          - page: docs-content://solutions/security/cloud/get-started-with-kspm.md
+            title: Get started with KSPM
+          - page: docs-content://solutions/security/cloud/findings-page-2.md
+            title: KSPM Findings
+          - page: docs-content://solutions/security/cloud/kspm-benchmarks.md
+            title: KSPM benchmarks
+          - page: docs-content://solutions/security/cloud/kspm-dashboard.md
+            title: Cloud Security Posture dashboard
+          - page: docs-content://solutions/security/cloud/kspm-frequently-asked-questions.md
+            title: Frequently asked questions (FAQ)
+        - group: Cloud Asset Discovery
+          page: docs-content://solutions/security/cloud/asset-disc.md
+          children:
+          - page: docs-content://solutions/security/cloud/asset-disc-aws.md
+            title: Set up Cloud Asset Discovery for AWS
+          - page: docs-content://solutions/security/cloud/asset-disc-gcp.md
+            title: Set up Cloud Asset Discovery for GCP
+          - page: docs-content://solutions/security/cloud/asset-disc-azure.md
+            title: Set up Cloud Asset Discovery for Azure
+        - group: Cloud native vulnerability management
+          page: docs-content://solutions/security/cloud/cloud-native-vulnerability-management.md
+          children:
+          - page: docs-content://solutions/security/cloud/get-started-with-cnvm.md
+            title: Get started with CNVM
+          - page: docs-content://solutions/security/cloud/cnvm-privilege-requirements.md
+            title: CNVM privilege requirements
+          - page: docs-content://solutions/security/cloud/findings-page-3.md
+            title: CNVM Findings
+          - page: docs-content://solutions/security/cloud/cnvm-dashboard.md
+            title: CNVM dashboard
+          - page: docs-content://solutions/security/cloud/cnvm-frequently-asked-questions-faq.md
+            title: Frequently asked questions (FAQ)
+        - group: Cloud workload protection for VMs
+          page: docs-content://solutions/security/cloud/cloud-workload-protection-for-vms.md
+          children:
+          - page: docs-content://solutions/security/cloud/capture-environment-variables.md
+            title: Capture environment variables
+        - group: Cloud workload protection for Kubernetes
+          page: docs-content://solutions/security/cloud/d4c/d4c-overview.md
+          children:
+          - page: docs-content://solutions/security/cloud/d4c/get-started-with-d4c.md
+            title: Get started with Defend for Containers for Kubernetes
+          - page: docs-content://solutions/security/cloud/d4c/d4c-policies.md
+            title: Container workload protection policies
+          - page: docs-content://solutions/security/cloud/d4c/kubernetes-dashboard.md
+            title: Kubernetes dashboard
+      - group: Ingest third-party security data
+        page: docs-content://solutions/security/integrations/ingest-third-party-security-data.md
+        children:
+        - page: docs-content://solutions/security/integrations/aws-config.md
+          title: AWS Config
+        - page: docs-content://solutions/security/integrations/aws-inspector.md
+          title: AWS Inspector
+        - page: docs-content://solutions/security/integrations/aws-sec-hub.md
+          title: AWS Security Hub
+        - page: docs-content://solutions/security/integrations/aws-security-hub-cspm.md
+          title: AWS Security Hub CSPM
+        - page: docs-content://solutions/security/integrations/cncf-falco.md
+          title: CNCF Falco
+        - page: docs-content://solutions/security/integrations/google-security-command-center.md
+          title: Google Security Command Center
+        - page: docs-content://solutions/security/integrations/microsoft-defender-for-cloud.md
+          title: Microsoft Defender for Cloud
+        - page: docs-content://solutions/security/integrations/microsoft-defender-for-endpoint.md
+          title: Microsoft Defender for Endpoint
+        - page: docs-content://solutions/security/integrations/microsoft-defender-xdr.md
+          title: Microsoft Defender XDR
+        - page: docs-content://solutions/security/integrations/prisma-cloud.md
+          title: Prisma Cloud
+        - page: docs-content://solutions/security/integrations/qualys.md
+          title: Qualys VMDR
+        - page: docs-content://solutions/security/integrations/rapid7.md
+          title: Rapid7 InsightVM
+        - page: docs-content://solutions/security/integrations/tenablevm.md
+          title: Tenable VM
+        - page: docs-content://solutions/security/integrations/wiz.md
+          title: Wiz
+      - group: Investigation tools
+        page: docs-content://solutions/security/investigate.md
+        children:
+        - group: Timeline
+          page: docs-content://solutions/security/investigate/timeline.md
+          children:
+          - page: docs-content://solutions/security/investigate/timeline-templates.md
+            title: Timeline templates
+        - page: docs-content://solutions/security/investigate/visual-event-analyzer.md
+          title: Visual event analyzer
+        - page: docs-content://solutions/security/investigate/session-view.md
+          title: Session View
+        - group: Osquery
+          page: docs-content://solutions/security/investigate/osquery.md
+          children:
+          - page: docs-content://solutions/security/investigate/manage-integration.md
+            title: Osquery manager integration
+          - page: docs-content://solutions/security/investigate/osquery-faq.md
+            title: Osquery FAQ
+          - page: docs-content://solutions/security/investigate/add-osquery-response-actions.md
+            title: Add Osquery Response Actions
+          - page: docs-content://solutions/security/investigate/run-osquery-from-investigation-guides.md
+            title: Run Osquery from investigation guides
+          - page: docs-content://solutions/security/investigate/run-osquery-from-alerts.md
+            title: Run Osquery from alerts
+          - page: docs-content://solutions/security/investigate/examine-osquery-results.md
+            title: Examine Osquery results
+          - page: docs-content://solutions/security/investigate/use-placeholder-fields-in-osquery-queries.md
+            title: Use placeholder fields in Osquery queries
+        - page: docs-content://solutions/security/investigate/notes.md
+          title: Notes
+        - page: docs-content://solutions/security/investigate/indicators-of-compromise.md
+          title: Indicators of compromise
+        - page: docs-content://solutions/security/investigate/security-cases.md
+          title: Cases
+      - group: Dashboards
+        page: docs-content://solutions/security/dashboards.md
+        children:
+        - page: docs-content://solutions/security/dashboards/overview-dashboard.md
+          title: Overview dashboard
+        - page: docs-content://solutions/security/dashboards/detection-response-dashboard.md
+          title: "Detection & Response dashboard"
+        - page: docs-content://solutions/security/dashboards/cloud-security-posture-dashboard.md
+          title: Cloud Security Posture dashboard
+        - page: docs-content://solutions/security/dashboards/kubernetes-dashboard.md
+          title: Kubernetes dashboard
+        - page: docs-content://solutions/security/dashboards/entity-analytics-dashboard.md
+          title: Entity Analytics dashboard
+        - page: docs-content://solutions/security/dashboards/data-quality-dashboard.md
+          title: Data Quality dashboard
+        - page: docs-content://solutions/security/dashboards/cloud-native-vulnerability-management-dashboard.md
+          title: Cloud Native Vulnerability Management Dashboard
+        - page: docs-content://solutions/security/dashboards/detection-rule-monitoring-dashboard.md
+          title: Detection rule monitoring dashboard
+        - page: docs-content://solutions/security/dashboards/endpoint-detection-response-dashboard.md
+          title: Endpoint Detection and Response dashboard
+      - group: Entity analytics
+        page: docs-content://solutions/security/advanced-entity-analytics.md
+        children:
+        - page: docs-content://solutions/security/advanced-entity-analytics/overview.md
+          title: Entity analytics overview
+        - group: Entity risk scoring
+          page: docs-content://solutions/security/advanced-entity-analytics/entity-risk-scoring.md
+          children:
+          - page: docs-content://solutions/security/advanced-entity-analytics/entity-risk-scoring-requirements.md
+            title: Entity risk scoring requirements
+          - page: docs-content://solutions/security/advanced-entity-analytics/turn-on-risk-scoring-engine.md
+            title: Turn on the risk scoring engine
+          - page: docs-content://solutions/security/advanced-entity-analytics/view-entity-details.md
+            title: View entity details
+          - page: docs-content://solutions/security/advanced-entity-analytics/asset-criticality.md
+            title: Asset criticality
+          - page: docs-content://solutions/security/advanced-entity-analytics/entity-store.md
+            title: Entity store
+          - page: docs-content://solutions/security/advanced-entity-analytics/view-analyze-risk-score-data.md
+            title: View and analyze risk score data
+        - group: Advanced behavioral detections
+          page: docs-content://solutions/security/advanced-entity-analytics/advanced-behavioral-detections.md
+          children:
+          - page: docs-content://solutions/security/advanced-entity-analytics/machine-learning-job-rule-requirements.md
+            title: Machine learning job and rule requirements
+          - page: docs-content://solutions/security/advanced-entity-analytics/anomaly-detection.md
+            title: Anomaly detection
+          - page: docs-content://solutions/security/advanced-entity-analytics/optimizing-anomaly-results.md
+            title: Optimizing anomaly results
+          - page: docs-content://solutions/security/advanced-entity-analytics/behavioral-detection-use-cases.md
+            title: Behavioral detection use cases
+        - group: Privileged user monitoring
+          page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring.md
+          children:
+          - page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring-requirements.md
+            title: Privileged user monitoring requirements
+          - page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring-setup.md
+            title: Set up privileged user monitoring
+          - page: docs-content://solutions/security/advanced-entity-analytics/monitor-privileged-user-activitites.md
+            title: Monitor privileged user activities
+        - group: Explore
+          page: docs-content://solutions/security/advanced-entity-analytics/explore.md
+          children:
+          - page: docs-content://solutions/security/advanced-entity-analytics/hosts-page.md
+            title: Hosts page
+          - group: Network page
+            page: docs-content://solutions/security/advanced-entity-analytics/network-page.md
+            children:
+            - page: docs-content://solutions/security/advanced-entity-analytics/configure-network-map-data.md
+              title: Configure network map data
+            - page: docs-content://solutions/security/advanced-entity-analytics/configure-dns-histogram.md
+              title: Configure the DNS histogram
+          - page: docs-content://solutions/security/advanced-entity-analytics/users-page.md
+            title: Users page
+      - page: docs-content://solutions/security/security-serverless-feature-tiers.md
+        title: Serverless feature tiers
+      - page: docs-content://solutions/security/apis.md
+        title: APIs
 #  - label: Reference
 #    children:
 #    - toc: elasticsearch://reference/elasticsearch

From 6d747b16d39f738e16f8cd203fa6c6bbf601ff81 Mon Sep 17 00:00:00 2001
From: florent-leborgne <florent.leborgne@elastic.co>
Date: Wed, 25 Mar 2026 12:07:53 +0100
Subject: [PATCH 031/226] feat(nav-v2): restructure AI and machine learning
 section (#2965)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reorganize the AI and machine learning label for clearer hierarchy:

- **Agent builder**: promoted to top-level group (was nested inside
  AI framework)
- **Elastic Inference Service**: promoted to top-level group
- **Machine Learning and NLP**: unchanged (stays first)
- **AI chat and LLM configuration**: new group combining AI chat
  experiences, LLM provider guides, and AI access management —
  the shared plumbing for platform features that leverage LLMs
- **AI agent skills for Elastic**: unchanged (stays last)

The former "AI framework" wrapper is removed. Its landing page
(ai-features.md) is reused as the page for the new "AI chat and
LLM configuration" group.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 152 +++++++++++++++++++--------------------
 1 file changed, 76 insertions(+), 76 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index b4e288ed4b..c19195e8a5 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -883,91 +883,91 @@ nav:
             title: AIOps Labs
           - page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana/inference-processing.md
             title: Inference processing
-      - group: AI framework
-        page: docs-content://explore-analyze/ai-features.md
+      - group: Agent builder
+        page: docs-content://explore-analyze/ai-features/elastic-agent-builder.md
         children:
-        - group: Elastic Inference Service
-          page: docs-content://explore-analyze/elastic-inference.md
-          children:
-          - group: Elastic Inference Service
-            page: docs-content://explore-analyze/elastic-inference/eis.md
-            children:
-            - page: docs-content://explore-analyze/elastic-inference/connect-self-managed-cluster-to-eis.md
-              title: EIS for self-managed clusters
-          - page: docs-content://explore-analyze/elastic-inference/inference-api.md
-            title: Inference integrations
-        - group: Agent builder
-          page: docs-content://explore-analyze/ai-features/elastic-agent-builder.md
-          children:
-          - page: docs-content://explore-analyze/ai-features/agent-builder/get-started.md
-            title: Get started
-          - page: docs-content://explore-analyze/ai-features/agent-builder/models.md
-            title: Models
-          - group: Chat
-            page: docs-content://explore-analyze/ai-features/agent-builder/chat.md
-            children:
-            - page: docs-content://explore-analyze/ai-features/agent-builder/standalone-and-flyout-modes.md
-              title: Chat UI modes
-          - group: Agents
-            page: docs-content://explore-analyze/ai-features/agent-builder/agent-builder-agents.md
-            children:
-            - page: docs-content://explore-analyze/ai-features/agent-builder/custom-agents.md
-              title: Custom agents
-            - page: docs-content://explore-analyze/ai-features/agent-builder/builtin-agents-reference.md
-              title: Built-in agents
-            - page: docs-content://explore-analyze/ai-features/agent-builder/prompt-engineering.md
-              title: Prompting best practices
-            - page: docs-content://explore-analyze/ai-features/agent-builder/agents-and-workflows.md
-              title: Call agents from workflows
-          - group: Tools
-            page: docs-content://explore-analyze/ai-features/agent-builder/tools.md
-            children:
-            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/builtin-tools-reference.md
-              title: Built-in tools
-            - group: Custom tools
-              page: docs-content://explore-analyze/ai-features/agent-builder/tools/custom-tools.md
-              children:
-              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/esql-tools.md
-                title: "ES|QL tools"
-              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/index-search-tools.md
-                title: Index search tools
-              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/mcp-tools.md
-                title: MCP tools
-              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/workflow-tools.md
-                title: Workflow tools
-          - group: Programmatic access
-            page: docs-content://explore-analyze/ai-features/agent-builder/programmatic-access.md
+        - page: docs-content://explore-analyze/ai-features/agent-builder/get-started.md
+          title: Get started
+        - page: docs-content://explore-analyze/ai-features/agent-builder/models.md
+          title: Models
+        - group: Chat
+          page: docs-content://explore-analyze/ai-features/agent-builder/chat.md
+          children:
+          - page: docs-content://explore-analyze/ai-features/agent-builder/standalone-and-flyout-modes.md
+            title: Chat UI modes
+        - group: Agents
+          page: docs-content://explore-analyze/ai-features/agent-builder/agent-builder-agents.md
+          children:
+          - page: docs-content://explore-analyze/ai-features/agent-builder/custom-agents.md
+            title: Custom agents
+          - page: docs-content://explore-analyze/ai-features/agent-builder/builtin-agents-reference.md
+            title: Built-in agents
+          - page: docs-content://explore-analyze/ai-features/agent-builder/prompt-engineering.md
+            title: Prompting best practices
+          - page: docs-content://explore-analyze/ai-features/agent-builder/agents-and-workflows.md
+            title: Call agents from workflows
+        - group: Tools
+          page: docs-content://explore-analyze/ai-features/agent-builder/tools.md
+          children:
+          - page: docs-content://explore-analyze/ai-features/agent-builder/tools/builtin-tools-reference.md
+            title: Built-in tools
+          - group: Custom tools
+            page: docs-content://explore-analyze/ai-features/agent-builder/tools/custom-tools.md
             children:
-            - group: Kibana API
-              page: docs-content://explore-analyze/ai-features/agent-builder/kibana-api.md
-              children:
-              - page: docs-content://explore-analyze/ai-features/agent-builder/agent-builder-api-tutorial.md
-                title: Kibana API tutorial
-            - page: docs-content://explore-analyze/ai-features/agent-builder/a2a-server.md
-              title: A2A server
-            - page: docs-content://explore-analyze/ai-features/agent-builder/mcp-server.md
-              title: MCP server
-          - page: docs-content://explore-analyze/ai-features/agent-builder/monitor-usage.md
-            title: Monitor token usage
-          - page: docs-content://explore-analyze/ai-features/agent-builder/permissions.md
-            title: Permissions
-          - group: Troubleshooting
-            page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting.md
+            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/esql-tools.md
+              title: "ES|QL tools"
+            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/index-search-tools.md
+              title: Index search tools
+            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/mcp-tools.md
+              title: MCP tools
+            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/workflow-tools.md
+              title: Workflow tools
+        - group: Programmatic access
+          page: docs-content://explore-analyze/ai-features/agent-builder/programmatic-access.md
+          children:
+          - group: Kibana API
+            page: docs-content://explore-analyze/ai-features/agent-builder/kibana-api.md
             children:
-            - page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting/context-length-exceeded.md
-              title: Context length exceeded
-            - page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting/api-calls-return-403-forbidden.md
-              title: 403 Forbidden
-          - page: docs-content://explore-analyze/ai-features/agent-builder/limitations-known-issues.md
-            title: Limitations
-        - group: AI chats
+            - page: docs-content://explore-analyze/ai-features/agent-builder/agent-builder-api-tutorial.md
+              title: Kibana API tutorial
+          - page: docs-content://explore-analyze/ai-features/agent-builder/a2a-server.md
+            title: A2A server
+          - page: docs-content://explore-analyze/ai-features/agent-builder/mcp-server.md
+            title: MCP server
+        - page: docs-content://explore-analyze/ai-features/agent-builder/monitor-usage.md
+          title: Monitor token usage
+        - page: docs-content://explore-analyze/ai-features/agent-builder/permissions.md
+          title: Permissions
+        - group: Troubleshooting
+          page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting.md
+          children:
+          - page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting/context-length-exceeded.md
+            title: Context length exceeded
+          - page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting/api-calls-return-403-forbidden.md
+            title: 403 Forbidden
+        - page: docs-content://explore-analyze/ai-features/agent-builder/limitations-known-issues.md
+          title: Limitations
+      - group: Elastic Inference Service
+        page: docs-content://explore-analyze/elastic-inference.md
+        children:
+        - group: Elastic Inference Service
+          page: docs-content://explore-analyze/elastic-inference/eis.md
+          children:
+          - page: docs-content://explore-analyze/elastic-inference/connect-self-managed-cluster-to-eis.md
+            title: EIS for self-managed clusters
+        - page: docs-content://explore-analyze/elastic-inference/inference-api.md
+          title: Inference integrations
+      - group: AI chat and LLM configuration
+        page: docs-content://explore-analyze/ai-features.md
+        children:
+        - group: AI chat experiences
           page: docs-content://explore-analyze/ai-features/ai-chat-experiences.md
           children:
           - page: docs-content://explore-analyze/ai-features/ai-chat-experiences/ai-agent-or-ai-assistant.md
             title: Compare Agent Builder and AI Assistant
           - page: docs-content://explore-analyze/ai-features/ai-chat-experiences/ai-assistant.md
             title: AI assistants
-        - group: LLM guides
+        - group: LLM providers
           page: docs-content://explore-analyze/ai-features/llm-guides/llm-connectors.md
           children:
           - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-azure-openai.md

From b00e1db803a95d8279f5aa9734ad56dc1254c7ff Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 25 Mar 2026 13:29:45 +0100
Subject: [PATCH 032/226] refactor(nav-v2): promote Ingest tools to L1 under
 Ingest and manage data

Moves "Ingest tools (from Reference)" up one level so it sits alongside
"Ingest or migrate" and "Data storage and lifecycle" as a direct child
of the "Ingest and manage data" label.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index c19195e8a5..0a9772da58 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -211,19 +211,19 @@ nav:
             title: Minimal-downtime migration using snapshots
           - page: docs-content://manage-data/migrate/migrate-internal-indices.md
             title: Migrate system indices
-        - group: Ingest tools (from Reference)
-          children:
-          - toc: docs-content://reference/fleet
-          - toc: opentelemetry://reference
-          - toc: integration-docs://reference
-          - toc: elasticsearch://reference/search-connectors
-          - toc: logstash://reference
-          - toc: docs-content://reference/apm
-          - toc: beats://reference
-          - group: Other ingest tools
-            children:
-            - toc: elasticsearch-hadoop://reference
-            - toc: elastic-serverless-forwarder://reference
+      - group: Ingest tools (from Reference)
+        children:
+        - toc: docs-content://reference/fleet
+        - toc: opentelemetry://reference
+        - toc: integration-docs://reference
+        - toc: elasticsearch://reference/search-connectors
+        - toc: logstash://reference
+        - toc: docs-content://reference/apm
+        - toc: beats://reference
+        - group: Other ingest tools
+          children:
+          - toc: elasticsearch-hadoop://reference
+          - toc: elastic-serverless-forwarder://reference
       - group: Data storage and lifecycle
         children:
         - group: The Elasticsearch data store

From c34c969048b8316128408013dc8183ce4a7546f6 Mon Sep 17 00:00:00 2001
From: florent-leborgne <florent.leborgne@elastic.co>
Date: Fri, 27 Mar 2026 16:09:24 +0100
Subject: [PATCH 033/226] feat(nav-v2): promote Workflows to its own top-level
 label (#2976)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move Workflows out of "Share, alert, and automate" into its own
label section, placed between "Share, alert, and automate" and
"AI and machine learning".

This reflects that Workflows is a distinct platform capability —
not just an extension of alerting — with its own triggers, steps,
data handling, and management surface.

The overview page for "Share, alert, and automate" is updated
separately in docs-content to remove the Workflows section and
add cross-references instead (elastic/docs-content#5661).

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 112 ++++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 55 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 0a9772da58..b7047f3d7f 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -511,61 +511,6 @@ nav:
               title: CSV
             - page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting-pdf.md
               title: PDF/PNG
-        - group: Workflows
-          page: docs-content://explore-analyze/workflows.md
-          children:
-          - page: docs-content://explore-analyze/workflows/setup.md
-            title: Set up workflows
-          - page: docs-content://explore-analyze/workflows/get-started.md
-            title: Get started with workflows
-          - group: Core components
-            page: docs-content://explore-analyze/workflows/core-components.md
-            children:
-            - group: Triggers
-              page: docs-content://explore-analyze/workflows/triggers.md
-              children:
-              - page: docs-content://explore-analyze/workflows/triggers/manual-triggers.md
-                title: Manual triggers
-              - page: docs-content://explore-analyze/workflows/triggers/scheduled-triggers.md
-                title: Scheduled triggers
-              - page: docs-content://explore-analyze/workflows/triggers/alert-triggers.md
-                title: Alert triggers
-            - group: Steps
-              page: docs-content://explore-analyze/workflows/steps.md
-              children:
-              - group: Action steps
-                page: docs-content://explore-analyze/workflows/steps/action-steps.md
-                children:
-                - page: docs-content://explore-analyze/workflows/steps/elasticsearch.md
-                  title: Elasticsearch
-                - page: docs-content://explore-analyze/workflows/steps/kibana.md
-                  title: Kibana
-                - page: docs-content://explore-analyze/workflows/steps/external-systems-apps.md
-                  title: External systems and apps
-              - group: Flow control steps
-                page: docs-content://explore-analyze/workflows/steps/flow-control-steps.md
-                children:
-                - page: docs-content://explore-analyze/workflows/steps/if.md
-                  title: If
-                - page: docs-content://explore-analyze/workflows/steps/foreach.md
-                  title: Foreach
-                - page: docs-content://explore-analyze/workflows/steps/wait.md
-                  title: Wait
-              - page: docs-content://explore-analyze/workflows/steps/ai-steps.md
-                title: AI steps
-          - group: Data and error handling
-            page: docs-content://explore-analyze/workflows/data.md
-            children:
-            - page: docs-content://explore-analyze/workflows/data/templating.md
-              title: Templating engine
-          - page: docs-content://explore-analyze/workflows/author-workflows.md
-            title: Author workflows
-          - page: docs-content://explore-analyze/workflows/monitor-troubleshoot.md
-            title: Monitor and troubleshoot workflows
-          - page: docs-content://explore-analyze/workflows/manage-workflows.md
-            title: Manage workflows
-          - page: docs-content://explore-analyze/workflows/templates.md
-            title: Workflow templates
         - group: Alerting
           page: docs-content://explore-analyze/alerting.md
           children:
@@ -710,6 +655,63 @@ nav:
             title: Configure settings
           - page: docs-content://explore-analyze/cases/cases-as-data.md
             title: Cases as data
+    - label: Automate
+      children:
+      - group: Workflows
+        page: docs-content://explore-analyze/workflows.md
+        children:
+        - page: docs-content://explore-analyze/workflows/setup.md
+          title: Set up workflows
+        - page: docs-content://explore-analyze/workflows/get-started.md
+          title: Get started with workflows
+        - group: Core components
+          page: docs-content://explore-analyze/workflows/core-components.md
+          children:
+          - group: Triggers
+            page: docs-content://explore-analyze/workflows/triggers.md
+            children:
+            - page: docs-content://explore-analyze/workflows/triggers/manual-triggers.md
+              title: Manual triggers
+            - page: docs-content://explore-analyze/workflows/triggers/scheduled-triggers.md
+              title: Scheduled triggers
+            - page: docs-content://explore-analyze/workflows/triggers/alert-triggers.md
+              title: Alert triggers
+          - group: Steps
+            page: docs-content://explore-analyze/workflows/steps.md
+            children:
+            - group: Action steps
+              page: docs-content://explore-analyze/workflows/steps/action-steps.md
+              children:
+              - page: docs-content://explore-analyze/workflows/steps/elasticsearch.md
+                title: Elasticsearch
+              - page: docs-content://explore-analyze/workflows/steps/kibana.md
+                title: Kibana
+              - page: docs-content://explore-analyze/workflows/steps/external-systems-apps.md
+                title: External systems and apps
+            - group: Flow control steps
+              page: docs-content://explore-analyze/workflows/steps/flow-control-steps.md
+              children:
+              - page: docs-content://explore-analyze/workflows/steps/if.md
+                title: If
+              - page: docs-content://explore-analyze/workflows/steps/foreach.md
+                title: Foreach
+              - page: docs-content://explore-analyze/workflows/steps/wait.md
+                title: Wait
+            - page: docs-content://explore-analyze/workflows/steps/ai-steps.md
+              title: AI steps
+        - group: Data and error handling
+          page: docs-content://explore-analyze/workflows/data.md
+          children:
+          - page: docs-content://explore-analyze/workflows/data/templating.md
+            title: Templating engine
+        - page: docs-content://explore-analyze/workflows/author-workflows.md
+          title: Author workflows
+        - page: docs-content://explore-analyze/workflows/monitor-troubleshoot.md
+          title: Monitor and troubleshoot workflows
+        - page: docs-content://explore-analyze/workflows/manage-workflows.md
+          title: Manage workflows
+        - page: docs-content://explore-analyze/workflows/templates.md
+          title: Workflow templates
     - label: AI and machine learning
       children:
       - group: Machine Learning and NLP

From afd497769a578fea8a3a5130573f114be120ae26 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 27 Mar 2026 17:47:24 +0100
Subject: [PATCH 034/226] feat(nav-v2): rename section to "Track and respond"

Update group name and page reference to match the renamed
docs-content file (elastic/docs-content#5663).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index b7047f3d7f..a3341fc463 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -496,8 +496,8 @@ nav:
             title: Tags
           - page: docs-content://explore-analyze/find-and-organize/find-apps-and-objects.md
             title: Find apps and objects
-      - group: Share, alert, and automate
-        page: docs-content://explore-analyze/share-alert-and-automate.md
+      - group: Track and respond
+        page: docs-content://explore-analyze/track-and-respond.md
         children:
         - group: Reporting and sharing
           page: docs-content://explore-analyze/report-and-share.md

From defdce191ccd63c3ec304d1bccfbba64562ae20f Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Mon, 30 Mar 2026 14:40:57 +0200
Subject: [PATCH 035/226] feat(nav-v2): sidebar tree, styles, and folder UX

Made-with: Cursor
---
 .../Assets/pages-nav-v2.ts                    | 333 +++++++++++++++---
 .../Assets/styles.css                         | 176 ++++++++-
 .../Navigation/_TocTree.cshtml                |  15 +-
 .../Navigation/_TocTreeNav.cshtml             |   8 +-
 .../Navigation/_TocTreeNavV2.cshtml           | 153 +++++---
 5 files changed, 578 insertions(+), 107 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index d3c4dbabb9..3f0eea576e 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -1,24 +1,197 @@
 import { $$ } from 'select-dom'
 
+const navV2CollapsedStorageKey = 'docs-builder-nav-v2-collapsed-ids'
+
+let navV2FolderLinkToggleBound = false
+let navV2OutsideCollapseBound = false
+
+function readCollapsedFolderIds(): Set<string> {
+	try {
+		const raw = sessionStorage.getItem(navV2CollapsedStorageKey)
+		if (!raw) {
+			return new Set()
+		}
+
+		const parsed = JSON.parse(raw) as unknown
+		if (!Array.isArray(parsed)) {
+			return new Set()
+		}
+
+		return new Set(parsed.filter((x): x is string => typeof x === 'string'))
+	} catch {
+		return new Set()
+	}
+}
+
+function writeCollapsedFolderIds(ids: Set<string>) {
+	sessionStorage.setItem(navV2CollapsedStorageKey, JSON.stringify([...ids]))
+}
+
+function persistFolderCheckboxCollapsedState(cb: HTMLInputElement) {
+	if (!cb.id) {
+		return
+	}
+
+	const ids = readCollapsedFolderIds()
+	if (!cb.checked) {
+		ids.add(cb.id)
+	} else {
+		ids.delete(cb.id)
+	}
+
+	writeCollapsedFolderIds(ids)
+}
+
+function normalizeDocPathname(pathname: string) {
+	const p = pathname.replace(/\/$/, '')
+	return p === '' ? '/' : p
+}
+
+function linkPathMatchesCurrentPage(anchor: HTMLAnchorElement) {
+	const href = anchor.getAttribute('href')
+	if (!href) {
+		return false
+	}
+
+	const linkPath = normalizeDocPathname(new URL(href, window.location.href).pathname)
+	const currentPath = normalizeDocPathname(window.location.pathname)
+	return linkPath === currentPath
+}
+
+/**
+ * Primary click on a folder row link toggles expand/collapse (checkbox) and still follows href.
+ * Skips modified clicks (new tab, etc.). Same-URL clicks use preventDefault so HTMX does not
+ * re-run expandToCurrentPage and undo the collapse. Collapsed folder ids are stored so
+ * expandToCurrentPage can respect user collapse after in-section navigation.
+ */
+function ensureNavV2FolderLinkToggle() {
+	if (navV2FolderLinkToggleBound) {
+		return
+	}
+
+	navV2FolderLinkToggleBound = true
+
+	document.addEventListener(
+		'click',
+		(e: MouseEvent) => {
+			if (!(e.target instanceof Element)) {
+				return
+			}
+
+			if (
+				e.defaultPrevented ||
+				e.button !== 0 ||
+				e.metaKey ||
+				e.ctrlKey ||
+				e.shiftKey ||
+				e.altKey
+			) {
+				return
+			}
+
+			const a = e.target.closest(
+				'[data-nav-v2] li.group-navigation > .nav-folder-peer > a.sidebar-link'
+			) as HTMLAnchorElement | null
+
+			if (!a) {
+				return
+			}
+
+			const peer = a.parentElement
+			const cb = peer?.querySelector<HTMLInputElement>(':scope > input[type="checkbox"]')
+
+			if (!cb) {
+				return
+			}
+
+			cb.checked = !cb.checked
+			cb.dispatchEvent(new Event('change', { bubbles: true }))
+			persistFolderCheckboxCollapsedState(cb)
+
+			// Same URL: never navigate so expand/collapse toggles reliably (second click closes).
+			if (linkPathMatchesCurrentPage(a)) {
+				e.preventDefault()
+				e.stopPropagation()
+			}
+		},
+		true
+	)
+}
+
+/**
+ * Collapse every expanded folder whose subtree does not contain the click target.
+ * Runs in capture phase after {@link ensureNavV2FolderLinkToggle} so folder rows toggle first.
+ */
+function ensureNavV2CollapseOutsideExpandedFolders() {
+	if (navV2OutsideCollapseBound) {
+		return
+	}
+
+	navV2OutsideCollapseBound = true
+
+	document.addEventListener(
+		'click',
+		(e: MouseEvent) => {
+			if (!(e.target instanceof Node)) {
+				return
+			}
+
+			if (e.button !== 0) {
+				return
+			}
+
+			const nav = document.querySelector<HTMLElement>('[data-nav-v2]')
+			if (!nav) {
+				return
+			}
+
+			// Clicks on top-level section titles should not close nested open folders.
+			if (
+				e.target instanceof Element &&
+				e.target.closest('nav[data-nav-v2] .docs-sidebar-nav-v2__label--top')
+			) {
+				return
+			}
+
+			const target = e.target
+			nav.querySelectorAll<HTMLInputElement>('li.group-navigation input[type="checkbox"]:checked').forEach((cb) => {
+				const li = cb.closest('li.group-navigation')
+				if (!li || li.contains(target)) {
+					return
+				}
+
+				cb.checked = false
+				cb.dispatchEvent(new Event('change', { bubbles: true }))
+				persistFolderCheckboxCollapsedState(cb)
+			})
+		},
+		true
+	)
+}
+
 /**
  * Returns all sibling top-level accordion checkboxes for a given checkbox.
  * Siblings are other checkboxes inside [data-v2-accordion] elements at the
  * same nesting level as the given checkbox's ancestor accordion.
  */
 function getSiblingAccordionCheckboxes(
-    checkbox: HTMLInputElement
+	checkbox: HTMLInputElement
 ): HTMLInputElement[] {
-    const accordion = checkbox.closest('[data-v2-accordion]')
-    if (!accordion) return []
+	const accordion = checkbox.closest('[data-v2-accordion]')
+	if (!accordion) {
+		return []
+	}
 
-    const parent = accordion.parentElement
-    if (!parent) return []
+	const parent = accordion.parentElement
+	if (!parent) {
+		return []
+	}
 
-    return Array.from(
-        parent.querySelectorAll<HTMLInputElement>(
-            '[data-v2-accordion] > .peer input[type=checkbox]'
-        )
-    ).filter((cb) => cb !== checkbox)
+	return Array.from(
+		parent.querySelectorAll<HTMLInputElement>(
+			'[data-v2-accordion] > .peer input[type=checkbox]'
+		)
+	).filter((c) => c !== checkbox)
 }
 
 /**
@@ -26,54 +199,116 @@ function getSiblingAccordionCheckboxes(
  * collapse all its siblings so only one section is expanded at a time.
  */
 function initAccordion(nav: HTMLElement) {
-    nav.querySelectorAll<HTMLInputElement>(
-        '[data-v2-accordion] > .peer input[type=checkbox]'
-    ).forEach((cb) => {
-        cb.addEventListener('change', (e) => {
-            const target = e.target as HTMLInputElement
-            if (target.checked) {
-                getSiblingAccordionCheckboxes(target).forEach((sibling) => {
-                    sibling.checked = false
-                })
-            }
-        })
-    })
+	nav.querySelectorAll<HTMLInputElement>(
+		'[data-v2-accordion] > .peer input[type=checkbox]'
+	).forEach((cb) => {
+		cb.addEventListener('change', (e) => {
+			const target = e.target as HTMLInputElement
+			if (target.checked) {
+				getSiblingAccordionCheckboxes(target).forEach((sibling) => {
+					sibling.checked = false
+				})
+			}
+		})
+	})
+}
+
+function clearActiveSubtreeHighlight(nav: HTMLElement) {
+	nav.querySelectorAll('.nav-v2-active-subtree, .nav-v2-active-leaf').forEach((el) => {
+		el.classList.remove('nav-v2-active-subtree', 'nav-v2-active-leaf')
+	})
+}
+
+/**
+ * Apply #F1F6FF background per design: folder index → whole folder + visible children;
+ * nested folder index → that folder + its children only; leaf → that row only.
+ */
+function applyActiveSubtreeHighlight(nav: HTMLElement) {
+	clearActiveSubtreeHighlight(nav)
+	const current = nav.querySelector<HTMLAnchorElement>('a.sidebar-link.current')
+	if (!current || !nav.contains(current)) {
+		return
+	}
+
+	const hostLi = current.closest('li')
+	if (!hostLi || !nav.contains(hostLi)) {
+		return
+	}
+
+	const folderRowLink = hostLi.querySelector<HTMLAnchorElement>(
+		':scope > .nav-folder-peer > a.sidebar-link'
+	)
+	const childUl = hostLi.querySelector(':scope > ul')
+
+	if (
+		hostLi.classList.contains('group-navigation') &&
+		folderRowLink &&
+		folderRowLink === current &&
+		childUl
+	) {
+		hostLi.classList.add('nav-v2-active-subtree')
+		return
+	}
+
+	hostLi.classList.add('nav-v2-active-leaf')
 }
 
 /**
  * Mark the current page's nav link with the "current" CSS class.
  */
 function markCurrentPage(nav: HTMLElement) {
-    // Remove stale current markers
-    $$('.current', nav).forEach((el) => el.classList.remove('current'))
+	// Remove stale current markers
+	$$('.current', nav).forEach((el) => el.classList.remove('current'))
 
-    const pathname = window.location.pathname.replace(/\/$/, '')
-    $$(`a[href="${pathname}"], a[href="${pathname}/"]`, nav).forEach((el) =>
-        el.classList.add('current')
-    )
+	const pathname = window.location.pathname.replace(/\/$/, '')
+	$$(`a[href="${pathname}"], a[href="${pathname}/"]`, nav).forEach((el) =>
+		el.classList.add('current')
+	)
 }
 
 /**
  * Expand all ancestor collapsible sections that contain the current page link,
  * so that navigating directly to a URL reveals its location in the sidebar.
+ * Does not re-open a folder row that the user collapsed while that folder index
+ * is the current page (see session storage + folder row link match).
  */
 function expandToCurrentPage(nav: HTMLElement) {
-    const pathname = window.location.pathname.replace(/\/$/, '')
-    const link = nav.querySelector<HTMLElement>(
-        `a[href="${pathname}"], a[href="${pathname}/"]`
-    )
-    if (!link) return
-
-    let el: Element | null = link.parentElement
-    while (el && el !== nav) {
-        if (el.matches('li')) {
-            const cb = el.querySelector<HTMLInputElement>(
-                ':scope > .peer input[type=checkbox]'
-            )
-            if (cb) cb.checked = true
-        }
-        el = el.parentElement
-    }
+	const pathname = window.location.pathname.replace(/\/$/, '')
+	const link = nav.querySelector<HTMLElement>(
+		`a[href="${pathname}"], a[href="${pathname}/"]`
+	)
+	if (!link) {
+		return
+	}
+
+	const collapsedIds = readCollapsedFolderIds()
+
+	let el: Element | null = link.parentElement
+	while (el && el !== nav) {
+		if (el.matches('li')) {
+			const cb = el.querySelector<HTMLInputElement>(':scope > .peer input[type=checkbox]')
+			if (cb && cb.id) {
+				const rowLink = el.querySelector<HTMLElement>(
+					':scope > .nav-folder-peer > a.sidebar-link'
+				)
+				const currentIsThisFolderRow = rowLink !== null && rowLink === link
+
+				if (collapsedIds.has(cb.id)) {
+					if (!currentIsThisFolderRow) {
+						collapsedIds.delete(cb.id)
+						writeCollapsedFolderIds(collapsedIds)
+						cb.checked = true
+					}
+				} else {
+					cb.checked = true
+				}
+			} else if (cb) {
+				cb.checked = true
+			}
+		}
+
+		el = el.parentElement
+	}
 }
 
 /**
@@ -81,7 +316,11 @@ function expandToCurrentPage(nav: HTMLElement) {
  * Call this on every htmx:load when [data-nav-v2] is present.
  */
 export function initNavV2(nav: HTMLElement) {
-    initAccordion(nav)
-    markCurrentPage(nav)
-    expandToCurrentPage(nav)
+	initAccordion(nav)
+	markCurrentPage(nav)
+	expandToCurrentPage(nav)
+	applyActiveSubtreeHighlight(nav)
 }
+
+ensureNavV2FolderLinkToggle()
+ensureNavV2CollapseOutsideExpandedFolders()
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 40eeccd25e..922f2c5e30 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -109,7 +109,20 @@ body {
 	}
 
 	.sidebar {
-		.sidebar-nav {
+		/* Pages nav: column layout; scroll lives in .pages-nav-menu (see _TocTree.cshtml). */
+		#pages-nav.sidebar-nav {
+			@apply sticky top-(--offset-top);
+			display: flex;
+			flex-direction: column;
+			min-height: 0;
+			max-height: calc(100vh - var(--offset-top));
+			overflow: hidden;
+			transition:
+				top 0.3s ease,
+				max-height 0.3s ease;
+		}
+
+		.sidebar-nav:not(#pages-nav) {
 			@apply sticky top-(--offset-top) overflow-y-auto;
 			max-height: calc(100vh - var(--offset-top));
 			scrollbar-gutter: stable;
@@ -118,12 +131,171 @@ body {
 				max-height 0.3s ease;
 		}
 
+		/* Shared by V1 and V2. V2-only rules: nest under .docs-sidebar-nav-v2 (see _TocTree.cshtml). */
 		.sidebar-link {
-			@apply text-ink-light inline-block leading-[1.2em] text-pretty hover:text-black md:text-sm;
+			@apply text-ink-light inline-block text-[14px] leading-[20px] text-pretty hover:text-black;
 			word-break: break-word;
 		}
 	}
+}
+
+/* Assembler nav V2: layout chrome (sidebar width). Border: default from aside (border-r-grey-20). */
+@media (width >= 768px) {
+	body:has([data-nav-v2]) div.min-h-screen.grid {
+		grid-template-columns: minmax(0, 280px) 1fr;
+	}
+
+	body:has([data-nav-v2]) div.grid.w-full.h-full:has(> aside.sidebar:first-child) {
+		grid-template-columns: minmax(0, 280px) 1fr;
+	}
+}
+
+body:has([data-nav-v2]) aside.sidebar {
+	max-width: 280px;
+}
+
+.sidebar #pages-nav .pages-nav-menu {
+	scrollbar-gutter: stable;
+	padding-right: 16px;
+}
+
+/* Nav V2: stack list items vertically */
+#pages-nav nav[data-nav-v2] ul {
+	display: flex;
+	flex-direction: column;
+	list-style: none;
+}
+
+/* Folder child lists: hidden when checkbox unchecked (fixes conflict: global ul{display:flex} beat Tailwind .hidden) */
+#pages-nav nav[data-nav-v2] li.group-navigation > ul.docs-sidebar-nav-v2__folder-children {
+	display: none;
+	flex-direction: column;
+	list-style: none;
+}
+
+#pages-nav
+	nav[data-nav-v2]
+	li.group-navigation:has(.nav-folder-peer input[type='checkbox']:checked)
+	> ul.docs-sidebar-nav-v2__folder-children {
+	display: flex;
+}
+
+/* Nav V2: vertical padding on top-level li under the root ul (not nested folder children). */
+#pages-nav nav[data-nav-v2] ul.docs-sidebar-nav-v2__tree > li {
+	padding-top: 16px;
+	padding-bottom: 16px;
+}
+
+nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label,
+nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--nested {
+	margin: 0;
+}
+
+/* Nav V2: top-level section titles — icon 16×16, 8px gap via gap-2 on flex parent */
+nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--top .docs-sidebar-nav-v2__label-icon {
+	display: block;
+	width: 16px;
+	height: 16px;
+	flex-shrink: 0;
+	color: #111c2c;
+}
+
+/* Nav V2: real nav links #516381 + light; placeholders keep .text-grey-40. Current = regular (400). */
+#pages-nav nav[data-nav-v2] a.sidebar-link {
+	box-sizing: border-box;
+	width: 100%;
+	max-width: 100%;
+	min-width: 0;
+	font-weight: 300;
+	border-radius: 6px;
+	background-color: transparent;
+	transition:
+		color 0s ease,
+		background-color 0s ease,
+		border-color 0s ease,
+		text-decoration-color 0s ease,
+		fill 0s ease,
+		stroke 0s ease;
+}
 
+#pages-nav nav[data-nav-v2] a.sidebar-link:not(.text-grey-40) {
+	color: #516381;
+}
+
+#pages-nav nav[data-nav-v2] a.sidebar-link:not(.text-grey-40):not(.current):hover {
+	color: #1d2a3e;
+	background-color: transparent;
+}
+
+#pages-nav nav[data-nav-v2] a.sidebar-link.text-grey-40 {
+	color: var(--color-grey-40);
+}
+
+#pages-nav nav[data-nav-v2] a.sidebar-link.text-grey-40:not(.current):hover {
+	color: #1d2a3e;
+	background-color: transparent;
+}
+
+#pages-nav nav[data-nav-v2] a.sidebar-link.current {
+	color: #0b64dd !important;
+	font-weight: 400 !important;
+	background-color: #f1f6ff !important;
+}
+
+#pages-nav nav[data-nav-v2] a.sidebar-link.current:hover {
+	color: #0b64dd;
+	background-color: #f1f6ff !important;
+}
+
+/* Nav V2: active section background (#F1F6FF) — subtree vs leaf driven by pages-nav-v2.ts */
+#pages-nav nav[data-nav-v2] li.nav-v2-active-subtree {
+	background-color: #f1f6ff;
+	border-radius: 6px;
+}
+
+#pages-nav nav[data-nav-v2] li.nav-v2-active-leaf {
+	background-color: #f1f6ff;
+	border-radius: 6px;
+}
+
+#pages-nav nav[data-nav-v2] li.nav-v2-active-subtree a.sidebar-link,
+#pages-nav nav[data-nav-v2] li.nav-v2-active-leaf > a.sidebar-link {
+	background-color: transparent;
+}
+
+#pages-nav nav[data-nav-v2] li.nav-v2-active-subtree a.sidebar-link:not(.current):hover {
+	color: #1d2a3e;
+	background-color: transparent !important;
+}
+
+#pages-nav nav[data-nav-v2] li.nav-v2-active-subtree a.sidebar-link.current,
+#pages-nav nav[data-nav-v2] li.nav-v2-active-subtree a.sidebar-link.current:hover {
+	background-color: transparent !important;
+}
+
+#pages-nav nav[data-nav-v2] li.nav-v2-active-leaf > a.sidebar-link:not(.current):hover {
+	color: #1d2a3e;
+	background-color: transparent !important;
+}
+
+#pages-nav nav[data-nav-v2] li.nav-v2-active-leaf > a.sidebar-link.current,
+#pages-nav nav[data-nav-v2] li.nav-v2-active-leaf > a.sidebar-link.current:hover {
+	background-color: transparent !important;
+}
+
+.docs-sidebar-nav-v2 .nav-folder-peer .nav-folder-chevron svg {
+	display: block;
+	width: 12px;
+	height: 12px;
+	transition: transform 0.15s ease;
+	transform: rotate(-90deg);
+}
+
+.docs-sidebar-nav-v2 .nav-folder-peer:has(input[type='checkbox']:checked) .nav-folder-chevron svg {
+	transform: rotate(0deg);
+}
+
+@layer components {
 	.sidebar-trial-card {
 		background: var(--color-green-30);
 		border-radius: 8px;
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
index d1eb8bade6..5739ad37a6 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
@@ -3,11 +3,11 @@
 @using Elastic.Documentation.Navigation
 @inherits RazorSlice<Elastic.Documentation.Site.Navigation.NavigationViewModel>
 
-<div class="pb-9 pl-3 md:pl-0 font-body">
+<div class="flex min-h-0 h-full flex-col pl-3 font-body md:pl-0">
 	@{
 		var currentTopLevelItem = Model.TopLevelItems.FirstOrDefault(i => i.Id == Model.Tree.Id) ?? Model.Tree;
 	} 
-	<div class="sticky top-0 z-10 bg-white">
+	<div class="sticky top-0 z-10 shrink-0 bg-white">
 		@if (Model.BuildType != BuildType.Codex)
 		{
 			<navigation-search></navigation-search>
@@ -20,7 +20,7 @@
 						<button class="w-full text-left grid grid-cols-[1fr_auto] cursor-pointer font-semibold gap-1 hover:text-black pl-4 pr-2 py-2 group-open:border-b-1 border-grey-20">
 							<div>
 								<a
-									class="pages-dropdown_active hover:underline text-blue-elastic hover:text-blue-elastic-100"
+									class="pages-dropdown_active inline-block px-[8px] py-[6px] hover:underline text-blue-elastic hover:text-blue-elastic-100"
 									href="@currentTopLevelItem.Url"
 									@Model.Htmx.GetNavHxAttributes(true)>
 									@currentTopLevelItem.NavigationTitle
@@ -44,7 +44,7 @@
 				{
 								<li class="block">
 									<a
-										class="block py-2 px-4 hover:underline hover:text-black hover:bg-grey-10 active:bg-blue-elastic-70 active:text-white font-semibold @(item.NavigationRoot.Id == Model.Tree.Id ? "text-blue-elastic" : "")"
+										class="block px-[8px] py-[6px] hover:underline hover:text-black hover:bg-grey-10 active:bg-blue-elastic-70 active:text-white font-semibold @(item.NavigationRoot.Id == Model.Tree.Id ? "text-blue-elastic" : "")"
 										href="@item.Url"
 										@Model.Htmx.GetNavHxAttributes(false, "mouseover")>
 							@item.NavigationTitle
@@ -68,10 +68,12 @@
 		</div>
 	</div>
 
+	<div class="pages-nav-menu min-h-0 min-w-0 flex-1 overflow-y-auto">
 	@if (Model.IsNavV2)
 	{
-		<nav data-nav-v2>
-			<ul class="block px-4" id="nav-tree">
+		@* Root for V2-only CSS; JS still uses [data-nav-v2]. Scope overrides: .docs-sidebar-nav-v2 … *@
+		<nav class="docs-sidebar-nav-v2" data-nav-v2>
+			<ul class="docs-sidebar-nav-v2__tree block" id="nav-tree">
 				@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
 				{
 					IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
@@ -98,4 +100,5 @@
 			}))
 		</ul>
 	}
+	</div>
 </div>
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNav.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNav.cshtml
index ae8928c918..c0bacc6c2b 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNav.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNav.cshtml
@@ -23,7 +23,7 @@
 			<a
 				href="@group.Url"
 				@Model.Htmx.GetNavHxAttributes(true)
-				class="sidebar-link group-[.current]/li:text-blue-elastic!"
+				class="sidebar-link px-[8px] py-[6px] group-[.current]/li:text-blue-elastic!"
 			>
 				@group.NavigationTitle
 			</a>
@@ -34,11 +34,11 @@
 		var g = folder;
 		var allHidden = folder.NavigationItems.All(n => n.Hidden);
 		<li class="flex flex-wrap group-navigation @(isTopLevel ? "mt-6" : "mt-4") relative">
-			<div class="peer grid grid-cols-[1fr_auto] w-full">
+			<div class="peer grid w-full grid-cols-[1fr_auto] gap-2">
 				<a
 					href="@(g.Url)"
 					@Model.Htmx.GetNavHxAttributes(true)
-					class="sidebar-link pr-2 content-center @(isTopLevel ? "font-semibold" : "") group-[.current]/li:text-blue-elastic!">
+					class="sidebar-link content-center px-[8px] py-[6px] @(isTopLevel ? "font-semibold" : "") group-[.current]/li:text-blue-elastic!">
 					@(g.NavigationTitle)
 				</a>
 				@if (!allHidden)
@@ -86,7 +86,7 @@
 			<a
 				href="@leaf.Url"
 				@Model.Htmx.GetNavHxAttributes(hasSameTopLevelGroup)
-				class="sidebar-link grow group-[.current]/li:text-blue-elastic!"
+				class="sidebar-link grow px-[8px] py-[6px] group-[.current]/li:text-blue-elastic!"
 			>
 				@leaf.NavigationTitle
 			</a>
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index 4e5444024f..6fc735370f 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -16,10 +16,63 @@
 
 	if (item is LabelNavigationNode label)
 	{
-		<li class="@(isTopLevel ? "mt-4 pt-4 border-t border-grey-20 first:border-t-0 first:pt-0 first:mt-6" : "mt-5") relative">
-			<span class="@(isTopLevel ? "text-xs font-semibold uppercase tracking-widest text-ink" : "text-xs font-semibold uppercase tracking-widest text-ink/65") block py-1 select-none">
-				@label.NavigationTitle
-			</span>
+		var isNestedPlatformSectionLabel = !isTopLevel && (
+			label.NavigationTitle == "Ingest and manage data"
+			|| label.NavigationTitle == "Search, visualize and analyze"
+			|| label.NavigationTitle == "AI and machine learning");
+		<li class="@(isTopLevel ? "border-t border-[#E3E8F2] first:border-t-0 relative" : isNestedPlatformSectionLabel ? "relative mt-[4px]" : "relative")">
+			@if (isTopLevel)
+			{
+				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--top flex items-center gap-2 px-[8px] py-[6px] text-sm leading-5 font-medium text-[#111C2C]">
+					@if (label.NavigationTitle == "Elasticsearch fundamentals")
+					{
+						@* EUI icon: documentation *@
+						<svg class="docs-sidebar-nav-v2__label-icon" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+							<path fill="currentColor" d="M6 16H5v-3h1v3Zm3-8h1v1H7V8h1V7h-.5V6H9v2Zm-.5-4a.5.5 0 1 1 0 1 .5.5 0 0 1 0-1Z"/>
+							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M7 14h5v-2H4a1 1 0 1 0 0 2v1a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h10v11h-1v2h1v1H7v-1ZM4 2a1 1 0 0 0-1 1v8.27A1.99 1.99 0 0 1 4 11V2Zm1 9h8V2H5v9Z"/>
+						</svg>
+					}
+					else if (label.NavigationTitle == "Install, deploy, and administer")
+					{
+						@* EUI icon: cluster *@
+						<svg class="docs-sidebar-nav-v2__label-icon" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M4.5 1a3.5 3.5 0 0 1 3.465 3h3.12a1.5 1.5 0 1 1 0 1h-3.12a3.482 3.482 0 0 1-.662 1.596l2.1 2.1A3.5 3.5 0 1 1 8.036 12h-3.12a1.5 1.5 0 1 1 0-.999h3.12a3.482 3.482 0 0 1 .662-1.596l-2.1-2.1A3.5 3.5 0 1 1 4.5 1Zm0 6a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5ZM12 4.5a.5.5 0 1 0 1 0 .5.5 0 0 0-1 0Zm-.5 9.5a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5ZM4 11.5a.5.5 0 1 1-1 0 .5.5 0 0 1 1 0Z"/>
+						</svg>
+					}
+					else if (label.NavigationTitle == "The Elasticsearch Platform")
+					{
+						@* EUI icon: layers *@
+						<svg class="docs-sidebar-nav-v2__label-icon" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M1.553 4.106a1 1 0 0 0 0 1.788l6 3a1 1 0 0 0 .894 0l6-3a1 1 0 0 0 0-1.788l-6-3a1 1 0 0 0-.894 0l-6 3ZM14 5 8 8 2 5l6-3 6 3Z"/>
+							<path fill="currentColor" d="m8 11 6.894-3.447S15 7.843 15 8a1 1 0 0 1-.553.895l-6 3a1 1 0 0 1-.894 0l-6-3A1 1 0 0 1 1 8c0-.158.106-.447.106-.447L8 11Z"/>
+							<path fill="currentColor" d="m8 14 6.894-3.447s.106.29.106.447a1 1 0 0 1-.553.895l-6 3a1 1 0 0 1-.894 0l-6-3A1 1 0 0 1 1 11c0-.158.106-.447.106-.447L8 14Z"/>
+						</svg>
+					}
+					else if (label.NavigationTitle == "Solutions and project types")
+					{
+						@* EUI icon: folderOpen *@
+						<svg class="docs-sidebar-nav-v2__label-icon" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+							<path fill="currentColor" d="M5.191 2a1 1 0 0 1 .894.553L6.809 4H13a1 1 0 0 1 1 1v1.5h-1V5H6.191l-.138-.276L5.19 3H1v8.751l-.317 1.111a.5.5 0 0 0 .48.638h11.96a.5.5 0 0 0 .48-.362L14 11.75V13a1 1 0 0 1-1 1H1a1 1 0 0 1-.995-.898L0 13V3a1 1 0 0 1 1-1h4.191Z"/>
+							<path fill="currentColor" d="M14.837 6a1 1 0 0 1 .962 1.274l-1.715 6a1 1 0 0 1-.961.726H1.163a1 1 0 0 1-.962-1.274l1.715-6A1 1 0 0 1 2.877 6h11.96ZM1.163 13h11.96l1.714-6H2.877l-1.714 6Z"/>
+						</svg>
+					}
+					else
+					{
+						@* Default: EUI documentation *@
+						<svg class="docs-sidebar-nav-v2__label-icon" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+							<path fill="currentColor" d="M6 16H5v-3h1v3Zm3-8h1v1H7V8h1V7h-.5V6H9v2Zm-.5-4a.5.5 0 1 1 0 1 .5.5 0 0 1 0-1Z"/>
+							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M7 14h5v-2H4a1 1 0 1 0 0 2v1a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h10v11h-1v2h1v1H7v-1ZM4 2a1 1 0 0 0-1 1v8.27A1.99 1.99 0 0 1 4 11V2Zm1 9h8V2H5v9Z"/>
+						</svg>
+					}
+					<span class="min-w-0">@label.NavigationTitle</span>
+				</span>
+			}
+			else
+			{
+				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--nested block px-[8px] py-[6px] text-xs leading-4 font-medium uppercase text-[#5A6D8C]">
+					@label.NavigationTitle
+				</span>
+			}
 			@if (label.NavigationItems.Count > 0)
 			{
 				<ul class="w-full">
@@ -38,11 +91,11 @@
 	}
 	else if (item is PlaceholderNavigationLeaf placeholder)
 	{
-		<li class="flex group/li pr-8 @(isTopLevel ? "font-semibold mt-6" : "mt-4")">
+		<li class="flex group/li">
 			<a
 				href="@placeholder.Url"
 				@Model.Htmx.GetNavHxAttributes(true)
-				class="sidebar-link grow text-grey-40">
+				class="sidebar-link grow px-[8px] py-[6px] text-grey-40">
 				@placeholder.NavigationTitle
 			</a>
 		</li>
@@ -50,39 +103,41 @@
 	else if (item is PlaceholderNavigationNode placeholderGroup)
 	{
 		var allHidden = placeholderGroup.NavigationItems.All(n => n.Hidden);
-		<li class="flex flex-wrap group-navigation @(isTopLevel ? "mt-6" : "mt-4") relative">
-			<div class="peer grid grid-cols-[1fr_auto] w-full">
+		<li class="flex flex-wrap group-navigation relative">
+			<div class="peer nav-folder-peer grid w-full grid-cols-1">
+				@if (!allHidden)
+				{
+					<input
+						id="@placeholderGroup.Id"
+						type="checkbox"
+						class="sr-only pointer-events-none"
+						tabindex="-1"
+						aria-hidden="true">
+				}
 				<a
 					href="@placeholderGroup.Url"
 					@Model.Htmx.GetNavHxAttributes(true)
-					class="sidebar-link pr-2 content-center @(isTopLevel ? "font-semibold" : "") text-grey-40">
-					@placeholderGroup.NavigationTitle
-				</a>
-				@if (!allHidden)
-				{
-					<label for="@placeholderGroup.Id" class="group/label flex mr-2 items-start">
-						<div class="hover:bg-grey-20 rounded-sm p-1 cursor-pointer">
+					class="sidebar-link flex w-full items-center gap-2 px-[8px] py-[6px] text-grey-40">
+					<span class="min-w-0 flex-1">@placeholderGroup.NavigationTitle</span>
+					@if (!allHidden)
+					{
+						<span class="nav-folder-chevron shrink-0" aria-hidden="true">
 							<svg
 								xmlns="http://www.w3.org/2000/svg"
 								fill="none"
 								viewBox="0 0 24 24"
 								stroke-width="1.5"
 								stroke="currentColor"
-								class="shrink-0 -rotate-90 group-has-checked/label:rotate-0 w-3.5">
+								>
 								<path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/>
 							</svg>
-						</div>
-						<input
-							id="@placeholderGroup.Id"
-							type="checkbox"
-							class="hidden"
-							aria-hidden="true">
-					</label>
-				}
+						</span>
+					}
+				</a>
 			</div>
 			@if (placeholderGroup.NavigationItems.Count > 0)
 			{
-				<ul class="w-full hidden peer-has-checked:block ml-4 relative before:content-[''] before:absolute before:-left-[calc(var(--spacing)*4-1px)] before:top-0 before:bottom-0 before:w-px before:bg-grey-20 before:peer-has-checked:block">
+				<ul class="docs-sidebar-nav-v2__folder-children w-full relative pl-3">
 					@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
 					{
 						IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
@@ -98,11 +153,11 @@
 	}
 	else if (item is INodeNavigationItem<INavigationModel, INavigationItem> { NavigationItems.Count: 0 } group)
 	{
-		<li class="flex group/li pr-8 @(isTopLevel ? "font-semibold mt-6" : "mt-4")">
+		<li class="flex group/li">
 			<a
 				href="@group.Url"
 				@Model.Htmx.GetNavHxAttributes(true)
-				class="sidebar-link group-[.current]/li:text-blue-elastic!"
+				class="sidebar-link px-[8px] py-[6px]"
 			>
 				@group.NavigationTitle
 			</a>
@@ -111,39 +166,41 @@
 	else if (item is INodeNavigationItem<INavigationModel, INavigationItem> folder)
 	{
 		var allHidden = folder.NavigationItems.All(n => n.Hidden);
-		<li class="flex flex-wrap group-navigation @(isTopLevel ? "mt-6" : "mt-4") relative">
-			<div class="peer grid grid-cols-[1fr_auto] w-full">
+		<li class="flex flex-wrap group-navigation relative">
+			<div class="peer nav-folder-peer grid w-full grid-cols-1">
+				@if (!allHidden)
+				{
+					<input
+						id="@folder.Id"
+						type="checkbox"
+						class="sr-only pointer-events-none"
+						tabindex="-1"
+						aria-hidden="true">
+				}
 				<a
 					href="@(folder.Url)"
 					@Model.Htmx.GetNavHxAttributes(true)
-					class="sidebar-link pr-2 content-center @(isTopLevel ? "font-semibold" : "") group-[.current]/li:text-blue-elastic!">
-					@(folder.NavigationTitle)
-				</a>
-				@if (!allHidden)
-				{
-					<label for="@folder.Id" class="group/label flex mr-2 items-start">
-						<div class="hover:bg-grey-20 rounded-sm p-1 cursor-pointer">
+					class="sidebar-link flex w-full items-center gap-2 px-[8px] py-[6px]">
+					<span class="min-w-0 flex-1">@(folder.NavigationTitle)</span>
+					@if (!allHidden)
+					{
+						<span class="nav-folder-chevron shrink-0" aria-hidden="true">
 							<svg
 								xmlns="http://www.w3.org/2000/svg"
 								fill="none"
 								viewBox="0 0 24 24"
 								stroke-width="1.5"
 								stroke="currentColor"
-								class="shrink-0 -rotate-90 group-has-checked/label:rotate-0 w-3.5">
+								>
 								<path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/>
 							</svg>
-						</div>
-						<input
-							id="@folder.Id"
-							type="checkbox"
-							class="hidden"
-							aria-hidden="true">
-					</label>
-				}
+						</span>
+					}
+				</a>
 			</div>
 			@if (folder.NavigationItems.Count > 0)
 			{
-				<ul class="w-full hidden peer-has-checked:block ml-4 relative before:content-[''] before:absolute before:-left-[calc(var(--spacing)*4-1px)] before:top-0 before:bottom-0 before:w-px before:bg-grey-20 before:peer-has-checked:block peer-has-[.current]:before:bg-grey-40 has-[.current]:before:bg-grey-40">
+				<ul class="docs-sidebar-nav-v2__folder-children w-full relative pl-3">
 					@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
 					{
 						IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
@@ -159,11 +216,11 @@
 	}
 	else if (item is ILeafNavigationItem<INavigationModel> leaf)
 	{
-		<li class="flex group/li pr-8 @(isTopLevel ? "font-semibold mt-6" : "mt-4")">
+		<li class="flex group/li">
 			<a
 				href="@leaf.Url"
 				@Model.Htmx.GetNavHxAttributes(true)
-				class="sidebar-link grow group-[.current]/li:text-blue-elastic!"
+				class="sidebar-link grow px-[8px] py-[6px]"
 			>
 				@leaf.NavigationTitle
 			</a>

From 3aa6eee9101d8126b874722bb7bd12383601c3b5 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Mon, 30 Mar 2026 14:41:01 +0200
Subject: [PATCH 036/226] feat(nav-search): polish in-sidebar jump-to-page
 component

Made-with: Cursor
---
 .../NavigationSearchComponent.tsx             | 15 +++-----
 .../NavigationSearch/SearchInput.tsx          | 35 +++++++++++++------
 .../NavigationSearch/SearchResultsList.tsx    |  4 +--
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
index f23e3dc3e4..971e03d099 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
@@ -2,7 +2,7 @@ import { config } from '../../config'
 import '../../eui-icons-cache'
 import { sharedQueryClient } from '../shared/queryClient'
 import { NavigationSearch } from './NavigationSearch'
-import { EuiHorizontalRule, EuiProvider, useEuiTheme } from '@elastic/eui'
+import { EuiProvider } from '@elastic/eui'
 import { css } from '@emotion/react'
 import r2wc from '@r2wc/react-to-web-component'
 import { QueryClientProvider, useQuery } from '@tanstack/react-query'
@@ -13,7 +13,6 @@ interface NavigationSearchProps {
 }
 
 const NavigationSearchInner = ({ placeholder }: NavigationSearchProps) => {
-    const { euiTheme } = useEuiTheme()
     const { data: isApiAvailable } = useQuery({
         queryKey: ['api-health'],
         queryFn: async () => {
@@ -35,17 +34,13 @@ const NavigationSearchInner = ({ placeholder }: NavigationSearchProps) => {
         <div
             className="sticky top-0"
             css={css`
-                padding-top: ${euiTheme.size.base};
-                padding-right: ${euiTheme.size.base};
+                padding-top: 24px;
+                padding-right: 24px;
+                padding-bottom: 24px;
+                border-bottom: 1px solid var(--color-grey-20, #e5e9f0);
             `}
         >
             <NavigationSearch placeholder={placeholder} />
-            <EuiHorizontalRule
-                margin="none"
-                css={css`
-                    margin-top: ${euiTheme.size.base};
-                `}
-            />
         </div>
     )
 }
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchInput.tsx b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchInput.tsx
index 607d30d988..de2a6c4699 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchInput.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchInput.tsx
@@ -11,9 +11,10 @@ const useIsMac = () => {
     }, [])
 }
 
-const CustomSearchIcon = () => {
-    const { euiTheme } = useEuiTheme()
+const navSearchMuted = '#cad3e2'
+const navSearchBorder = '#e3e8f2'
 
+const CustomSearchIcon = () => {
     return (
         <svg
             width="16"
@@ -22,7 +23,7 @@ const CustomSearchIcon = () => {
             fill="none"
             xmlns="http://www.w3.org/2000/svg"
             css={css`
-                color: ${euiTheme.colors.textDisabled};
+                color: ${navSearchMuted};
                 flex-shrink: 0;
             `}
         >
@@ -80,7 +81,14 @@ export const SearchInput = ({
                 `}
             >
                 {isLoading ? (
-                    <EuiLoadingSpinner size="m" />
+                    <span
+                        css={css`
+                            display: flex;
+                            color: ${navSearchMuted};
+                        `}
+                    >
+                        <EuiLoadingSpinner size="m" />
+                    </span>
                 ) : (
                     <CustomSearchIcon />
                 )}
@@ -110,20 +118,27 @@ export const SearchInput = ({
                         ${euiTheme.size.m} + ${isMac ? '2ch' : '4ch'} +
                             ${euiTheme.size.m}
                     );
-                    border: 1px solid ${euiTheme.colors.borderBasePlain};
+                    border: 1px solid ${navSearchBorder};
                     border-radius: ${euiTheme.border.radius.medium};
-                    background: ${euiTheme.colors.backgroundBaseSubdued};
+                    background: #ffffff;
                     font-size: ${euiTheme.font.scale.s * euiTheme.base}px;
                     line-height: ${euiTheme.base * 1.25}px;
                     color: ${euiTheme.colors.textParagraph};
                     outline: none;
+                    box-shadow: none;
 
                     &::placeholder {
-                        color: ${euiTheme.colors.textDisabled};
+                        color: ${navSearchMuted};
+                    }
+
+                    &:focus:not(:focus-visible) {
+                        border-color: ${navSearchBorder};
                     }
 
-                    &:focus {
-                        border-color: ${euiTheme.colors.primary};
+                    &:focus-visible {
+                        border: 1px solid ${navSearchMuted};
+                        outline: none;
+                        box-shadow: none;
                     }
                 `}
             />
@@ -135,7 +150,7 @@ export const SearchInput = ({
                     display: inline-flex;
                     align-items: center;
                     pointer-events: none;
-                    color: ${euiTheme.colors.textDisabled};
+                    color: ${navSearchMuted};
                     font-size: ${euiTheme.font.scale.s * euiTheme.base}px;
                     line-height: ${euiTheme.base * 1.25}px;
                 `}
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchResultsList.tsx b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchResultsList.tsx
index 4424e58b04..c6e2a06393 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchResultsList.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchResultsList.tsx
@@ -176,8 +176,8 @@ const SearchResultRow = ({
                 display: flex;
                 align-items: center;
                 gap: ${euiTheme.size.s};
-                padding-inline: ${euiTheme.size.l};
-                padding-block: ${euiTheme.size.base};
+                padding-inline: 8px;
+                padding-block: 6px;
                 text-decoration: none;
                 cursor: pointer;
                 border-bottom: 1px solid ${euiTheme.colors.borderBaseSubdued};

From e60bd4be074c727fc5f4afbf04d773a7ad6e3e39 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Mon, 30 Mar 2026 14:41:04 +0200
Subject: [PATCH 037/226] style(toc): align in-page and API TOC link padding
 with sidebar

Made-with: Cursor
---
 src/Elastic.ApiExplorer/Layout/_ApiToc.cshtml       |  4 ++--
 src/Elastic.Markdown/Layout/_TableOfContents.cshtml | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Elastic.ApiExplorer/Layout/_ApiToc.cshtml b/src/Elastic.ApiExplorer/Layout/_ApiToc.cshtml
index 3f6aa6e7fb..781a7eb9c2 100644
--- a/src/Elastic.ApiExplorer/Layout/_ApiToc.cshtml
+++ b/src/Elastic.ApiExplorer/Layout/_ApiToc.cshtml
@@ -11,8 +11,8 @@
 						<ul class="block w-full">
 							@foreach (var item in Model)
 							{
-								<li class="has-[:hover]:border-l-grey-80 items-center px-4 border-l-1 border-l-grey-20 has-[.current]:border-l-blue-elastic!">
-									<a class="sidebar-link inline-block my-1.5 @(item.Level == 3 ? "ml-4" : string.Empty)"
+								<li class="has-[:hover]:border-l-grey-80 items-center border-l-1 border-l-grey-20 has-[.current]:border-l-blue-elastic!">
+									<a class="sidebar-link inline-block px-[8px] py-[6px] @(item.Level == 3 ? "ml-4" : string.Empty)"
 									   href="#@item.Slug">
 										@item.Heading
 									</a>
diff --git a/src/Elastic.Markdown/Layout/_TableOfContents.cshtml b/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
index e21a1add27..449bac302d 100644
--- a/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
+++ b/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
@@ -30,7 +30,7 @@
 		
 		<ul class="mt-4 hidden md:flex items-center lg:block gap-4">
 			<li class="view-as-markdown hidden lg:block lg:not-first:mt-1">
-				<a href="@Model.MarkdownUrl" class="link text-sm" target="_blank">
+				<a href="@Model.MarkdownUrl" class="link px-[8px] py-[6px] text-sm" target="_blank">
 					<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 -1 24 24">
 						<path fill="currentColor" d="M22.131725 19.247H1.9386225C1.0239525 19.247 0.25 18.47305 0.25 17.558375v-11.11675c0 -0.914675 0.7739525 -1.688625 1.6886225 -1.688625H22.061375c0.914675 0 1.688625 0.77395 1.688625 1.688625v11.11675c0 0.914675 -0.7036 1.688625 -1.618275 1.688625ZM1.9386225 5.87875c-0.2814375 0 -0.562875 0.281425 -0.562875 0.562875v11.11675c0 0.3518 0.2814375 0.562875 0.562875 0.562875H22.061375c0.3518 0 0.562875 -0.281425 0.562875 -0.562875v-11.11675c0 -0.3518 -0.281425 -0.562875 -0.562875 -0.562875l-20.1227525 0ZM3.62725 15.86975V8.130225h2.2515l2.2515 2.814375 2.251475 -2.814375h2.2515V15.86975h-2.2515V11.437125L8.13025 14.2515l-2.2515 -2.814375V15.86975h-2.2515Zm14.1422 0L14.392225 12.140725h2.251475v-4.0105h2.2515v3.940125h2.2515L17.76945 15.86975Z" stroke-width="0.25"></path>
 					</svg>
@@ -40,7 +40,7 @@
 			@if (Model.BuildType != BuildType.Codex)
 			{
 				<li class="report-an-issue lg:not-first:mt-1">
-					<a href="@Model.ReportIssueUrl" class="link text-sm" target="_blank">
+					<a href="@Model.ReportIssueUrl" class="link px-[8px] py-[6px] text-sm" target="_blank">
 						<svg class="link-icon" viewBox="0 0 98 96" xmlns="http://www.w3.org/2000/svg">
 							<path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="currentColor"/>
 						</svg>
@@ -51,7 +51,7 @@
 			@if (!string.IsNullOrEmpty(Model.GithubEditUrl))
 			{
 				<li class="edit-this-page lg:not-first:mt-1 @(Model.HideEditThisPage ? "hidden" : string.Empty)">
-					<a href="@Model.GithubEditUrl" class="link text-sm" target="_blank">
+					<a href="@Model.GithubEditUrl" class="link px-[8px] py-[6px] text-sm" target="_blank">
 						<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
 							<path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125"/>
 						</svg>
@@ -62,7 +62,7 @@
 			@if (Model.BuildType != BuildType.Codex)
 			{
 				<li class="learn-how-to-contribute hidden lg:block lg:not-first:mt-1">
-					<a href="https://www.elastic.co/docs/contribute-docs/" class="link text-sm" target="_blank">
+					<a href="https://www.elastic.co/docs/contribute-docs/" class="link px-[8px] py-[6px] text-sm" target="_blank">
 						<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
 							<path fill="currentColor" d="M8.8,0 C9.074,0 9.337,0.113 9.526,0.312 L12.726,3.74 C12.902,3.926 13,4.173 13,4.429 L13,13 C13,13.552 12.552,14 12,14 L2,14 C1.448,14 1,13.552 1,13 L1,1 C1,0.448 1.448,0 2,0 L8.8,0 Z M12,5 L8.5,5 C8.224,5 8,4.776 8,4.5 L8,1 L2,1 L2,13 L12,13 L12,5 Z M4.5,11 C4.22385763,11 4,10.7761424 4,10.5 C4,10.2238576 4.22385763,10 4.5,10 L9.5,10 C9.7761424,10 10,10.2238576 10,10.5 C10,10.7761424 9.7761424,11 9.5,11 L4.5,11 Z M4.5,8 C4.22385763,8 4,7.77614237 4,7.5 C4,7.22385763 4.22385763,7 4.5,7 L9.5,7 C9.7761424,7 10,7.22385763 10,7.5 C10,7.77614237 9.7761424,8 9.5,8 L4.5,8 Z M5.5,16 C5.22385763,16 5,15.7761424 5,15.5 C5,15.2238576 5.22385763,15 5.5,15 L14,15 L14,6.5 C14,6.22385763 14.2238576,6 14.5,6 C14.7761424,6 15,6.22385763 15,6.5 L15,15 C15,15.5522847 14.5522847,16 14,16 L5.5,16 Z"/>
 						</svg>
@@ -107,9 +107,9 @@
 						<ul class="block w-full">
 							@foreach (var item in Model.PageTocItems)
 							{
-								<li class="has-[:hover]:border-l-grey-80 items-center px-4 border-l-1 border-l-grey-20 has-[.current]:border-l-blue-elastic!">
+								<li class="has-[:hover]:border-l-grey-80 items-center border-l-1 border-l-grey-20 has-[.current]:border-l-blue-elastic!">
 									<a
-										class="sidebar-link inline-block my-1.5 @(item.Level == 3 ? "ml-4" : string.Empty)"
+										class="sidebar-link inline-block px-[8px] py-[6px] @(item.Level == 3 ? "ml-4" : string.Empty)"
 										href="#@item.Slug">
 										@item.Heading
 									</a>

From 1f3f7020adce7a9115d4b18abd4a24fbcfaa6e7e Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 30 Mar 2026 16:08:51 +0200
Subject: [PATCH 038/226] style: fix Prettier formatting in pages-nav-v2.ts and
 styles.css

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../Assets/pages-nav-v2.ts                    | 489 +++++++++---------
 .../Assets/styles.css                         |  41 +-
 2 files changed, 284 insertions(+), 246 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 3f0eea576e..07ba2aeb9f 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -6,56 +6,58 @@ let navV2FolderLinkToggleBound = false
 let navV2OutsideCollapseBound = false
 
 function readCollapsedFolderIds(): Set<string> {
-	try {
-		const raw = sessionStorage.getItem(navV2CollapsedStorageKey)
-		if (!raw) {
-			return new Set()
-		}
-
-		const parsed = JSON.parse(raw) as unknown
-		if (!Array.isArray(parsed)) {
-			return new Set()
-		}
-
-		return new Set(parsed.filter((x): x is string => typeof x === 'string'))
-	} catch {
-		return new Set()
-	}
+    try {
+        const raw = sessionStorage.getItem(navV2CollapsedStorageKey)
+        if (!raw) {
+            return new Set()
+        }
+
+        const parsed = JSON.parse(raw) as unknown
+        if (!Array.isArray(parsed)) {
+            return new Set()
+        }
+
+        return new Set(parsed.filter((x): x is string => typeof x === 'string'))
+    } catch {
+        return new Set()
+    }
 }
 
 function writeCollapsedFolderIds(ids: Set<string>) {
-	sessionStorage.setItem(navV2CollapsedStorageKey, JSON.stringify([...ids]))
+    sessionStorage.setItem(navV2CollapsedStorageKey, JSON.stringify([...ids]))
 }
 
 function persistFolderCheckboxCollapsedState(cb: HTMLInputElement) {
-	if (!cb.id) {
-		return
-	}
-
-	const ids = readCollapsedFolderIds()
-	if (!cb.checked) {
-		ids.add(cb.id)
-	} else {
-		ids.delete(cb.id)
-	}
-
-	writeCollapsedFolderIds(ids)
+    if (!cb.id) {
+        return
+    }
+
+    const ids = readCollapsedFolderIds()
+    if (!cb.checked) {
+        ids.add(cb.id)
+    } else {
+        ids.delete(cb.id)
+    }
+
+    writeCollapsedFolderIds(ids)
 }
 
 function normalizeDocPathname(pathname: string) {
-	const p = pathname.replace(/\/$/, '')
-	return p === '' ? '/' : p
+    const p = pathname.replace(/\/$/, '')
+    return p === '' ? '/' : p
 }
 
 function linkPathMatchesCurrentPage(anchor: HTMLAnchorElement) {
-	const href = anchor.getAttribute('href')
-	if (!href) {
-		return false
-	}
-
-	const linkPath = normalizeDocPathname(new URL(href, window.location.href).pathname)
-	const currentPath = normalizeDocPathname(window.location.pathname)
-	return linkPath === currentPath
+    const href = anchor.getAttribute('href')
+    if (!href) {
+        return false
+    }
+
+    const linkPath = normalizeDocPathname(
+        new URL(href, window.location.href).pathname
+    )
+    const currentPath = normalizeDocPathname(window.location.pathname)
+    return linkPath === currentPath
 }
 
 /**
@@ -65,57 +67,59 @@ function linkPathMatchesCurrentPage(anchor: HTMLAnchorElement) {
  * expandToCurrentPage can respect user collapse after in-section navigation.
  */
 function ensureNavV2FolderLinkToggle() {
-	if (navV2FolderLinkToggleBound) {
-		return
-	}
-
-	navV2FolderLinkToggleBound = true
-
-	document.addEventListener(
-		'click',
-		(e: MouseEvent) => {
-			if (!(e.target instanceof Element)) {
-				return
-			}
-
-			if (
-				e.defaultPrevented ||
-				e.button !== 0 ||
-				e.metaKey ||
-				e.ctrlKey ||
-				e.shiftKey ||
-				e.altKey
-			) {
-				return
-			}
-
-			const a = e.target.closest(
-				'[data-nav-v2] li.group-navigation > .nav-folder-peer > a.sidebar-link'
-			) as HTMLAnchorElement | null
-
-			if (!a) {
-				return
-			}
-
-			const peer = a.parentElement
-			const cb = peer?.querySelector<HTMLInputElement>(':scope > input[type="checkbox"]')
-
-			if (!cb) {
-				return
-			}
-
-			cb.checked = !cb.checked
-			cb.dispatchEvent(new Event('change', { bubbles: true }))
-			persistFolderCheckboxCollapsedState(cb)
-
-			// Same URL: never navigate so expand/collapse toggles reliably (second click closes).
-			if (linkPathMatchesCurrentPage(a)) {
-				e.preventDefault()
-				e.stopPropagation()
-			}
-		},
-		true
-	)
+    if (navV2FolderLinkToggleBound) {
+        return
+    }
+
+    navV2FolderLinkToggleBound = true
+
+    document.addEventListener(
+        'click',
+        (e: MouseEvent) => {
+            if (!(e.target instanceof Element)) {
+                return
+            }
+
+            if (
+                e.defaultPrevented ||
+                e.button !== 0 ||
+                e.metaKey ||
+                e.ctrlKey ||
+                e.shiftKey ||
+                e.altKey
+            ) {
+                return
+            }
+
+            const a = e.target.closest(
+                '[data-nav-v2] li.group-navigation > .nav-folder-peer > a.sidebar-link'
+            ) as HTMLAnchorElement | null
+
+            if (!a) {
+                return
+            }
+
+            const peer = a.parentElement
+            const cb = peer?.querySelector<HTMLInputElement>(
+                ':scope > input[type="checkbox"]'
+            )
+
+            if (!cb) {
+                return
+            }
+
+            cb.checked = !cb.checked
+            cb.dispatchEvent(new Event('change', { bubbles: true }))
+            persistFolderCheckboxCollapsedState(cb)
+
+            // Same URL: never navigate so expand/collapse toggles reliably (second click closes).
+            if (linkPathMatchesCurrentPage(a)) {
+                e.preventDefault()
+                e.stopPropagation()
+            }
+        },
+        true
+    )
 }
 
 /**
@@ -123,50 +127,54 @@ function ensureNavV2FolderLinkToggle() {
  * Runs in capture phase after {@link ensureNavV2FolderLinkToggle} so folder rows toggle first.
  */
 function ensureNavV2CollapseOutsideExpandedFolders() {
-	if (navV2OutsideCollapseBound) {
-		return
-	}
-
-	navV2OutsideCollapseBound = true
-
-	document.addEventListener(
-		'click',
-		(e: MouseEvent) => {
-			if (!(e.target instanceof Node)) {
-				return
-			}
-
-			if (e.button !== 0) {
-				return
-			}
-
-			const nav = document.querySelector<HTMLElement>('[data-nav-v2]')
-			if (!nav) {
-				return
-			}
-
-			// Clicks on top-level section titles should not close nested open folders.
-			if (
-				e.target instanceof Element &&
-				e.target.closest('nav[data-nav-v2] .docs-sidebar-nav-v2__label--top')
-			) {
-				return
-			}
-
-			const target = e.target
-			nav.querySelectorAll<HTMLInputElement>('li.group-navigation input[type="checkbox"]:checked').forEach((cb) => {
-				const li = cb.closest('li.group-navigation')
-				if (!li || li.contains(target)) {
-					return
-				}
-
-				cb.checked = false
-				cb.dispatchEvent(new Event('change', { bubbles: true }))
-				persistFolderCheckboxCollapsedState(cb)
-			})
-		},
-		true
-	)
+    if (navV2OutsideCollapseBound) {
+        return
+    }
+
+    navV2OutsideCollapseBound = true
+
+    document.addEventListener(
+        'click',
+        (e: MouseEvent) => {
+            if (!(e.target instanceof Node)) {
+                return
+            }
+
+            if (e.button !== 0) {
+                return
+            }
+
+            const nav = document.querySelector<HTMLElement>('[data-nav-v2]')
+            if (!nav) {
+                return
+            }
+
+            // Clicks on top-level section titles should not close nested open folders.
+            if (
+                e.target instanceof Element &&
+                e.target.closest(
+                    'nav[data-nav-v2] .docs-sidebar-nav-v2__label--top'
+                )
+            ) {
+                return
+            }
+
+            const target = e.target
+            nav.querySelectorAll<HTMLInputElement>(
+                'li.group-navigation input[type="checkbox"]:checked'
+            ).forEach((cb) => {
+                const li = cb.closest('li.group-navigation')
+                if (!li || li.contains(target)) {
+                    return
+                }
+
+                cb.checked = false
+                cb.dispatchEvent(new Event('change', { bubbles: true }))
+                persistFolderCheckboxCollapsedState(cb)
+            })
+        },
+        true
+    )
 }
 
 /**
@@ -175,23 +183,23 @@ function ensureNavV2CollapseOutsideExpandedFolders() {
  * same nesting level as the given checkbox's ancestor accordion.
  */
 function getSiblingAccordionCheckboxes(
-	checkbox: HTMLInputElement
+    checkbox: HTMLInputElement
 ): HTMLInputElement[] {
-	const accordion = checkbox.closest('[data-v2-accordion]')
-	if (!accordion) {
-		return []
-	}
-
-	const parent = accordion.parentElement
-	if (!parent) {
-		return []
-	}
-
-	return Array.from(
-		parent.querySelectorAll<HTMLInputElement>(
-			'[data-v2-accordion] > .peer input[type=checkbox]'
-		)
-	).filter((c) => c !== checkbox)
+    const accordion = checkbox.closest('[data-v2-accordion]')
+    if (!accordion) {
+        return []
+    }
+
+    const parent = accordion.parentElement
+    if (!parent) {
+        return []
+    }
+
+    return Array.from(
+        parent.querySelectorAll<HTMLInputElement>(
+            '[data-v2-accordion] > .peer input[type=checkbox]'
+        )
+    ).filter((c) => c !== checkbox)
 }
 
 /**
@@ -199,24 +207,26 @@ function getSiblingAccordionCheckboxes(
  * collapse all its siblings so only one section is expanded at a time.
  */
 function initAccordion(nav: HTMLElement) {
-	nav.querySelectorAll<HTMLInputElement>(
-		'[data-v2-accordion] > .peer input[type=checkbox]'
-	).forEach((cb) => {
-		cb.addEventListener('change', (e) => {
-			const target = e.target as HTMLInputElement
-			if (target.checked) {
-				getSiblingAccordionCheckboxes(target).forEach((sibling) => {
-					sibling.checked = false
-				})
-			}
-		})
-	})
+    nav.querySelectorAll<HTMLInputElement>(
+        '[data-v2-accordion] > .peer input[type=checkbox]'
+    ).forEach((cb) => {
+        cb.addEventListener('change', (e) => {
+            const target = e.target as HTMLInputElement
+            if (target.checked) {
+                getSiblingAccordionCheckboxes(target).forEach((sibling) => {
+                    sibling.checked = false
+                })
+            }
+        })
+    })
 }
 
 function clearActiveSubtreeHighlight(nav: HTMLElement) {
-	nav.querySelectorAll('.nav-v2-active-subtree, .nav-v2-active-leaf').forEach((el) => {
-		el.classList.remove('nav-v2-active-subtree', 'nav-v2-active-leaf')
-	})
+    nav.querySelectorAll('.nav-v2-active-subtree, .nav-v2-active-leaf').forEach(
+        (el) => {
+            el.classList.remove('nav-v2-active-subtree', 'nav-v2-active-leaf')
+        }
+    )
 }
 
 /**
@@ -224,46 +234,48 @@ function clearActiveSubtreeHighlight(nav: HTMLElement) {
  * nested folder index → that folder + its children only; leaf → that row only.
  */
 function applyActiveSubtreeHighlight(nav: HTMLElement) {
-	clearActiveSubtreeHighlight(nav)
-	const current = nav.querySelector<HTMLAnchorElement>('a.sidebar-link.current')
-	if (!current || !nav.contains(current)) {
-		return
-	}
-
-	const hostLi = current.closest('li')
-	if (!hostLi || !nav.contains(hostLi)) {
-		return
-	}
-
-	const folderRowLink = hostLi.querySelector<HTMLAnchorElement>(
-		':scope > .nav-folder-peer > a.sidebar-link'
-	)
-	const childUl = hostLi.querySelector(':scope > ul')
-
-	if (
-		hostLi.classList.contains('group-navigation') &&
-		folderRowLink &&
-		folderRowLink === current &&
-		childUl
-	) {
-		hostLi.classList.add('nav-v2-active-subtree')
-		return
-	}
-
-	hostLi.classList.add('nav-v2-active-leaf')
+    clearActiveSubtreeHighlight(nav)
+    const current = nav.querySelector<HTMLAnchorElement>(
+        'a.sidebar-link.current'
+    )
+    if (!current || !nav.contains(current)) {
+        return
+    }
+
+    const hostLi = current.closest('li')
+    if (!hostLi || !nav.contains(hostLi)) {
+        return
+    }
+
+    const folderRowLink = hostLi.querySelector<HTMLAnchorElement>(
+        ':scope > .nav-folder-peer > a.sidebar-link'
+    )
+    const childUl = hostLi.querySelector(':scope > ul')
+
+    if (
+        hostLi.classList.contains('group-navigation') &&
+        folderRowLink &&
+        folderRowLink === current &&
+        childUl
+    ) {
+        hostLi.classList.add('nav-v2-active-subtree')
+        return
+    }
+
+    hostLi.classList.add('nav-v2-active-leaf')
 }
 
 /**
  * Mark the current page's nav link with the "current" CSS class.
  */
 function markCurrentPage(nav: HTMLElement) {
-	// Remove stale current markers
-	$$('.current', nav).forEach((el) => el.classList.remove('current'))
+    // Remove stale current markers
+    $$('.current', nav).forEach((el) => el.classList.remove('current'))
 
-	const pathname = window.location.pathname.replace(/\/$/, '')
-	$$(`a[href="${pathname}"], a[href="${pathname}/"]`, nav).forEach((el) =>
-		el.classList.add('current')
-	)
+    const pathname = window.location.pathname.replace(/\/$/, '')
+    $$(`a[href="${pathname}"], a[href="${pathname}/"]`, nav).forEach((el) =>
+        el.classList.add('current')
+    )
 }
 
 /**
@@ -273,42 +285,45 @@ function markCurrentPage(nav: HTMLElement) {
  * is the current page (see session storage + folder row link match).
  */
 function expandToCurrentPage(nav: HTMLElement) {
-	const pathname = window.location.pathname.replace(/\/$/, '')
-	const link = nav.querySelector<HTMLElement>(
-		`a[href="${pathname}"], a[href="${pathname}/"]`
-	)
-	if (!link) {
-		return
-	}
-
-	const collapsedIds = readCollapsedFolderIds()
-
-	let el: Element | null = link.parentElement
-	while (el && el !== nav) {
-		if (el.matches('li')) {
-			const cb = el.querySelector<HTMLInputElement>(':scope > .peer input[type=checkbox]')
-			if (cb && cb.id) {
-				const rowLink = el.querySelector<HTMLElement>(
-					':scope > .nav-folder-peer > a.sidebar-link'
-				)
-				const currentIsThisFolderRow = rowLink !== null && rowLink === link
-
-				if (collapsedIds.has(cb.id)) {
-					if (!currentIsThisFolderRow) {
-						collapsedIds.delete(cb.id)
-						writeCollapsedFolderIds(collapsedIds)
-						cb.checked = true
-					}
-				} else {
-					cb.checked = true
-				}
-			} else if (cb) {
-				cb.checked = true
-			}
-		}
-
-		el = el.parentElement
-	}
+    const pathname = window.location.pathname.replace(/\/$/, '')
+    const link = nav.querySelector<HTMLElement>(
+        `a[href="${pathname}"], a[href="${pathname}/"]`
+    )
+    if (!link) {
+        return
+    }
+
+    const collapsedIds = readCollapsedFolderIds()
+
+    let el: Element | null = link.parentElement
+    while (el && el !== nav) {
+        if (el.matches('li')) {
+            const cb = el.querySelector<HTMLInputElement>(
+                ':scope > .peer input[type=checkbox]'
+            )
+            if (cb && cb.id) {
+                const rowLink = el.querySelector<HTMLElement>(
+                    ':scope > .nav-folder-peer > a.sidebar-link'
+                )
+                const currentIsThisFolderRow =
+                    rowLink !== null && rowLink === link
+
+                if (collapsedIds.has(cb.id)) {
+                    if (!currentIsThisFolderRow) {
+                        collapsedIds.delete(cb.id)
+                        writeCollapsedFolderIds(collapsedIds)
+                        cb.checked = true
+                    }
+                } else {
+                    cb.checked = true
+                }
+            } else if (cb) {
+                cb.checked = true
+            }
+        }
+
+        el = el.parentElement
+    }
 }
 
 /**
@@ -316,10 +331,10 @@ function expandToCurrentPage(nav: HTMLElement) {
  * Call this on every htmx:load when [data-nav-v2] is present.
  */
 export function initNavV2(nav: HTMLElement) {
-	initAccordion(nav)
-	markCurrentPage(nav)
-	expandToCurrentPage(nav)
-	applyActiveSubtreeHighlight(nav)
+    initAccordion(nav)
+    markCurrentPage(nav)
+    expandToCurrentPage(nav)
+    applyActiveSubtreeHighlight(nav)
 }
 
 ensureNavV2FolderLinkToggle()
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 922f2c5e30..e2aec884f0 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -145,7 +145,8 @@ body {
 		grid-template-columns: minmax(0, 280px) 1fr;
 	}
 
-	body:has([data-nav-v2]) div.grid.w-full.h-full:has(> aside.sidebar:first-child) {
+	body:has([data-nav-v2])
+		div.grid.w-full.h-full:has(> aside.sidebar:first-child) {
 		grid-template-columns: minmax(0, 280px) 1fr;
 	}
 }
@@ -167,7 +168,10 @@ body:has([data-nav-v2]) aside.sidebar {
 }
 
 /* Folder child lists: hidden when checkbox unchecked (fixes conflict: global ul{display:flex} beat Tailwind .hidden) */
-#pages-nav nav[data-nav-v2] li.group-navigation > ul.docs-sidebar-nav-v2__folder-children {
+#pages-nav
+	nav[data-nav-v2]
+	li.group-navigation
+	> ul.docs-sidebar-nav-v2__folder-children {
 	display: none;
 	flex-direction: column;
 	list-style: none;
@@ -192,7 +196,9 @@ nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--nested {
 }
 
 /* Nav V2: top-level section titles — icon 16×16, 8px gap via gap-2 on flex parent */
-nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--top .docs-sidebar-nav-v2__label-icon {
+nav.docs-sidebar-nav-v2
+	.docs-sidebar-nav-v2__label--top
+	.docs-sidebar-nav-v2__label-icon {
 	display: block;
 	width: 16px;
 	height: 16px;
@@ -222,7 +228,9 @@ nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--top .docs-sidebar-nav-v2__l
 	color: #516381;
 }
 
-#pages-nav nav[data-nav-v2] a.sidebar-link:not(.text-grey-40):not(.current):hover {
+#pages-nav
+	nav[data-nav-v2]
+	a.sidebar-link:not(.text-grey-40):not(.current):hover {
 	color: #1d2a3e;
 	background-color: transparent;
 }
@@ -263,23 +271,35 @@ nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--top .docs-sidebar-nav-v2__l
 	background-color: transparent;
 }
 
-#pages-nav nav[data-nav-v2] li.nav-v2-active-subtree a.sidebar-link:not(.current):hover {
+#pages-nav
+	nav[data-nav-v2]
+	li.nav-v2-active-subtree
+	a.sidebar-link:not(.current):hover {
 	color: #1d2a3e;
 	background-color: transparent !important;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-subtree a.sidebar-link.current,
-#pages-nav nav[data-nav-v2] li.nav-v2-active-subtree a.sidebar-link.current:hover {
+#pages-nav
+	nav[data-nav-v2]
+	li.nav-v2-active-subtree
+	a.sidebar-link.current:hover {
 	background-color: transparent !important;
 }
 
-#pages-nav nav[data-nav-v2] li.nav-v2-active-leaf > a.sidebar-link:not(.current):hover {
+#pages-nav
+	nav[data-nav-v2]
+	li.nav-v2-active-leaf
+	> a.sidebar-link:not(.current):hover {
 	color: #1d2a3e;
 	background-color: transparent !important;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-leaf > a.sidebar-link.current,
-#pages-nav nav[data-nav-v2] li.nav-v2-active-leaf > a.sidebar-link.current:hover {
+#pages-nav
+	nav[data-nav-v2]
+	li.nav-v2-active-leaf
+	> a.sidebar-link.current:hover {
 	background-color: transparent !important;
 }
 
@@ -291,7 +311,10 @@ nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--top .docs-sidebar-nav-v2__l
 	transform: rotate(-90deg);
 }
 
-.docs-sidebar-nav-v2 .nav-folder-peer:has(input[type='checkbox']:checked) .nav-folder-chevron svg {
+.docs-sidebar-nav-v2
+	.nav-folder-peer:has(input[type='checkbox']:checked)
+	.nav-folder-chevron
+	svg {
 	transform: rotate(0deg);
 }
 

From 313138ac5cfab93a6511b158686beae74dc0f0bd Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri-Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 31 Mar 2026 10:54:18 +0200
Subject: [PATCH 039/226] Wire Elasticsearch fundamentals and Ingest data
 storage nav sections (#2998)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(nav-v2): wire Elasticsearch fundamentals and Ingest data storage sections

Replace placeholder title: entries with real page: cross-links in two
sections of navigation-v2.yml:

- Elasticsearch fundamentals: Get started, Elasticsearch concepts, and
  Use cases — 8 pages wired from docs-content get-started, manage-data,
  solutions/search, and explore-analyze

- Ingest and manage data > Data storage and lifecycle: The Elasticsearch
  data store, Index basics, Mapping, Text analysis, Data lifecycle — 16
  pages wired from docs-content manage-data and elasticsearch reference

- Ingest and manage data > Transform and enrich data: Data pipelines,
  enrichment, mapping — 6 pages wired from docs-content manage-data and
  opentelemetry reference

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* feat(nav-v2): expand data storage, lifecycle, and transform sections to full depth

Expand flat page: leaf entries into group: + page: + children: structures
mirroring the full manage-data/toc.yml depth:

- Data streams: 18 pages (TSDS, downsampling, logs, failure store)
- Mapping: +7 pages (dynamic, explicit, runtime fields)
- Text analysis: +8 pages (concepts, configure)
- Templates: +2 pages
- ILM: +14 pages (rollover, tutorials, migrate)
- Data stream lifecycle: +4 tutorials
- Rollup: +6 pages
- Ingest pipelines: +3 pages (examples, error handling)
- Data enrichment: +4 examples
- Index basics: +1 page (perform operations)
- Data store: +1 page (near real-time search)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 276 +++++++++++++++++++++++++++++++++++----
 1 file changed, 248 insertions(+), 28 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index a3341fc463..d54b77fb83 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -2,19 +2,28 @@ nav:
   - label: Elasticsearch fundamentals
     children:
     - group: Get started in seconds (New)
+      page: docs-content://get-started/index.md
       children:
-      - title: Evaluate Elastic during a trial
+      - page: docs-content://get-started/evaluate-elastic.md
+        title: Evaluate Elastic during a trial
     - group: Elasticsearch concepts
       children:
-      - title: Elasticsearch essentials (Core document database)
-      - title: Ingest data into Elasticsearch
-      - title: Core search features (indexing, mapping)
-      - title: Visualize and analyze (Kibana)
+      - page: docs-content://manage-data/data-store.md
+        title: Elasticsearch essentials (Core document database)
+      - page: docs-content://manage-data/ingest.md
+        title: Ingest data into Elasticsearch
+      - page: docs-content://solutions/search.md
+        title: Core search features
+      - page: docs-content://explore-analyze/index.md
+        title: Visualize and analyze (Kibana)
       - group: Use cases
         children:
-        - title: Geospatial analysis
-        - title: Add search to your site or app
-        - title: RAG
+        - page: docs-content://explore-analyze/geospatial-analysis.md
+          title: Geospatial analysis
+        - page: docs-content://solutions/search/site-or-app.md
+          title: Add search to your site or app
+        - page: docs-content://solutions/search/rag.md
+          title: RAG
   - label: Install, deploy, and administer
     children:
     - group: Distributed architecture
@@ -227,39 +236,250 @@ nav:
       - group: Data storage and lifecycle
         children:
         - group: The Elasticsearch data store
+          page: docs-content://manage-data/data-store.md
           children:
-          - title: Aliases
-          - title: Data streams
           - group: Index basics
+            page: docs-content://manage-data/data-store/index-basics.md
+            children:
+            - page: docs-content://manage-data/data-store/perform-index-operations.md
+              title: Perform index operations
+            - page: elasticsearch://reference/elasticsearch/index-settings/index.md
+              title: Index settings reference
+            - page: elasticsearch://reference/elasticsearch/index-lifecycle-actions/index.md
+              title: Index lifecycle management actions
+          - page: docs-content://manage-data/data-store/near-real-time-search.md
+            title: Near real-time search
+          - group: Data streams
+            page: docs-content://manage-data/data-store/data-streams.md
             children:
-            - title: "[XREF] Index settings reference"
-            - title: Index lifecycle management actions
-          - title: Manage data from the command line
+            - page: docs-content://manage-data/data-store/data-streams/set-up-data-stream.md
+              title: Set up a data stream
+            - page: docs-content://manage-data/data-store/data-streams/use-data-stream.md
+              title: Use a data stream
+            - page: docs-content://manage-data/data-store/data-streams/modify-data-stream.md
+              title: Modify a data stream
+            - page: docs-content://manage-data/data-store/data-streams/manage-data-stream.md
+              title: Manage a data stream
+            - group: Time series data stream (TSDS)
+              page: docs-content://manage-data/data-store/data-streams/time-series-data-stream-tsds.md
+              children:
+              - page: docs-content://manage-data/data-store/data-streams/quickstart-tsds.md
+                title: Quickstart
+              - page: docs-content://manage-data/data-store/data-streams/set-up-tsds.md
+                title: Set up TSDS
+              - group: Downsampling
+                page: docs-content://manage-data/data-store/data-streams/downsampling-time-series-data-stream.md
+                children:
+                - page: docs-content://manage-data/data-store/data-streams/downsampling-concepts.md
+                  title: Downsampling concepts
+                - page: docs-content://manage-data/data-store/data-streams/run-downsampling.md
+                  title: Run downsampling
+                - page: docs-content://manage-data/data-store/data-streams/query-downsampled-data.md
+                  title: Query downsampled data
+              - group: Advanced topics
+                page: docs-content://manage-data/data-store/data-streams/advanced-topics-tsds.md
+                children:
+                - page: docs-content://manage-data/data-store/data-streams/time-bound-tsds.md
+                  title: Time-bound TSDS
+                - page: docs-content://manage-data/data-store/data-streams/reindex-tsds.md
+                  title: Reindex TSDS
+                - page: docs-content://manage-data/data-store/data-streams/tsds-ingest-otlp.md
+                  title: TSDS ingest OTLP
+            - group: Logs data stream
+              page: docs-content://manage-data/data-store/data-streams/logs-data-stream.md
+              children:
+              - page: docs-content://manage-data/data-store/data-streams/logs-data-stream-configure.md
+                title: Configure
+              - page: docs-content://manage-data/data-store/data-streams/logs-data-stream-integrations.md
+                title: Integrations
+            - group: Failure store
+              page: docs-content://manage-data/data-store/data-streams/failure-store.md
+              children:
+              - page: docs-content://manage-data/data-store/data-streams/failure-store-recipes.md
+                title: Recipes
           - group: Mapping
+            page: docs-content://manage-data/data-store/mapping.md
             children:
-            - title: Mapping reference
-          - title: Templates
+            - page: elasticsearch://reference/elasticsearch/mapping-reference/index.md
+              title: Mapping reference
+            - group: Dynamic mapping
+              page: docs-content://manage-data/data-store/mapping/dynamic-mapping.md
+              children:
+              - page: docs-content://manage-data/data-store/mapping/dynamic-field-mapping.md
+                title: Dynamic field mapping
+              - page: docs-content://manage-data/data-store/mapping/dynamic-templates.md
+                title: Dynamic templates
+            - page: docs-content://manage-data/data-store/mapping/explicit-mapping.md
+              title: Explicit mapping
+            - group: Runtime fields
+              page: docs-content://manage-data/data-store/mapping/runtime-fields.md
+              children:
+              - page: docs-content://manage-data/data-store/mapping/map-runtime-field.md
+                title: Map a runtime field
+              - page: docs-content://manage-data/data-store/mapping/define-runtime-fields-in-search-request.md
+                title: Define in search request
+              - page: docs-content://manage-data/data-store/mapping/override-field-values-at-query-time.md
+                title: Override values at query time
+              - page: docs-content://manage-data/data-store/mapping/retrieve-runtime-field.md
+                title: Retrieve a runtime field
+              - page: docs-content://manage-data/data-store/mapping/index-runtime-field.md
+                title: Index a runtime field
+              - page: docs-content://manage-data/data-store/mapping/explore-data-with-runtime-fields.md
+                title: Explore data with runtime fields
+            - page: docs-content://manage-data/data-store/mapping/removal-of-mapping-types.md
+              title: Removal of mapping types
+            - page: docs-content://manage-data/data-store/mapping/update-mappings-examples.md
+              title: Update mappings examples
           - group: Text analysis
+            page: docs-content://manage-data/data-store/text-analysis.md
             children:
-            - title: "[XREF] Text analysis components"
+            - page: elasticsearch://reference/text-analysis/index.md
+              title: Text analysis components
+            - group: Concepts
+              page: docs-content://manage-data/data-store/text-analysis/concepts.md
+              children:
+              - page: docs-content://manage-data/data-store/text-analysis/anatomy-of-an-analyzer.md
+                title: Anatomy of an analyzer
+              - page: docs-content://manage-data/data-store/text-analysis/index-search-analysis.md
+                title: Index and search analysis
+              - page: docs-content://manage-data/data-store/text-analysis/stemming.md
+                title: Stemming
+              - page: docs-content://manage-data/data-store/text-analysis/token-graphs.md
+                title: Token graphs
+            - group: Configure text analysis
+              page: docs-content://manage-data/data-store/text-analysis/configure-text-analysis.md
+              children:
+              - page: docs-content://manage-data/data-store/text-analysis/test-an-analyzer.md
+                title: Test an analyzer
+              - page: docs-content://manage-data/data-store/text-analysis/configuring-built-in-analyzers.md
+                title: Configuring built-in analyzers
+              - page: docs-content://manage-data/data-store/text-analysis/create-custom-analyzer.md
+                title: Create custom analyzer
+              - page: docs-content://manage-data/data-store/text-analysis/specify-an-analyzer.md
+                title: Specify an analyzer
+          - group: Templates
+            page: docs-content://manage-data/data-store/templates.md
+            children:
+            - page: docs-content://manage-data/data-store/templates/simulate-multi-component-templates.md
+              title: Simulate multi-component templates
+            - page: docs-content://manage-data/data-store/templates/ignore-missing-component-templates.md
+              title: Ignore missing component templates
+          - page: docs-content://manage-data/data-store/aliases.md
+            title: Aliases
+          - page: docs-content://manage-data/data-store/manage-data-from-the-command-line.md
+            title: Manage data from the command line
         - group: Data lifecycle
+          page: docs-content://manage-data/lifecycle.md
           children:
-          - title: Elasticsearch Curator
-          - title: Data stream lifecycle
-          - title: "Data tiers: hot warm cold frozen"
-          - title: Index lifecycle management (ILM)
-          - title: Rollup
-        - title: "Use case: time series data management"
+          - page: docs-content://manage-data/lifecycle/data-tiers.md
+            title: "Data tiers: hot warm cold frozen"
+          - group: Index lifecycle management (ILM)
+            page: docs-content://manage-data/lifecycle/index-lifecycle-management.md
+            children:
+            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/index-lifecycle.md
+              title: Index lifecycle
+            - group: Rollover
+              page: docs-content://manage-data/lifecycle/index-lifecycle-management/rollover.md
+              children:
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/skip-rollover.md
+                title: Skip rollover
+            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/configure-lifecycle-policy.md
+              title: Configure lifecycle policy
+            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-apply.md
+              title: Apply policy
+            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-view-status.md
+              title: View policy status
+            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/manage-lifecycle-integrations-data.md
+              title: Manage integrations data
+            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-updates.md
+              title: Policy updates
+            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/start-stop-index-lifecycle-management.md
+              title: Start and stop ILM
+            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/restore-managed-data-stream-index.md
+              title: Restore managed index
+            - group: ILM tutorials
+              page: docs-content://manage-data/lifecycle/index-lifecycle-management/ilm-tutorials.md
+              children:
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-time-series-with-data-streams.md
+                title: Time series with data streams
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-time-series-without-data-streams.md
+                title: Time series without data streams
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-general-content-with-data-streams.md
+                title: General content with data streams
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-customize-built-in-policies.md
+                title: Customize built-in policies
+            - group: Migrate ILM
+              page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-ilm.md
+              children:
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-index-management.md
+                title: Migrate index management
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/manage-existing-indices.md
+                title: Manage existing indices
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md
+                title: Migrate allocation filters to node roles
+          - group: Data stream lifecycle
+            page: docs-content://manage-data/lifecycle/data-stream.md
+            children:
+            - page: docs-content://manage-data/lifecycle/data-stream/tutorial-create-data-stream-with-lifecycle.md
+              title: "Tutorial: Create with lifecycle"
+            - page: docs-content://manage-data/lifecycle/data-stream/tutorial-update-existing-data-stream.md
+              title: "Tutorial: Update existing"
+            - page: docs-content://manage-data/lifecycle/data-stream/tutorial-data-stream-retention.md
+              title: "Tutorial: Retention"
+            - page: docs-content://manage-data/lifecycle/data-stream/tutorial-migrate-ilm-managed-data-stream-to-data-stream-lifecycle.md
+              title: "Tutorial: Migrate from ILM"
+          - page: docs-content://manage-data/lifecycle/curator.md
+            title: Elasticsearch Curator
+          - group: Rollup
+            page: docs-content://manage-data/lifecycle/rollup.md
+            children:
+            - page: docs-content://manage-data/lifecycle/rollup/getting-started-api.md
+              title: Getting started (API)
+            - page: docs-content://manage-data/lifecycle/rollup/getting-started-kibana.md
+              title: Getting started (Kibana)
+            - page: docs-content://manage-data/lifecycle/rollup/understanding-groups.md
+              title: Understanding groups
+            - page: docs-content://manage-data/lifecycle/rollup/rollup-aggregation-limitations.md
+              title: Aggregation limitations
+            - page: docs-content://manage-data/lifecycle/rollup/rollup-search-limitations.md
+              title: Search limitations
+            - page: docs-content://manage-data/lifecycle/rollup/migrating-from-rollup-to-downsampling.md
+              title: Migrating to downsampling
+        - page: docs-content://manage-data/use-case-use-elasticsearch-to-manage-time-series-data.md
+          title: "Use case: time series data management"
       - group: Transform and enrich data
+        page: docs-content://manage-data/ingest/transform-enrich.md
         children:
         - group: Data pipelines
           children:
-          - title: Managed pipelines (Otel / Planned)
-          - title: Elasticsearch ingest pipelines
-          - title: Logstash pipelines
-        - title: Data enrichment
-        - title: Index mapping and text analysis
-        - title: Calculate ingest lag metadata
+          - page: opentelemetry://reference/motlp/index.md
+            title: Managed pipelines (mOTLP)
+          - group: Elasticsearch ingest pipelines
+            page: docs-content://manage-data/ingest/transform-enrich/ingest-pipelines.md
+            children:
+            - page: docs-content://manage-data/ingest/transform-enrich/example-parse-logs.md
+              title: "Example: Parse logs"
+            - page: docs-content://manage-data/ingest/transform-enrich/readable-maintainable-ingest-pipelines.md
+              title: Readable maintainable pipelines
+            - page: docs-content://manage-data/ingest/transform-enrich/error-handling.md
+              title: Error handling
+          - page: docs-content://manage-data/ingest/transform-enrich/logstash-pipelines.md
+            title: Logstash pipelines
+        - group: Data enrichment
+          page: docs-content://manage-data/ingest/transform-enrich/data-enrichment.md
+          children:
+          - page: docs-content://manage-data/ingest/transform-enrich/set-up-an-enrich-processor.md
+            title: Set up an enrich processor
+          - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-based-on-geolocation.md
+            title: "Example: Enrich by geolocation"
+          - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-based-on-exact-values.md
+            title: "Example: Enrich by exact values"
+          - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-by-matching-value-to-range.md
+            title: "Example: Enrich by matching value to range"
+        - page: docs-content://manage-data/ingest/transform-enrich/index-mapping-text-analysis.md
+          title: Index mapping and text analysis
+        - page: docs-content://manage-data/ingest/transform-enrich/ingest-lag.md
+          title: Calculate ingest lag metadata
     - label: Search, visualize and analyze
       children:
       - group: Search and query

From 6a667dc7ea810dd98086c75aca5611ac9cda6f34 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri-Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 31 Mar 2026 13:11:30 +0200
Subject: [PATCH 040/226] Wire Ingest logs, APM agents, and clean up nav labels
 (#3004)

* feat(nav-v2): wire Ingest logs, APM agents, and clean up labels

- Replace "Logs (Solutions / Obs)" placeholder with full "Ingest logs"
  group: 20 pages from docs-content://solutions/observability/logs/
- Wire APM agents via toc: docs-content://reference/apm-agents
- Add page: to "Ingest tools" and "Ingest data from applications" groups
- Clean up labels: remove "(New)", "(New - Crosslinks)",
  "(Solutions / Obs)", "(from Reference)" suffixes

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* feat(nav-v2): reorder EDOT before Fleet, add Agentless integrations

- Move opentelemetry://reference before docs-content://reference/fleet
  in the Ingest tools section
- Add Agentless integrations group (3 pages) before Ingest data from
  applications

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 74 +++++++++++++++++++++++++++++++++-------
 1 file changed, 62 insertions(+), 12 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index d54b77fb83..7951b5c983 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -1,7 +1,7 @@
 nav:
   - label: Elasticsearch fundamentals
     children:
-    - group: Get started in seconds (New)
+    - group: Get started in seconds
       page: docs-content://get-started/index.md
       children:
       - page: docs-content://get-started/evaluate-elastic.md
@@ -177,21 +177,70 @@ nav:
           title: Choose/Plan your ingest method
         - page: docs-content://manage-data/ingest/ingest-reference-architectures.md
           title: Ingest architectures
-        - group: Ingest by solution (New - Crosslinks)
+        - group: Ingest by solution
           children:
           - page: docs-content://solutions/search/ingest-for-search.md
             title: Ingesting data for search use cases
-          - title: Ingesting data for observability (New)
+          - title: Ingesting data for observability
           - page: docs-content://solutions/security/get-started/ingest-data-to-elastic-security.md
             title: Ingesting data for security (Move from Solutions)
         - page: docs-content://manage-data/ingest/ingesting-timeseries-data.md
           title: Ingesting time series data
-        - title: Logs (Solutions / Obs)
-        - group: Ingest data from applications (New)
-          children:
-          - page: docs-content://manage-data/ingest/ingesting-data-from-applications.md
-            title: Collect application data (Solutions / Obs)
-          - title: APM agents
+        - group: Ingest logs
+          page: docs-content://solutions/observability/logs.md
+          children:
+          - page: docs-content://solutions/observability/logs/get-started-with-system-logs.md
+            title: Get started with system logs
+          - page: docs-content://solutions/observability/logs/stream-any-log-file.md
+            title: Stream any log file
+          - page: docs-content://solutions/observability/logs/stream-any-log-file-using-edot-collector.md
+            title: Stream any log file using EDOT Collector
+          - group: Stream application logs
+            page: docs-content://solutions/observability/logs/stream-application-logs.md
+            children:
+            - page: docs-content://solutions/observability/logs/plaintext-application-logs.md
+              title: Plaintext application logs
+            - page: docs-content://solutions/observability/logs/ecs-formatted-application-logs.md
+              title: ECS formatted application logs
+            - page: docs-content://solutions/observability/logs/apm-agent-log-sending.md
+              title: APM agent log sending
+          - page: docs-content://solutions/observability/logs/parse-route-logs.md
+            title: Parse and route logs
+          - page: docs-content://solutions/observability/logs/filter-aggregate-logs.md
+            title: Filter and aggregate logs
+          - group: Explore logs
+            page: docs-content://solutions/observability/logs/explore-logs.md
+            children:
+            - page: docs-content://solutions/observability/logs/discover-logs.md
+              title: Discover logs
+            - page: docs-content://solutions/observability/logs/categorize-log-entries.md
+              title: Categorize log entries
+            - page: docs-content://solutions/observability/logs/inspect-log-anomalies.md
+              title: Inspect log anomalies
+          - page: docs-content://solutions/observability/logs/run-pattern-analysis-on-log-data.md
+            title: Run pattern analysis on log data
+          - page: docs-content://solutions/observability/logs/log-data-sources.md
+            title: Log data sources
+          - page: docs-content://solutions/observability/logs/logs-data-retention.md
+            title: Logs data retention
+          - page: docs-content://solutions/observability/logs/add-service-name-to-logs.md
+            title: Add service name to logs
+          - group: Logs index template reference
+            page: docs-content://solutions/observability/logs/logs-index-template-reference.md
+            children:
+            - page: docs-content://solutions/observability/logs/logs-index-template-defaults.md
+              title: Logs index template defaults
+        - group: Agentless integrations
+          page: docs-content://manage-data/ingest/agentless/agentless-integrations.md
+          children:
+          - page: docs-content://manage-data/ingest/agentless/cloud-connector-deployment.md
+            title: Cloud connector deployment
+          - page: docs-content://manage-data/ingest/agentless/agentless-integrations-faq.md
+            title: Agentless integrations FAQ
+        - group: Ingest data from applications
+          page: docs-content://manage-data/ingest/ingesting-data-from-applications.md
+          children:
+          - toc: docs-content://reference/apm-agents
           - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-with-nodejs-on-elasticsearch-service.md
             title: Ingest data with Node.js
           - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-with-python-on-elasticsearch-service.md
@@ -204,7 +253,7 @@ nav:
             title: Ingest logs from a Python application using Filebeat
           - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-nodejs-web-application-using-filebeat.md
             title: Ingest logs from a Node.js web application using Filebeat
-        - title: Ingest data using the API (New)
+        - title: Ingest data using the API
         - page: docs-content://manage-data/ingest/upload-data-files.md
           title: Upload data files
         - page: docs-content://manage-data/ingest/sample-data.md
@@ -220,10 +269,11 @@ nav:
             title: Minimal-downtime migration using snapshots
           - page: docs-content://manage-data/migrate/migrate-internal-indices.md
             title: Migrate system indices
-      - group: Ingest tools (from Reference)
+      - group: Ingest tools
+        page: docs-content://reference/ingestion-tools/index.md
         children:
-        - toc: docs-content://reference/fleet
         - toc: opentelemetry://reference
+        - toc: docs-content://reference/fleet
         - toc: integration-docs://reference
         - toc: elasticsearch://reference/search-connectors
         - toc: logstash://reference

From beefc87611827ed02970d95fc0add1147ce56118 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 31 Mar 2026 14:47:31 +0200
Subject: [PATCH 041/226] feat(nav-v2): rename Agentless group, add
 integrations reference page

- Rename "Agentless integrations" to "Ingest data with agentless
  integrations"
- Add integration-docs://reference/agentless_integrations.md to the
  agentless group

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 7951b5c983..bc22f6af95 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -230,13 +230,15 @@ nav:
             children:
             - page: docs-content://solutions/observability/logs/logs-index-template-defaults.md
               title: Logs index template defaults
-        - group: Agentless integrations
+        - group: Ingest data with agentless integrations
           page: docs-content://manage-data/ingest/agentless/agentless-integrations.md
           children:
           - page: docs-content://manage-data/ingest/agentless/cloud-connector-deployment.md
             title: Cloud connector deployment
           - page: docs-content://manage-data/ingest/agentless/agentless-integrations-faq.md
             title: Agentless integrations FAQ
+          - page: integration-docs://reference/agentless_integrations.md
+            title: Agentless integrations reference
         - group: Ingest data from applications
           page: docs-content://manage-data/ingest/ingesting-data-from-applications.md
           children:

From c4cbed6ffb60845615f13ff8830549073db9f41d Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 31 Mar 2026 14:57:27 +0200
Subject: [PATCH 042/226] fix(nav-v2): generate stub pages for placeholders
 nested inside real groups

CollectPlaceholders only recursed into PlaceholderNavigationNode and
LabelNavigationNode, missing placeholders nested inside
PageFolderNavigationNode or TOC nodes. Add a catch-all case for
INodeNavigationItem so all nested placeholders get stub pages.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../Building/PlaceholderPageWriter.cs                         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs b/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs
index a4f8a54109..5261a32d97 100644
--- a/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs
@@ -74,6 +74,10 @@ IReadOnlyList<INavigationItem> items
 					foreach (var child in CollectPlaceholders(label.NavigationItems.ToList()))
 						yield return child;
 					break;
+				case INodeNavigationItem<INavigationModel, INavigationItem> node:
+					foreach (var child in CollectPlaceholders(node.NavigationItems.ToList()))
+						yield return child;
+					break;
 			}
 		}
 	}

From 92d48295cc975d34472973e7bd57d90ad5a48447 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Mon, 30 Mar 2026 15:38:33 +0200
Subject: [PATCH 043/226] feat(nav-v2): single-line nav labels with ellipsis
 and truncated-only tippy tooltips

- Mark nav text with docs-sidebar-nav-v2__nav-text; override text-pretty/word-break for nowrap ellipsis
- Folder rows: min-width 0 and overflow on flex links; grid peer min-width 0
- Tippy: cancel onShow when text is not overflowing; anchor ref for folder links (keyboard focus)
---
 .../Assets/pages-nav-v2.ts                    | 80 ++++++++++++++++++-
 .../Assets/styles.css                         | 44 ++++++++++
 .../Navigation/_TocTreeNavV2.cshtml           | 14 ++--
 3 files changed, 127 insertions(+), 11 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 07ba2aeb9f..e8b3b1b9fb 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -1,3 +1,5 @@
+import tippy from 'tippy.js'
+import type { Instance } from 'tippy.js'
 import { $$ } from 'select-dom'
 
 const navV2CollapsedStorageKey = 'docs-builder-nav-v2-collapsed-ids'
@@ -5,6 +7,8 @@ const navV2CollapsedStorageKey = 'docs-builder-nav-v2-collapsed-ids'
 let navV2FolderLinkToggleBound = false
 let navV2OutsideCollapseBound = false
 
+let navV2TruncationTippyInstances: Instance[] = []
+
 function readCollapsedFolderIds(): Set<string> {
     try {
         const raw = sessionStorage.getItem(navV2CollapsedStorageKey)
@@ -326,15 +330,83 @@ function expandToCurrentPage(nav: HTMLElement) {
     }
 }
 
+function destroyNavV2TruncationTooltips() {
+	for (const instance of navV2TruncationTippyInstances) {
+		instance.destroy()
+	}
+
+	navV2TruncationTippyInstances = []
+}
+
+function measureNavTextEl(ref: HTMLElement, textEl: HTMLElement) {
+	return ref === textEl
+		? textEl
+		: (ref.querySelector<HTMLElement>('.docs-sidebar-nav-v2__nav-text') ?? textEl)
+}
+
+/**
+ * Tippy tooltips only when text is truncated (single-line ellipsis). onShow returns false to cancel.
+ */
+function initNavV2TruncationTooltips(nav: HTMLElement) {
+	destroyNavV2TruncationTooltips()
+
+	const els = nav.querySelectorAll<HTMLElement>('.docs-sidebar-nav-v2__nav-text')
+	for (const el of els) {
+		const full = el.textContent?.trim() ?? ''
+		if (!full) {
+			continue
+		}
+
+		const ref: HTMLElement =
+			el.parentElement?.matches('a.sidebar-link') === true
+				? (el.parentElement as HTMLElement)
+				: el
+
+		const instance = tippy(ref, {
+			content: full,
+			placement: 'right-start',
+			offset: [0, 6],
+			animation: 'fade',
+			duration: [200, 150],
+			arrow: true,
+			maxWidth: 360,
+			appendTo: () => document.body,
+			theme: 'nav-v2-truncate',
+			trigger: 'mouseenter focusin',
+			hideOnClick: true,
+			interactive: false,
+			touch: ['hold', 500],
+			aria: { content: 'describedby' },
+			onShow() {
+				const textEl = measureNavTextEl(ref, el)
+				const label = textEl.textContent?.trim() ?? ''
+				if (!label) {
+					return false
+				}
+
+				instance.setContent(label)
+				if (textEl.scrollWidth <= textEl.clientWidth + 1) {
+					return false
+				}
+			},
+		})
+
+		navV2TruncationTippyInstances.push(instance)
+	}
+}
+
 /**
  * Initialize all V2 nav behaviours on the given sidebar element.
  * Call this on every htmx:load when [data-nav-v2] is present.
  */
 export function initNavV2(nav: HTMLElement) {
-    initAccordion(nav)
-    markCurrentPage(nav)
-    expandToCurrentPage(nav)
-    applyActiveSubtreeHighlight(nav)
+	initAccordion(nav)
+	markCurrentPage(nav)
+	expandToCurrentPage(nav)
+	applyActiveSubtreeHighlight(nav)
+	requestAnimationFrame(() => {
+		requestAnimationFrame(() => initNavV2TruncationTooltips(nav))
+	})
 }
 
 ensureNavV2FolderLinkToggle()
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index e2aec884f0..2b46a09232 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -206,6 +206,39 @@ nav.docs-sidebar-nav-v2
 	color: #111c2c;
 }
 
+/* Nav V2: single-line labels/links with ellipsis (flex column needs min-width: 0 on li). */
+#pages-nav nav[data-nav-v2] li {
+	min-width: 0;
+}
+
+/* Override .sidebar-link text-pretty / word-break from @layer components (unlayered wins, but be explicit). */
+#pages-nav nav[data-nav-v2] .docs-sidebar-nav-v2__nav-text {
+	min-width: 0;
+	max-width: 100%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap !important;
+	word-break: normal !important;
+	overflow-wrap: normal !important;
+	text-wrap: nowrap !important;
+}
+
+#pages-nav nav[data-nav-v2] .docs-sidebar-nav-v2__label--top .docs-sidebar-nav-v2__nav-text {
+	flex: 1 1 0%;
+}
+
+/* Flex row links (folders): clip so the inner span can ellipsis inside flex layout. */
+#pages-nav nav[data-nav-v2] a.sidebar-link.flex {
+	min-width: 0;
+	overflow: hidden;
+}
+
+/* Leaf / placeholder links (no inner flex row): ellipsis on the anchor itself. */
+#pages-nav nav[data-nav-v2] a.sidebar-link.docs-sidebar-nav-v2__nav-text:not(.flex) {
+	display: block;
+	overflow: hidden;
+}
+
 /* Nav V2: real nav links #516381 + light; placeholders keep .text-grey-40. Current = regular (400). */
 #pages-nav nav[data-nav-v2] a.sidebar-link {
 	box-sizing: border-box;
@@ -303,6 +336,10 @@ nav.docs-sidebar-nav-v2
 	background-color: transparent !important;
 }
 
+#pages-nav nav[data-nav-v2] .nav-folder-peer {
+	min-width: 0;
+}
+
 .docs-sidebar-nav-v2 .nav-folder-peer .nav-folder-chevron svg {
 	display: block;
 	width: 12px;
@@ -582,6 +619,13 @@ body {
 	white-space: pre-line;
 }
 
+.tippy-box[data-theme~='nav-v2-truncate'] .tippy-content {
+	white-space: normal;
+	word-break: break-word;
+	font-size: 13px;
+	line-height: 1.4;
+}
+
 .icon,
 .icon > * {
 	user-select: none;
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index 6fc735370f..bf0c4b7bdb 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -64,12 +64,12 @@
 							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M7 14h5v-2H4a1 1 0 1 0 0 2v1a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h10v11h-1v2h1v1H7v-1ZM4 2a1 1 0 0 0-1 1v8.27A1.99 1.99 0 0 1 4 11V2Zm1 9h8V2H5v9Z"/>
 						</svg>
 					}
-					<span class="min-w-0">@label.NavigationTitle</span>
+					<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@label.NavigationTitle</span>
 				</span>
 			}
 			else
 			{
-				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--nested block px-[8px] py-[6px] text-xs leading-4 font-medium uppercase text-[#5A6D8C]">
+				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--nested docs-sidebar-nav-v2__nav-text block px-[8px] py-[6px] text-xs leading-4 font-medium uppercase text-[#5A6D8C]">
 					@label.NavigationTitle
 				</span>
 			}
@@ -95,7 +95,7 @@
 			<a
 				href="@placeholder.Url"
 				@Model.Htmx.GetNavHxAttributes(true)
-				class="sidebar-link grow px-[8px] py-[6px] text-grey-40">
+				class="sidebar-link docs-sidebar-nav-v2__nav-text grow px-[8px] py-[6px] text-grey-40">
 				@placeholder.NavigationTitle
 			</a>
 		</li>
@@ -118,7 +118,7 @@
 					href="@placeholderGroup.Url"
 					@Model.Htmx.GetNavHxAttributes(true)
 					class="sidebar-link flex w-full items-center gap-2 px-[8px] py-[6px] text-grey-40">
-					<span class="min-w-0 flex-1">@placeholderGroup.NavigationTitle</span>
+					<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@placeholderGroup.NavigationTitle</span>
 					@if (!allHidden)
 					{
 						<span class="nav-folder-chevron shrink-0" aria-hidden="true">
@@ -157,7 +157,7 @@
 			<a
 				href="@group.Url"
 				@Model.Htmx.GetNavHxAttributes(true)
-				class="sidebar-link px-[8px] py-[6px]"
+				class="sidebar-link docs-sidebar-nav-v2__nav-text px-[8px] py-[6px]"
 			>
 				@group.NavigationTitle
 			</a>
@@ -181,7 +181,7 @@
 					href="@(folder.Url)"
 					@Model.Htmx.GetNavHxAttributes(true)
 					class="sidebar-link flex w-full items-center gap-2 px-[8px] py-[6px]">
-					<span class="min-w-0 flex-1">@(folder.NavigationTitle)</span>
+					<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@(folder.NavigationTitle)</span>
 					@if (!allHidden)
 					{
 						<span class="nav-folder-chevron shrink-0" aria-hidden="true">
@@ -220,7 +220,7 @@
 			<a
 				href="@leaf.Url"
 				@Model.Htmx.GetNavHxAttributes(true)
-				class="sidebar-link grow px-[8px] py-[6px]"
+				class="sidebar-link docs-sidebar-nav-v2__nav-text grow px-[8px] py-[6px]"
 			>
 				@leaf.NavigationTitle
 			</a>

From 6cad4aa12b55582ccbd60c9e618fb556c584bb71 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Tue, 31 Mar 2026 16:16:58 +0200
Subject: [PATCH 044/226] feat(nav-v2): ancestor folder highlight and
 expand/collapse behaviour

- Walk ancestor li.group-navigation nodes and add nav-v2-active-ancestor when
  the folder row is not .current (same color as current; chevron uses currentColor).
- Folder row: same URL toggles expand/collapse only; navigating to another URL
  keeps the folder open (checkbox checked) so parent clicks do not collapse the subtree.
- Outside-click collapse leaves folders open when the click target lies on an
  ancestor folder row in the same branch (folderStaysOpenForNavClick).
- Remove any leftover nav-v2-active-label-ancestor class on refresh.
---
 .../Assets/pages-nav-v2.ts                    | 82 ++++++++++++++-----
 1 file changed, 63 insertions(+), 19 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index e8b3b1b9fb..cab1491226 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -65,10 +65,9 @@ function linkPathMatchesCurrentPage(anchor: HTMLAnchorElement) {
 }
 
 /**
- * Primary click on a folder row link toggles expand/collapse (checkbox) and still follows href.
- * Skips modified clicks (new tab, etc.). Same-URL clicks use preventDefault so HTMX does not
- * re-run expandToCurrentPage and undo the collapse. Collapsed folder ids are stored so
- * expandToCurrentPage can respect user collapse after in-section navigation.
+ * Primary click on a folder row link: same-URL toggles expand/collapse only (preventDefault);
+ * navigating to another URL keeps the folder open (checkbox checked) and follows href.
+ * Skips modified clicks (new tab, etc.). Collapsed folder ids are stored for expandToCurrentPage.
  */
 function ensureNavV2FolderLinkToggle() {
     if (navV2FolderLinkToggleBound) {
@@ -112,23 +111,43 @@ function ensureNavV2FolderLinkToggle() {
                 return
             }
 
-            cb.checked = !cb.checked
-            cb.dispatchEvent(new Event('change', { bubbles: true }))
-            persistFolderCheckboxCollapsedState(cb)
-
-            // Same URL: never navigate so expand/collapse toggles reliably (second click closes).
             if (linkPathMatchesCurrentPage(a)) {
+                cb.checked = !cb.checked
+                cb.dispatchEvent(new Event('change', { bubbles: true }))
+                persistFolderCheckboxCollapsedState(cb)
                 e.preventDefault()
                 e.stopPropagation()
+                return
             }
+
+            cb.checked = true
+            cb.dispatchEvent(new Event('change', { bubbles: true }))
+            persistFolderCheckboxCollapsedState(cb)
         },
         true
     )
 }
 
+/** True if this folder row's li contains the click or an ancestor folder li (same branch) does. */
+function folderStaysOpenForNavClick(folderLi: Element, target: Node, nav: Element): boolean {
+    if (folderLi.contains(target)) {
+        return true
+    }
+
+    let node: Element | null = folderLi.parentElement
+    while (node && node !== nav) {
+        if (node.matches('li.group-navigation') && node.contains(target)) {
+            return true
+        }
+        node = node.parentElement
+    }
+
+    return false
+}
+
 /**
- * Collapse every expanded folder whose subtree does not contain the click target.
- * Runs in capture phase after {@link ensureNavV2FolderLinkToggle} so folder rows toggle first.
+ * Collapse expanded folders when the click is outside their branch (not under an ancestor folder row
+ * in the same hierarchy). Runs in capture phase after {@link ensureNavV2FolderLinkToggle}.
  */
 function ensureNavV2CollapseOutsideExpandedFolders() {
     if (navV2OutsideCollapseBound) {
@@ -168,7 +187,7 @@ function ensureNavV2CollapseOutsideExpandedFolders() {
                 'li.group-navigation input[type="checkbox"]:checked'
             ).forEach((cb) => {
                 const li = cb.closest('li.group-navigation')
-                if (!li || li.contains(target)) {
+                if (!li || folderStaysOpenForNavClick(li, target, nav)) {
                     return
                 }
 
@@ -226,11 +245,18 @@ function initAccordion(nav: HTMLElement) {
 }
 
 function clearActiveSubtreeHighlight(nav: HTMLElement) {
-    nav.querySelectorAll('.nav-v2-active-subtree, .nav-v2-active-leaf').forEach(
-        (el) => {
-            el.classList.remove('nav-v2-active-subtree', 'nav-v2-active-leaf')
-        }
-    )
+    nav
+        .querySelectorAll(
+            '.nav-v2-active-subtree, .nav-v2-active-leaf, .nav-v2-active-ancestor, .nav-v2-active-label-ancestor'
+        )
+        .forEach((el) => {
+            el.classList.remove(
+                'nav-v2-active-subtree',
+                'nav-v2-active-leaf',
+                'nav-v2-active-ancestor',
+                'nav-v2-active-label-ancestor'
+            )
+        })
 }
 
 /**
@@ -263,10 +289,28 @@ function applyActiveSubtreeHighlight(nav: HTMLElement) {
         childUl
     ) {
         hostLi.classList.add('nav-v2-active-subtree')
-        return
+    } else {
+        hostLi.classList.add('nav-v2-active-leaf')
     }
 
-    hostLi.classList.add('nav-v2-active-leaf')
+    /*
+     * Walk DOM ancestors: folder rows (li.group-navigation) whose own link is not .current
+     * match .current ink (chevron uses currentColor). Section titles (label--top / label--nested)
+     * are not links and must not receive ancestor styling.
+     */
+    let walk: Element | null = hostLi
+    while (walk && walk !== nav) {
+        if (walk.matches('li.group-navigation')) {
+            const ancestorRow = walk.querySelector<HTMLAnchorElement>(
+                ':scope > .nav-folder-peer > a.sidebar-link'
+            )
+            if (ancestorRow && ancestorRow !== current) {
+                walk.classList.add('nav-v2-active-ancestor')
+            }
+        }
+
+        walk = walk.parentElement
+    }
 }
 
 /**

From f1c3e2a4fa6dd292b2aec17d175aed122554a13d Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Tue, 31 Mar 2026 16:16:58 +0200
Subject: [PATCH 045/226] style(nav-v2): section labels, tree spacing, and
 active row chrome

- Set top-level tree li padding-bottom to 32px; margins for label--top and
  label--nested; first nested header under an icon title uses margin-top 12px.
- Remove hardcoded Platform subsection li classes; rely on generic markup and CSS.
- Adjust border and nested label colors to match design.
- Nav link default/hover colors (#1d2a3e, #f1f6ff); wrap label text instead of
  single-line ellipsis; clip nav for Tippy; styles for nav-v2-active-ancestor rows.
- Drop nav-v2-truncate Tippy theme rules (tooltips disabled while text wraps).
---
 .../Assets/styles.css                         | 73 ++++++++++++-------
 .../Navigation/_TocTreeNavV2.cshtml           | 11 +--
 2 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 2b46a09232..4432691f4b 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -187,12 +187,31 @@ body:has([data-nav-v2]) aside.sidebar {
 /* Nav V2: vertical padding on top-level li under the root ul (not nested folder children). */
 #pages-nav nav[data-nav-v2] ul.docs-sidebar-nav-v2__tree > li {
 	padding-top: 16px;
-	padding-bottom: 16px;
+	padding-bottom: 32px;
 }
 
-nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label,
+/* Tippy mounts inside nav; clip tooltips so nothing paints outside the sidebar column */
+nav.docs-sidebar-nav-v2 {
+	position: relative;
+	overflow: hidden;
+}
+
+/* Nav V2: top-level section titles (with icon) — sans stack from theme */
+nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--top {
+	font-family: var(--font-sans);
+	font-weight: 600;
+	margin: 8px 0 12px 0;
+}
+
+/* Nav V2: nested subgroup section titles */
 nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--nested {
-	margin: 0;
+	font-weight: 500;
+	margin: 16px 0 8px 0;
+}
+
+/* First nested header directly under a top icon title (e.g. Platform → Ingest) */
+nav.docs-sidebar-nav-v2 li:has(> .docs-sidebar-nav-v2__label--top) > ul > li:first-child .docs-sidebar-nav-v2__label--nested {
+	margin-top: 12px;
 }
 
 /* Nav V2: top-level section titles — icon 16×16, 8px gap via gap-2 on flex parent */
@@ -206,40 +225,35 @@ nav.docs-sidebar-nav-v2
 	color: #111c2c;
 }
 
-/* Nav V2: single-line labels/links with ellipsis (flex column needs min-width: 0 on li). */
+/* Nav V2: flex column needs min-width: 0 on li; labels wrap (truncation + Tippy disabled for now). */
 #pages-nav nav[data-nav-v2] li {
 	min-width: 0;
 }
 
-/* Override .sidebar-link text-pretty / word-break from @layer components (unlayered wins, but be explicit). */
 #pages-nav nav[data-nav-v2] .docs-sidebar-nav-v2__nav-text {
 	min-width: 0;
 	max-width: 100%;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap !important;
-	word-break: normal !important;
-	overflow-wrap: normal !important;
-	text-wrap: nowrap !important;
+	white-space: normal;
+	word-break: break-word;
+	overflow-wrap: break-word;
 }
 
 #pages-nav nav[data-nav-v2] .docs-sidebar-nav-v2__label--top .docs-sidebar-nav-v2__nav-text {
 	flex: 1 1 0%;
 }
 
-/* Flex row links (folders): clip so the inner span can ellipsis inside flex layout. */
+/* Folder rows: text wraps; chevron + label vertically centered (Tailwind items-center; unlayered override kept explicit) */
 #pages-nav nav[data-nav-v2] a.sidebar-link.flex {
 	min-width: 0;
-	overflow: hidden;
+	align-items: center;
 }
 
-/* Leaf / placeholder links (no inner flex row): ellipsis on the anchor itself. */
+/* Leaf / placeholder links (no inner flex row) */
 #pages-nav nav[data-nav-v2] a.sidebar-link.docs-sidebar-nav-v2__nav-text:not(.flex) {
 	display: block;
-	overflow: hidden;
 }
 
-/* Nav V2: real nav links #516381 + light; placeholders keep .text-grey-40. Current = regular (400). */
+/* Nav V2: default link ink; placeholders keep .text-grey-40. Current = blue + regular (400). */
 #pages-nav nav[data-nav-v2] a.sidebar-link {
 	box-sizing: border-box;
 	width: 100%;
@@ -258,14 +272,14 @@ nav.docs-sidebar-nav-v2
 }
 
 #pages-nav nav[data-nav-v2] a.sidebar-link:not(.text-grey-40) {
-	color: #516381;
+	color: #1d2a3e;
 }
 
 #pages-nav
 	nav[data-nav-v2]
 	a.sidebar-link:not(.text-grey-40):not(.current):hover {
 	color: #1d2a3e;
-	background-color: transparent;
+	background-color: #f1f6ff;
 }
 
 #pages-nav nav[data-nav-v2] a.sidebar-link.text-grey-40 {
@@ -274,7 +288,7 @@ nav.docs-sidebar-nav-v2
 
 #pages-nav nav[data-nav-v2] a.sidebar-link.text-grey-40:not(.current):hover {
 	color: #1d2a3e;
-	background-color: transparent;
+	background-color: #f1f6ff;
 }
 
 #pages-nav nav[data-nav-v2] a.sidebar-link.current {
@@ -309,7 +323,7 @@ nav.docs-sidebar-nav-v2
 	li.nav-v2-active-subtree
 	a.sidebar-link:not(.current):hover {
 	color: #1d2a3e;
-	background-color: transparent !important;
+	background-color: #f1f6ff !important;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-subtree a.sidebar-link.current,
@@ -325,7 +339,7 @@ nav.docs-sidebar-nav-v2
 	li.nav-v2-active-leaf
 	> a.sidebar-link:not(.current):hover {
 	color: #1d2a3e;
-	background-color: transparent !important;
+	background-color: #f1f6ff !important;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-leaf > a.sidebar-link.current,
@@ -336,6 +350,16 @@ nav.docs-sidebar-nav-v2
 	background-color: transparent !important;
 }
 
+/* Open ancestor folder rows when current is deeper: match .current link + chevron (currentColor) */
+#pages-nav nav[data-nav-v2] li.nav-v2-active-ancestor > .nav-folder-peer > a.sidebar-link {
+	color: #0b64dd !important;
+	font-weight: 400 !important;
+}
+
+#pages-nav nav[data-nav-v2] li.nav-v2-active-ancestor > .nav-folder-peer > a.sidebar-link:hover {
+	color: #0b64dd !important;
+}
+
 #pages-nav nav[data-nav-v2] .nav-folder-peer {
 	min-width: 0;
 }
@@ -619,13 +643,6 @@ body {
 	white-space: pre-line;
 }
 
-.tippy-box[data-theme~='nav-v2-truncate'] .tippy-content {
-	white-space: normal;
-	word-break: break-word;
-	font-size: 13px;
-	line-height: 1.4;
-}
-
 .icon,
 .icon > * {
 	user-select: none;
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index bf0c4b7bdb..f6815e95de 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -16,14 +16,11 @@
 
 	if (item is LabelNavigationNode label)
 	{
-		var isNestedPlatformSectionLabel = !isTopLevel && (
-			label.NavigationTitle == "Ingest and manage data"
-			|| label.NavigationTitle == "Search, visualize and analyze"
-			|| label.NavigationTitle == "AI and machine learning");
-		<li class="@(isTopLevel ? "border-t border-[#E3E8F2] first:border-t-0 relative" : isNestedPlatformSectionLabel ? "relative mt-[4px]" : "relative")">
+		@* Subsection headers: spacing via CSS (li:has .label--nested:not(:first-child)) so every title matches, not a hardcoded list *@
+		<li class="@(isTopLevel ? "border-t border-[#ECF1F9] first:border-t-0 relative" : "relative")">
 			@if (isTopLevel)
 			{
-				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--top flex items-center gap-2 px-[8px] py-[6px] text-sm leading-5 font-medium text-[#111C2C]">
+				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--top flex items-center gap-2 px-[8px] py-0 text-sm leading-5 text-[#111C2C]">
 					@if (label.NavigationTitle == "Elasticsearch fundamentals")
 					{
 						@* EUI icon: documentation *@
@@ -69,7 +66,7 @@
 			}
 			else
 			{
-				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--nested docs-sidebar-nav-v2__nav-text block px-[8px] py-[6px] text-xs leading-4 font-medium uppercase text-[#5A6D8C]">
+				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--nested docs-sidebar-nav-v2__nav-text block px-[8px] py-0 text-xs leading-4 uppercase text-[#A2B1C9]">
 					@label.NavigationTitle
 				</span>
 			}

From e4171a2cea971068678bf6e5cbb233edad319a93 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 1 Apr 2026 13:48:25 +0200
Subject: [PATCH 046/226] feat(nav-v2): move perform-index-operations per
 docs-content#5279

Align with elastic/docs-content#5279: move perform-index-operations
from under Index basics to a sibling group under The Elasticsearch
data store, and add new index-operations-reference.md as its child.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index bc22f6af95..9b65396ac1 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -293,8 +293,6 @@ nav:
           - group: Index basics
             page: docs-content://manage-data/data-store/index-basics.md
             children:
-            - page: docs-content://manage-data/data-store/perform-index-operations.md
-              title: Perform index operations
             - page: elasticsearch://reference/elasticsearch/index-settings/index.md
               title: Index settings reference
             - page: elasticsearch://reference/elasticsearch/index-lifecycle-actions/index.md
@@ -418,6 +416,11 @@ nav:
               title: Ignore missing component templates
           - page: docs-content://manage-data/data-store/aliases.md
             title: Aliases
+          - group: Perform index operations
+            page: docs-content://manage-data/data-store/perform-index-operations.md
+            children:
+            - page: docs-content://manage-data/data-store/index-operations-reference.md
+              title: Index operations reference
           - page: docs-content://manage-data/data-store/manage-data-from-the-command-line.md
             title: Manage data from the command line
         - group: Data lifecycle

From 29ba44f93553d3a6f7d191d95cd31555ec97b562 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 1 Apr 2026 13:55:29 +0200
Subject: [PATCH 047/226] style: fix Prettier formatting in pages-nav-v2.ts and
 styles.css

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../Assets/pages-nav-v2.ts                    | 149 +++++++++---------
 .../Assets/styles.css                         |  27 +++-
 2 files changed, 99 insertions(+), 77 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index cab1491226..6fd9dd8d77 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -1,6 +1,6 @@
+import { $$ } from 'select-dom'
 import tippy from 'tippy.js'
 import type { Instance } from 'tippy.js'
-import { $$ } from 'select-dom'
 
 const navV2CollapsedStorageKey = 'docs-builder-nav-v2-collapsed-ids'
 
@@ -129,7 +129,11 @@ function ensureNavV2FolderLinkToggle() {
 }
 
 /** True if this folder row's li contains the click or an ancestor folder li (same branch) does. */
-function folderStaysOpenForNavClick(folderLi: Element, target: Node, nav: Element): boolean {
+function folderStaysOpenForNavClick(
+    folderLi: Element,
+    target: Node,
+    nav: Element
+): boolean {
     if (folderLi.contains(target)) {
         return true
     }
@@ -245,18 +249,16 @@ function initAccordion(nav: HTMLElement) {
 }
 
 function clearActiveSubtreeHighlight(nav: HTMLElement) {
-    nav
-        .querySelectorAll(
-            '.nav-v2-active-subtree, .nav-v2-active-leaf, .nav-v2-active-ancestor, .nav-v2-active-label-ancestor'
+    nav.querySelectorAll(
+        '.nav-v2-active-subtree, .nav-v2-active-leaf, .nav-v2-active-ancestor, .nav-v2-active-label-ancestor'
+    ).forEach((el) => {
+        el.classList.remove(
+            'nav-v2-active-subtree',
+            'nav-v2-active-leaf',
+            'nav-v2-active-ancestor',
+            'nav-v2-active-label-ancestor'
         )
-        .forEach((el) => {
-            el.classList.remove(
-                'nav-v2-active-subtree',
-                'nav-v2-active-leaf',
-                'nav-v2-active-ancestor',
-                'nav-v2-active-label-ancestor'
-            )
-        })
+    })
 }
 
 /**
@@ -375,68 +377,71 @@ function expandToCurrentPage(nav: HTMLElement) {
 }
 
 function destroyNavV2TruncationTooltips() {
-	for (const instance of navV2TruncationTippyInstances) {
-		instance.destroy()
-	}
+    for (const instance of navV2TruncationTippyInstances) {
+        instance.destroy()
+    }
 
-	navV2TruncationTippyInstances = []
+    navV2TruncationTippyInstances = []
 }
 
 function measureNavTextEl(ref: HTMLElement, textEl: HTMLElement) {
-	return ref === textEl
-		? textEl
-		: (ref.querySelector<HTMLElement>('.docs-sidebar-nav-v2__nav-text') ?? textEl)
+    return ref === textEl
+        ? textEl
+        : (ref.querySelector<HTMLElement>('.docs-sidebar-nav-v2__nav-text') ??
+              textEl)
 }
 
 /**
  * Tippy tooltips only when text is truncated (single-line ellipsis). onShow returns false to cancel.
  */
 function initNavV2TruncationTooltips(nav: HTMLElement) {
-	destroyNavV2TruncationTooltips()
-
-	const els = nav.querySelectorAll<HTMLElement>('.docs-sidebar-nav-v2__nav-text')
-	for (const el of els) {
-		const full = el.textContent?.trim() ?? ''
-		if (!full) {
-			continue
-		}
-
-		const ref: HTMLElement =
-			el.parentElement?.matches('a.sidebar-link') === true
-				? (el.parentElement as HTMLElement)
-				: el
-
-		const instance = tippy(ref, {
-			content: full,
-			placement: 'right-start',
-			offset: [0, 6],
-			animation: 'fade',
-			duration: [200, 150],
-			arrow: true,
-			maxWidth: 360,
-			appendTo: () => document.body,
-			theme: 'nav-v2-truncate',
-			trigger: 'mouseenter focusin',
-			hideOnClick: true,
-			interactive: false,
-			touch: ['hold', 500],
-			aria: { content: 'describedby' },
-			onShow() {
-				const textEl = measureNavTextEl(ref, el)
-				const label = textEl.textContent?.trim() ?? ''
-				if (!label) {
-					return false
-				}
-
-				instance.setContent(label)
-				if (textEl.scrollWidth <= textEl.clientWidth + 1) {
-					return false
-				}
-			},
-		})
-
-		navV2TruncationTippyInstances.push(instance)
-	}
+    destroyNavV2TruncationTooltips()
+
+    const els = nav.querySelectorAll<HTMLElement>(
+        '.docs-sidebar-nav-v2__nav-text'
+    )
+    for (const el of els) {
+        const full = el.textContent?.trim() ?? ''
+        if (!full) {
+            continue
+        }
+
+        const ref: HTMLElement =
+            el.parentElement?.matches('a.sidebar-link') === true
+                ? (el.parentElement as HTMLElement)
+                : el
+
+        const instance = tippy(ref, {
+            content: full,
+            placement: 'right-start',
+            offset: [0, 6],
+            animation: 'fade',
+            duration: [200, 150],
+            arrow: true,
+            maxWidth: 360,
+            appendTo: () => document.body,
+            theme: 'nav-v2-truncate',
+            trigger: 'mouseenter focusin',
+            hideOnClick: true,
+            interactive: false,
+            touch: ['hold', 500],
+            aria: { content: 'describedby' },
+            onShow() {
+                const textEl = measureNavTextEl(ref, el)
+                const label = textEl.textContent?.trim() ?? ''
+                if (!label) {
+                    return false
+                }
+
+                instance.setContent(label)
+                if (textEl.scrollWidth <= textEl.clientWidth + 1) {
+                    return false
+                }
+            },
+        })
+
+        navV2TruncationTippyInstances.push(instance)
+    }
 }
 
 /**
@@ -444,13 +449,13 @@ function initNavV2TruncationTooltips(nav: HTMLElement) {
  * Call this on every htmx:load when [data-nav-v2] is present.
  */
 export function initNavV2(nav: HTMLElement) {
-	initAccordion(nav)
-	markCurrentPage(nav)
-	expandToCurrentPage(nav)
-	applyActiveSubtreeHighlight(nav)
-	requestAnimationFrame(() => {
-		requestAnimationFrame(() => initNavV2TruncationTooltips(nav))
-	})
+    initAccordion(nav)
+    markCurrentPage(nav)
+    expandToCurrentPage(nav)
+    applyActiveSubtreeHighlight(nav)
+    requestAnimationFrame(() => {
+        requestAnimationFrame(() => initNavV2TruncationTooltips(nav))
+    })
 }
 
 ensureNavV2FolderLinkToggle()
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 4432691f4b..8e0bca2022 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -210,7 +210,11 @@ nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--nested {
 }
 
 /* First nested header directly under a top icon title (e.g. Platform → Ingest) */
-nav.docs-sidebar-nav-v2 li:has(> .docs-sidebar-nav-v2__label--top) > ul > li:first-child .docs-sidebar-nav-v2__label--nested {
+nav.docs-sidebar-nav-v2
+	li:has(> .docs-sidebar-nav-v2__label--top)
+	> ul
+	> li:first-child
+	.docs-sidebar-nav-v2__label--nested {
 	margin-top: 12px;
 }
 
@@ -238,7 +242,10 @@ nav.docs-sidebar-nav-v2
 	overflow-wrap: break-word;
 }
 
-#pages-nav nav[data-nav-v2] .docs-sidebar-nav-v2__label--top .docs-sidebar-nav-v2__nav-text {
+#pages-nav
+	nav[data-nav-v2]
+	.docs-sidebar-nav-v2__label--top
+	.docs-sidebar-nav-v2__nav-text {
 	flex: 1 1 0%;
 }
 
@@ -249,7 +256,9 @@ nav.docs-sidebar-nav-v2
 }
 
 /* Leaf / placeholder links (no inner flex row) */
-#pages-nav nav[data-nav-v2] a.sidebar-link.docs-sidebar-nav-v2__nav-text:not(.flex) {
+#pages-nav
+	nav[data-nav-v2]
+	a.sidebar-link.docs-sidebar-nav-v2__nav-text:not(.flex) {
 	display: block;
 }
 
@@ -351,12 +360,20 @@ nav.docs-sidebar-nav-v2
 }
 
 /* Open ancestor folder rows when current is deeper: match .current link + chevron (currentColor) */
-#pages-nav nav[data-nav-v2] li.nav-v2-active-ancestor > .nav-folder-peer > a.sidebar-link {
+#pages-nav
+	nav[data-nav-v2]
+	li.nav-v2-active-ancestor
+	> .nav-folder-peer
+	> a.sidebar-link {
 	color: #0b64dd !important;
 	font-weight: 400 !important;
 }
 
-#pages-nav nav[data-nav-v2] li.nav-v2-active-ancestor > .nav-folder-peer > a.sidebar-link:hover {
+#pages-nav
+	nav[data-nav-v2]
+	li.nav-v2-active-ancestor
+	> .nav-folder-peer
+	> a.sidebar-link:hover {
 	color: #0b64dd !important;
 }
 

From d828f095bf5776064bf0e3669059edb2aae0969f Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Wed, 1 Apr 2026 14:38:03 +0200
Subject: [PATCH 048/226] fix(nav-v2): ancestor folder ink and deepest current
 link

- CSS: force default text colour on nav-v2-active-ancestor rows (keep font-weight); hover/grey-40 variants; scope global #pages-nav .current away from V2 sidebar links.

- JS: when several a.sidebar-link.current share the URL, use the deepest in the tree so subtree/ancestor classes attach to the correct rows.

Made-with: Cursor
---
 .../Assets/pages-nav-v2.ts                    | 47 +++++++++++++++++--
 .../Assets/styles.css                         | 29 +++++++++---
 2 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 6fd9dd8d77..f0421dbaad 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -261,15 +261,52 @@ function clearActiveSubtreeHighlight(nav: HTMLElement) {
     })
 }
 
+/**
+ * Counts {@code li} ancestors from {@code anchor} up to (but not including) {@code nav}.
+ */
+function navListItemDepthFromAnchor(anchor: Element, nav: HTMLElement): number {
+    let depth = 0
+    let el: Element | null = anchor
+    while (el && el !== nav) {
+        if (el.matches('li')) {
+            depth++
+        }
+        el = el.parentElement
+    }
+    return depth
+}
+
+/**
+ * Prefer the deepest {@code a.sidebar-link.current} when several share the URL (folder index
+ * and child, or duplicate toc entries). Otherwise {@code querySelector} picks the first in DOM
+ * order (usually a parent folder) and subtree/ancestor classes apply to the wrong rows.
+ */
+function deepestCurrentSidebarLink(nav: HTMLElement): HTMLAnchorElement | null {
+    const anchors = nav.querySelectorAll<HTMLAnchorElement>('a.sidebar-link.current')
+    if (anchors.length === 0) {
+        return null
+    }
+
+    let best = anchors[0]
+    let bestDepth = navListItemDepthFromAnchor(best, nav)
+    for (let i = 1; i < anchors.length; i++) {
+        const candidate = anchors[i]
+        const d = navListItemDepthFromAnchor(candidate, nav)
+        if (d > bestDepth) {
+            bestDepth = d
+            best = candidate
+        }
+    }
+    return best
+}
+
 /**
  * Apply #F1F6FF background per design: folder index → whole folder + visible children;
  * nested folder index → that folder + its children only; leaf → that row only.
  */
 function applyActiveSubtreeHighlight(nav: HTMLElement) {
     clearActiveSubtreeHighlight(nav)
-    const current = nav.querySelector<HTMLAnchorElement>(
-        'a.sidebar-link.current'
-    )
+    const current = deepestCurrentSidebarLink(nav)
     if (!current || !nav.contains(current)) {
         return
     }
@@ -297,8 +334,8 @@ function applyActiveSubtreeHighlight(nav: HTMLElement) {
 
     /*
      * Walk DOM ancestors: folder rows (li.group-navigation) whose own link is not .current
-     * match .current ink (chevron uses currentColor). Section titles (label--top / label--nested)
-     * are not links and must not receive ancestor styling.
+     * get nav-v2-active-ancestor (CSS: font-weight like .current; default link color). Section
+     * titles (label--top / label--nested) are not links and must not receive ancestor styling.
      */
     let walk: Element | null = hostLi
     while (walk && walk !== nav) {
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 8e0bca2022..3c43e7ccef 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -359,14 +359,22 @@ nav.docs-sidebar-nav-v2
 	background-color: transparent !important;
 }
 
-/* Open ancestor folder rows when current is deeper: match .current link + chevron (currentColor) */
+/*
+ * Ancestor folder rows (current is deeper): default ink + font-weight like .current.
+ * !important on color beats #pages-nav .current / a.sidebar-link.current when the folder href
+ * is also marked .current (common duplicate index URL), and keeps chevron currentColor in sync.
+ */
+#pages-nav nav[data-nav-v2] li.nav-v2-active-ancestor > .nav-folder-peer > a.sidebar-link {
+	color: #1d2a3e !important;
+	font-weight: 400 !important;
+}
+
 #pages-nav
 	nav[data-nav-v2]
 	li.nav-v2-active-ancestor
 	> .nav-folder-peer
-	> a.sidebar-link {
-	color: #0b64dd !important;
-	font-weight: 400 !important;
+	> a.sidebar-link.text-grey-40 {
+	color: var(--color-grey-40) !important;
 }
 
 #pages-nav
@@ -374,7 +382,15 @@ nav.docs-sidebar-nav-v2
 	li.nav-v2-active-ancestor
 	> .nav-folder-peer
 	> a.sidebar-link:hover {
-	color: #0b64dd !important;
+	color: #1d2a3e !important;
+}
+
+#pages-nav
+	nav[data-nav-v2]
+	li.nav-v2-active-ancestor
+	> .nav-folder-peer
+	> a.sidebar-link.text-grey-40:hover {
+	color: #1d2a3e !important;
 }
 
 #pages-nav nav[data-nav-v2] .nav-folder-peer {
@@ -631,7 +647,8 @@ nav.docs-sidebar-nav-v2
 	);
 }
 
-#pages-nav .current {
+/* V1 toc only: V2 current styling is #pages-nav nav[data-nav-v2] a.sidebar-link.current */
+#pages-nav .current:not(nav.docs-sidebar-nav-v2 a.sidebar-link) {
 	@apply text-blue-elastic! font-semibold;
 }
 

From d4bdd098fd294d3b26c125307dbe32ab704d1c85 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 2 Apr 2026 15:04:43 +0200
Subject: [PATCH 049/226] style: fix Prettier formatting in pages-nav-v2.ts and
 styles.css

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts | 4 +++-
 src/Elastic.Documentation.Site/Assets/styles.css      | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index f0421dbaad..5d6a54ecd5 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -282,7 +282,9 @@ function navListItemDepthFromAnchor(anchor: Element, nav: HTMLElement): number {
  * order (usually a parent folder) and subtree/ancestor classes apply to the wrong rows.
  */
 function deepestCurrentSidebarLink(nav: HTMLElement): HTMLAnchorElement | null {
-    const anchors = nav.querySelectorAll<HTMLAnchorElement>('a.sidebar-link.current')
+    const anchors = nav.querySelectorAll<HTMLAnchorElement>(
+        'a.sidebar-link.current'
+    )
     if (anchors.length === 0) {
         return null
     }
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 3c43e7ccef..0877cc57bb 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -364,7 +364,11 @@ nav.docs-sidebar-nav-v2
  * !important on color beats #pages-nav .current / a.sidebar-link.current when the folder href
  * is also marked .current (common duplicate index URL), and keeps chevron currentColor in sync.
  */
-#pages-nav nav[data-nav-v2] li.nav-v2-active-ancestor > .nav-folder-peer > a.sidebar-link {
+#pages-nav
+	nav[data-nav-v2]
+	li.nav-v2-active-ancestor
+	> .nav-folder-peer
+	> a.sidebar-link {
 	color: #1d2a3e !important;
 	font-weight: 400 !important;
 }

From b8e3e806871e6280c185f6eb7b21fc8463d0c3fa Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 2 Apr 2026 15:14:10 +0200
Subject: [PATCH 050/226] =?UTF-8?q?fix:=20resolve=20fs=20=E2=86=92=20readF?=
 =?UTF-8?q?s=20after=20merge=20with=20main?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The merge from main changed the FileSystem parameter from `fs` to
`readFs`/`writeFs` (ScopedFileSystem). The nav-v2 line reading
navigation-v2.yml was not auto-resolved.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../Building/AssemblerBuildService.cs                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs b/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
index ca2d5d4b2e..51d179d94f 100644
--- a/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
+++ b/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
@@ -118,7 +118,7 @@ Cancel ctx
 		if (featureFlags.NavV2Enabled && navV2FileInfo is not null)
 		{
 			_logger.LogInformation("nav-v2 feature flag enabled — loading navigation-v2.yml");
-			var v2File = NavigationV2File.Deserialize(await fs.File.ReadAllTextAsync(navV2FileInfo.FullName, ctx));
+			var v2File = NavigationV2File.Deserialize(await readFs.File.ReadAllTextAsync(navV2FileInfo.FullName, ctx));
 			navigation = new SiteNavigationV2(v2File, siteNavigationFile, assembleContext, documentationSets, assembleContext.Environment.PathPrefix);
 		}
 		else

From 0f21dd1a505a2d0c2096a2273d9ae095a63cadff Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri-Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 2 Apr 2026 16:48:46 +0200
Subject: [PATCH 051/226] Update Azure EDOT CF version (#3022)

+CC @zmoog
---
 config/versions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/versions.yml b/config/versions.yml
index db44a0498f..e0c18dd692 100644
--- a/config/versions.yml
+++ b/config/versions.yml
@@ -103,7 +103,7 @@ versioning_systems:
     current: 1.4.0
   edot-cf-azure:
     base: 0.1
-    current: 0.6.0
+    current: 0.7.1
   edot-cf-gcp:
     base: 0.1
     current: 0.1.2

From bebeab4451eef22e7f7fca97b1ca3a0eca7726bf Mon Sep 17 00:00:00 2001
From: Jan Calanog <jan.calanog@elastic.co>
Date: Thu, 2 Apr 2026 17:19:13 +0200
Subject: [PATCH 052/226] Enable AOT/trim analyzers on library projects and
 skip AOT publish on PRs (#2971)

Add IsAotCompatible to 12 library projects referenced by docs-builder so
Roslyn's trim/AOT analyzers (IL2026/IL3050) run during regular builds.
This catches AOT issues at compile time, removing the need for the
expensive native ILC publish step on pull requests.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .github/workflows/ci.yml                               | 10 +++++-----
 .../Elastic.Documentation.Configuration.csproj         |  1 +
 .../Elastic.Documentation.LegacyDocs.csproj            |  1 +
 .../Elastic.Documentation.LinkIndex.csproj             |  1 +
 .../Elastic.Documentation.Links.csproj                 |  1 +
 .../Elastic.Documentation.Navigation.csproj            |  1 +
 .../Elastic.Documentation.ServiceDefaults.csproj       |  1 +
 src/Elastic.Documentation/Elastic.Documentation.csproj |  1 +
 .../Elastic.Documentation.Refactor.csproj              |  1 +
 .../Elastic.Changelog/Elastic.Changelog.csproj         |  1 +
 .../Elastic.Documentation.Assembler.csproj             |  1 +
 .../Elastic.Documentation.Isolated.csproj              |  1 +
 .../Elastic.Documentation.Services.csproj              |  1 +
 13 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 19ad3643ce..302edbc4f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -162,17 +162,17 @@ jobs:
         run: dotnet run --project build -c release -- unit-test
 
       - name: Publish AOT
-        if: ${{ matrix.os != 'ubuntu-latest' }} # publish containers already validates AOT build
+        if: ${{ github.event_name == 'push' && matrix.os != 'ubuntu-latest' }} # publish containers already validates AOT build
         run: dotnet run --project build -c release -- publishbinaries
-        
+
       - name: Publish Containers
-        if: ${{ matrix.os == 'ubuntu-latest' }} 
+        if: ${{ github.event_name == 'push' && matrix.os == 'ubuntu-latest' }}
         env:
           DOCKER_NO_PUBLISH: true
         run: dotnet run --project build -c release -- publishcontainers
-        
+
       - name: Run Container
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        if: ${{ github.event_name == 'push' && matrix.os == 'ubuntu-latest' }}
         run: dotnet run --project build -c release -- runlocalcontainer
         
 
diff --git a/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj b/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj
index 83887a031e..0f96c00f34 100644
--- a/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj
+++ b/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj
@@ -6,6 +6,7 @@
     <Nullable>enable</Nullable>
     <!-- CS0618: Obsolete members - DisplayName is deprecated but still used by YAML deserialization -->
     <NoWarn>$(NoWarn);CS0618</NoWarn>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Elastic.Documentation.LegacyDocs/Elastic.Documentation.LegacyDocs.csproj b/src/Elastic.Documentation.LegacyDocs/Elastic.Documentation.LegacyDocs.csproj
index 62dcadb8d0..b25bfc8e2c 100644
--- a/src/Elastic.Documentation.LegacyDocs/Elastic.Documentation.LegacyDocs.csproj
+++ b/src/Elastic.Documentation.LegacyDocs/Elastic.Documentation.LegacyDocs.csproj
@@ -6,6 +6,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>Elastic.Documentation.LegacyDocs</RootNamespace>
+        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Elastic.Documentation.LinkIndex/Elastic.Documentation.LinkIndex.csproj b/src/Elastic.Documentation.LinkIndex/Elastic.Documentation.LinkIndex.csproj
index 1fef2ce2a0..64138d5889 100644
--- a/src/Elastic.Documentation.LinkIndex/Elastic.Documentation.LinkIndex.csproj
+++ b/src/Elastic.Documentation.LinkIndex/Elastic.Documentation.LinkIndex.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Elastic.Documentation.Links/Elastic.Documentation.Links.csproj b/src/Elastic.Documentation.Links/Elastic.Documentation.Links.csproj
index ade5da3232..6299cd5c1c 100644
--- a/src/Elastic.Documentation.Links/Elastic.Documentation.Links.csproj
+++ b/src/Elastic.Documentation.Links/Elastic.Documentation.Links.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Elastic.Documentation.Navigation/Elastic.Documentation.Navigation.csproj b/src/Elastic.Documentation.Navigation/Elastic.Documentation.Navigation.csproj
index 4b7075ec90..94dc26fe58 100644
--- a/src/Elastic.Documentation.Navigation/Elastic.Documentation.Navigation.csproj
+++ b/src/Elastic.Documentation.Navigation/Elastic.Documentation.Navigation.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Elastic.Documentation.ServiceDefaults/Elastic.Documentation.ServiceDefaults.csproj b/src/Elastic.Documentation.ServiceDefaults/Elastic.Documentation.ServiceDefaults.csproj
index ef3d8edd85..4bf0ef0294 100644
--- a/src/Elastic.Documentation.ServiceDefaults/Elastic.Documentation.ServiceDefaults.csproj
+++ b/src/Elastic.Documentation.ServiceDefaults/Elastic.Documentation.ServiceDefaults.csproj
@@ -5,6 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireSharedProject>true</IsAspireSharedProject>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Elastic.Documentation/Elastic.Documentation.csproj b/src/Elastic.Documentation/Elastic.Documentation.csproj
index a6a49d02a2..89463de94f 100644
--- a/src/Elastic.Documentation/Elastic.Documentation.csproj
+++ b/src/Elastic.Documentation/Elastic.Documentation.csproj
@@ -5,6 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>Elastic.Documentation</RootNamespace>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/authoring/Elastic.Documentation.Refactor/Elastic.Documentation.Refactor.csproj b/src/authoring/Elastic.Documentation.Refactor/Elastic.Documentation.Refactor.csproj
index f8c18faad7..825c3e80a2 100644
--- a/src/authoring/Elastic.Documentation.Refactor/Elastic.Documentation.Refactor.csproj
+++ b/src/authoring/Elastic.Documentation.Refactor/Elastic.Documentation.Refactor.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/services/Elastic.Changelog/Elastic.Changelog.csproj b/src/services/Elastic.Changelog/Elastic.Changelog.csproj
index cf1cb5a68a..f48857ea8f 100644
--- a/src/services/Elastic.Changelog/Elastic.Changelog.csproj
+++ b/src/services/Elastic.Changelog/Elastic.Changelog.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/services/Elastic.Documentation.Assembler/Elastic.Documentation.Assembler.csproj b/src/services/Elastic.Documentation.Assembler/Elastic.Documentation.Assembler.csproj
index 82408eef33..51ba2e085b 100644
--- a/src/services/Elastic.Documentation.Assembler/Elastic.Documentation.Assembler.csproj
+++ b/src/services/Elastic.Documentation.Assembler/Elastic.Documentation.Assembler.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/services/Elastic.Documentation.Isolated/Elastic.Documentation.Isolated.csproj b/src/services/Elastic.Documentation.Isolated/Elastic.Documentation.Isolated.csproj
index 090ef0e77a..3b50392249 100644
--- a/src/services/Elastic.Documentation.Isolated/Elastic.Documentation.Isolated.csproj
+++ b/src/services/Elastic.Documentation.Isolated/Elastic.Documentation.Isolated.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="GitHub.Actions.Core" />
diff --git a/src/services/Elastic.Documentation.Services/Elastic.Documentation.Services.csproj b/src/services/Elastic.Documentation.Services/Elastic.Documentation.Services.csproj
index 96209f37e3..6f2393e619 100644
--- a/src/services/Elastic.Documentation.Services/Elastic.Documentation.Services.csproj
+++ b/src/services/Elastic.Documentation.Services/Elastic.Documentation.Services.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>

From 11895b4eac1f87e19103d2616ef001a8c5a37da2 Mon Sep 17 00:00:00 2001
From: Jan Calanog <jan.calanog@elastic.co>
Date: Thu, 2 Apr 2026 17:25:58 +0200
Subject: [PATCH 053/226] HTML: Omit version meta tags for versionless pages
 (#3020)

* HTML: Omit version meta tags for versionless pages

Versionless pages (serverless, cloud, etc.) were rendering the sentinel
value 99999.0+ in product_version and DC.identifier meta tags. Now these
tags are omitted entirely when the page's versioning system is versionless.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* HTML: Restore required modifier on CurrentVersion property

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Elastic.Codex/Page/Index.cshtml         | 7 +++++--
 src/Elastic.Markdown/HtmlWriter.cs          | 4 +++-
 src/Elastic.Markdown/Page/Index.cshtml      | 7 +++++--
 src/Elastic.Markdown/Page/IndexViewModel.cs | 2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/Elastic.Codex/Page/Index.cshtml b/src/Elastic.Codex/Page/Index.cshtml
index 258db5b7ab..a7f1f08d7e 100644
--- a/src/Elastic.Codex/Page/Index.cshtml
+++ b/src/Elastic.Codex/Page/Index.cshtml
@@ -84,8 +84,11 @@
 	{
 		if (name == GlobalSections.Head)
 		{
-			<meta class="elastic" name="product_version" content="@(new HtmlString(Model.CurrentVersion))"/>
-			<meta name="DC.identifier" content="@(new HtmlString(Model.CurrentVersion))"/>
+			@if (Model.CurrentVersion is not null)
+			{
+				<meta class="elastic" name="product_version" content="@(new HtmlString(Model.CurrentVersion))"/>
+				<meta name="DC.identifier" content="@(new HtmlString(Model.CurrentVersion))"/>
+			}
 			<link rel="alternate" type="text/markdown" href="@(Model.MarkdownUrl)" title="Markdown export"/>
 			<script type="application/ld+json">
 	    	@(new HtmlString(Model.StructuredBreadcrumbsJson))
diff --git a/src/Elastic.Markdown/HtmlWriter.cs b/src/Elastic.Markdown/HtmlWriter.cs
index 51cea196f5..f65dfe6860 100644
--- a/src/Elastic.Markdown/HtmlWriter.cs
+++ b/src/Elastic.Markdown/HtmlWriter.cs
@@ -117,7 +117,9 @@ private async Task<RenderResult> RenderLayout(MarkdownFile markdown, MarkdownDoc
 			?? throw new InvalidOperationException($"No versioning system available for page '{markdown.RelativePath}'. " +
 				"Ensure VersionsConfiguration contains a Stack versioning system or the inferred product has a VersioningSystem defined.");
 
-		var currentBaseVersion = $"{pageVersioning.Base.Major}.{pageVersioning.Base.Minor}+";
+		var currentBaseVersion = pageVersioning.IsVersionless
+			? null
+			: $"{pageVersioning.Base.Major}.{pageVersioning.Base.Minor}+";
 
 		//TODO should we even distinctby
 		var breadcrumbs = parents.Reverse().DistinctBy(p => p.Url).ToArray();
diff --git a/src/Elastic.Markdown/Page/Index.cshtml b/src/Elastic.Markdown/Page/Index.cshtml
index b67112bf99..c73cdb6f55 100644
--- a/src/Elastic.Markdown/Page/Index.cshtml
+++ b/src/Elastic.Markdown/Page/Index.cshtml
@@ -67,8 +67,11 @@
 	{
 		if (name == GlobalSections.Head)
 		{
-			<meta class="elastic" name="product_version" content="@(new HtmlString(Model.CurrentVersion))"/>
-			<meta name="DC.identifier" content="@(new HtmlString(Model.CurrentVersion))"/>
+			@if (Model.CurrentVersion is not null)
+			{
+				<meta class="elastic" name="product_version" content="@(new HtmlString(Model.CurrentVersion))"/>
+				<meta name="DC.identifier" content="@(new HtmlString(Model.CurrentVersion))"/>
+			}
 			<link rel="alternate" type="text/markdown" href="@(Model.MarkdownUrl)" title="Markdown export"/>
 			<script type="application/ld+json">
 	    	@(new HtmlString(Model.StructuredBreadcrumbsJson))
diff --git a/src/Elastic.Markdown/Page/IndexViewModel.cs b/src/Elastic.Markdown/Page/IndexViewModel.cs
index 13e116b0e5..f64968f5e1 100644
--- a/src/Elastic.Markdown/Page/IndexViewModel.cs
+++ b/src/Elastic.Markdown/Page/IndexViewModel.cs
@@ -36,7 +36,7 @@ public class IndexViewModel
 
 	public required string NavigationHtml { get; init; }
 
-	public required string CurrentVersion { get; init; }
+	public required string? CurrentVersion { get; init; }
 
 	public required string? AllVersionsUrl { get; init; }
 	public required LegacyPageMapping[]? LegacyPages { get; init; }

From a88ea32b5974bc7a261fe15a80e5801460c9d791 Mon Sep 17 00:00:00 2001
From: Jan Calanog <jan.calanog@elastic.co>
Date: Thu, 2 Apr 2026 17:33:11 +0200
Subject: [PATCH 054/226] Layout: Adapt to static elastic-nav by making
 secondary nav sticky (#3025)

* Layout: Adapt to static elastic-nav by making secondary nav sticky

The global elastic-nav.js (v2026-03) changed the header from fixed to
static positioning. This makes the secondary docs nav sticky at the top
and simplifies --offset-top to match its height.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Layout: Only make secondary nav sticky on md+ viewports

On mobile the sticky secondary nav takes too much vertical space.
Keep it static on small screens (--offset-top: 0) and only sticky
on md+ where it provides persistent navigation.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* chore: Upgrade lodash to 4.18.x to fix high severity vulnerabilities

Fixes code injection via _.template (GHSA-r5fr-rjxr-66jc) and
prototype pollution via _.unset/_.omit (GHSA-f23m-r3pf-42rh).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Layout: Add bottom border to secondary nav

The visual separator was coming from #main-container's border-top,
which scrolls away. Adding border-b to the nav itself keeps the
line visible while sticky.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Layout: Remove border-top from main-container

The secondary nav now has border-b, so the main-container border-t
was causing a double border.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Elastic.ApiExplorer/_Layout.cshtml        |  2 +-
 .../Assets/assembler.css                      | 26 +++---------
 .../Layout/_SecondaryNav.cshtml               |  4 +-
 .../package-lock.json                         | 41 +++++++++++--------
 src/Elastic.Markdown/_Layout.cshtml           |  2 +-
 5 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/src/Elastic.ApiExplorer/_Layout.cshtml b/src/Elastic.ApiExplorer/_Layout.cshtml
index be5eb9bb01..d8dd9ab92f 100644
--- a/src/Elastic.ApiExplorer/_Layout.cshtml
+++ b/src/Elastic.ApiExplorer/_Layout.cshtml
@@ -11,7 +11,7 @@ else
 {
 	@(await RenderPartialAsync(_IsolatedHeader.Create<GlobalLayoutViewModel>(Model)))
 }
-<div id="main-container" class="flex flex-col items-center border-t-1 border-grey-20">
+<div id="main-container" class="flex flex-col items-center">
 	<div class="max-w-(--max-layout-width) w-full h-full grid
 			grid-cols-1
 			md:grid-cols-[var(--max-sidebar-width)_1fr]
diff --git a/src/Elastic.Documentation.Site/Assets/assembler.css b/src/Elastic.Documentation.Site/Assets/assembler.css
index 39ba8e8ea5..b99630104e 100644
--- a/src/Elastic.Documentation.Site/Assets/assembler.css
+++ b/src/Elastic.Documentation.Site/Assets/assembler.css
@@ -1,33 +1,17 @@
 /* Assembler build type specific styles */
 
+/* Elastic global nav is position:static (scrolls with page).
+   The secondary nav (Docs sub-header) is sticky on md+ viewports. */
 :root {
-	/* Assembler uses Elastic global nav with banner - different heights at different breakpoints */
-	--offset-top: calc(64px + 38px); /* header height + banner height */
+	--offset-top: 0px;
 }
 
-@media screen and (min-width: 767px) {
+@media screen and (min-width: 768px) {
 	:root {
-		--offset-top: calc(72px + 38px); /* header height + banner height */
+		--offset-top: calc(var(--spacing) * 18);
 	}
 }
 
-@media screen and (min-width: 992px) {
-	:root {
-		--offset-top: 110px;
-	}
-}
-
-@media screen and (min-width: 1180px) {
-	:root {
-		--offset-top: calc(80px + 38px); /* header height + banner height */
-	}
-}
-
-/* Elastic nav wrapper and nav styles - assembler specific */
-#elastic-nav-wrapper {
-	min-height: var(--offset-top);
-}
-
 /* Air-gapped: uses elastic-docs-header web component instead of elastic nav */
 body.air-gapped {
 	--offset-top: 48px;
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index 0a4d2ef3ca..84f03e90fd 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -1,8 +1,8 @@
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
-<div>
+<div class="md:sticky md:top-0 md:z-30 bg-grey-10">
 	<ask-ai></ask-ai>
 	<nav id="secondary-nav" hx-select-oob="#main-container" hx-swap="none"
-	     class="bg-grey-10 border-grey-20">
+	     class="bg-grey-10 border-b border-grey-20">
 		<div class="
 					w-full
 					max-w-(--max-layout-width) flex mx-auto justify-between items-center
diff --git a/src/Elastic.Documentation.Site/package-lock.json b/src/Elastic.Documentation.Site/package-lock.json
index f79b56fbf5..b6d1a50c76 100644
--- a/src/Elastic.Documentation.Site/package-lock.json
+++ b/src/Elastic.Documentation.Site/package-lock.json
@@ -4059,9 +4059,10 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -25373,10 +25374,12 @@
       }
     },
     "node_modules/archiver-utils/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
         "jackspeak": "^3.1.2",
@@ -28541,9 +28544,10 @@
       }
     },
     "node_modules/jest-config/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -29109,9 +29113,10 @@
       }
     },
     "node_modules/jest-runtime/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -29945,15 +29950,15 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
+      "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
       "license": "MIT"
     },
     "node_modules/lodash-es": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz",
-      "integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz",
+      "integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==",
       "dev": true,
       "license": "MIT"
     },
diff --git a/src/Elastic.Markdown/_Layout.cshtml b/src/Elastic.Markdown/_Layout.cshtml
index 8ca87d96df..b88596eddd 100644
--- a/src/Elastic.Markdown/_Layout.cshtml
+++ b/src/Elastic.Markdown/_Layout.cshtml
@@ -60,7 +60,7 @@
 		@(await RenderPartialAsync(_IsolatedHeader.Create<GlobalLayoutViewModel>(Model)))
 	}
 }
-<div id="main-container" class="@(RenderHeaderAndFooter ? "border-t-1 border-grey-20" : "")">
+<div id="main-container">
 @switch (Model.Layout)
 {
 	case MarkdownPageLayout.NotFound:

From cf5e8e81397b1a4c63ea3fa0907aadf3e3a07497 Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Thu, 2 Apr 2026 09:46:52 -0700
Subject: [PATCH 055/226] [DOCS] Add profile example for --all bundle, fix path
 for changelog syntax docs (#2980)

---
 docs/_docset.yml                              | 18 ++++----
 docs/_redirects.yml                           |  9 ++++
 .../changelog-add.md => changelog/add.md}     |  0
 .../bundle-amend.md}                          |  2 +-
 .../bundle.md}                                | 43 ++++++++++++++-----
 .../evaluate-pr.md}                           |  0
 .../gh-release.md}                            |  2 +-
 docs/cli/changelog/index.md                   | 15 +++++++
 .../changelog-init.md => changelog/init.md}   |  0
 .../remove.md}                                | 10 ++---
 .../render.md}                                |  4 +-
 docs/cli/index.md                             |  2 +-
 docs/cli/release/index.md                     | 15 -------
 docs/contribute/changelog.md                  | 28 ++++++------
 docs/syntax/changelog.md                      | 16 +++----
 .../authoring/Generator/LinkReferenceFile.fs  | 36 ++++++++++++++++
 16 files changed, 134 insertions(+), 66 deletions(-)
 rename docs/cli/{release/changelog-add.md => changelog/add.md} (100%)
 rename docs/cli/{release/changelog-bundle-amend.md => changelog/bundle-amend.md} (98%)
 rename docs/cli/{release/changelog-bundle.md => changelog/bundle.md} (94%)
 rename docs/cli/{release/changelog-evaluate-pr.md => changelog/evaluate-pr.md} (100%)
 rename docs/cli/{release/changelog-gh-release.md => changelog/gh-release.md} (97%)
 create mode 100644 docs/cli/changelog/index.md
 rename docs/cli/{release/changelog-init.md => changelog/init.md} (100%)
 rename docs/cli/{release/changelog-remove.md => changelog/remove.md} (95%)
 rename docs/cli/{release/changelog-render.md => changelog/render.md} (98%)
 delete mode 100644 docs/cli/release/index.md

diff --git a/docs/_docset.yml b/docs/_docset.yml
index c4404e4892..51e6514e5a 100644
--- a/docs/_docset.yml
+++ b/docs/_docset.yml
@@ -185,17 +185,17 @@ toc:
           - file: inbound-links-validate.md
           - file: inbound-links-validate-all.md
           - file: inbound-links-validate-link-reference.md
-      - folder: release
+      - folder: changelog
         children:
           - file: index.md
-          - file: changelog-add.md
-          - file: changelog-bundle.md
-          - file: changelog-bundle-amend.md
-          - file: changelog-evaluate-pr.md
-          - file: changelog-gh-release.md
-          - file: changelog-init.md
-          - file: changelog-remove.md
-          - file: changelog-render.md
+          - file: add.md
+          - file: bundle.md
+          - file: bundle-amend.md
+          - file: evaluate-pr.md
+          - file: gh-release.md
+          - file: init.md
+          - file: remove.md
+          - file: render.md
   - folder: mcp
     children:
       - file: index.md
diff --git a/docs/_redirects.yml b/docs/_redirects.yml
index da0e6e190d..350e9d57b1 100644
--- a/docs/_redirects.yml
+++ b/docs/_redirects.yml
@@ -2,8 +2,17 @@ redirects:
   'migration/freeze/gh-action.md' : 'index.md'
   'migration/freeze/index.md' : 'index.md'
   'cli/mcp.md': 'index.md'
+  'cli/release/changelog-add.md': 'cli/changelog/add.md'
   'cli/release/changelog-evaluate-artifact.md': 'index.md'
+  'cli/release/changelog-evaluate-pr.md': 'cli/changelog/evaluate-pr.md'
+  'cli/release/changelog-bundle.md': 'cli/changelog/bundle.md'
+  'cli/release/changelog-bundle-amend.md': 'cli/changelog/bundle-amend.md'
+  'cli/release/changelog-gh-release.md': 'cli/changelog/gh-release.md'
+  'cli/release/changelog-init.md': 'cli/changelog/init.md'
   'cli/release/changelog-prepare-artifact.md': 'index.md'
+  'cli/release/changelog-remove.md': 'cli/changelog/remove.md'
+  'cli/release/changelog-render.md': 'cli/changelog/render.md'
+  'cli/release/index.md': 'cli/changelog/index.md'
   'testing/redirects/4th-page.md': 'testing/redirects/5th-page.md'
   'testing/redirects/9th-page.md': '!testing/redirects/5th-page.md'
   'testing/redirects/6th-page.md':
diff --git a/docs/cli/release/changelog-add.md b/docs/cli/changelog/add.md
similarity index 100%
rename from docs/cli/release/changelog-add.md
rename to docs/cli/changelog/add.md
diff --git a/docs/cli/release/changelog-bundle-amend.md b/docs/cli/changelog/bundle-amend.md
similarity index 98%
rename from docs/cli/release/changelog-bundle-amend.md
rename to docs/cli/changelog/bundle-amend.md
index 8949eb0a97..f32c740e01 100644
--- a/docs/cli/release/changelog-bundle-amend.md
+++ b/docs/cli/changelog/bundle-amend.md
@@ -3,7 +3,7 @@
 Amend a bundle with additional changelog entries.
 Amend bundles follow a specific naming convention: `{parent-bundle-name}.amend-{N}.yaml` where `{N}` is a sequence number.
 
-To create a bundle, use [](/cli/release/changelog-bundle.md).
+To create a bundle, use [](/cli/changelog/bundle.md).
 For details and examples, go to [](/contribute/changelog.md).
 
 ## Usage
diff --git a/docs/cli/release/changelog-bundle.md b/docs/cli/changelog/bundle.md
similarity index 94%
rename from docs/cli/release/changelog-bundle.md
rename to docs/cli/changelog/bundle.md
index 482cd9db43..882e857dc2 100644
--- a/docs/cli/release/changelog-bundle.md
+++ b/docs/cli/changelog/bundle.md
@@ -2,7 +2,7 @@
 
 Bundle changelog files.
 
-To create the changelogs, use [](/cli/release/changelog-add.md).
+To create the changelogs, use [](/cli/changelog/add.md).
 For details and examples, go to [](/contribute/changelog.md).
 
 ## Usage
@@ -141,7 +141,7 @@ The `--input-products` option determines which changelog files are gathered for
 :   By default, the bundle contains only the file names and checksums.
 
 `--sanitize-private-links`
-:   Optional: Turn on [private link sanitization](/cli/release/changelog-bundle.md#private-link-sanitization).
+:   Optional: Turn on [private link sanitization](#private-link-sanitization).
 :   Pull requests and issues that target repositories marked `private: true` in the `references` section of `assembler.yml` are rewritten as quoted `# PRIVATE:` sentinel strings in the bundle file.
 :   This option requires a resolved bundle: use `--resolve` or set `bundle.resolve: true` in the `changelog.yml`.
 :   If sanitization is enabled and the bundle is not resolved, the command fails.
@@ -372,6 +372,7 @@ If you're using profile-based commands, they're affected by the following fields
 
 `products`
 :   Required when filtering by product metadata (equivalent to the `--input-products` command option).
+:   The value `"* * *"` is equivalent to the `--all` command option.
 :   Not used when the filter comes from a promotion report, URL list file, or `source: github_release` — in those cases the PR or issue list determines what's included and `products` is ignored.
 :   Supports `{version}` and `{lifecycle}` placeholders that are substituted at runtime.
 :   Example: `"elasticsearch {version} {lifecycle}"`
@@ -452,35 +453,46 @@ For example:
 
 ```yaml
 bundle:
+  # Input directory containing changelog YAML files
+  directory: docs/changelog
+  # Output directory for bundles
+  output_directory: docs/releases
+  # Whether to resolve (copy contents) by default
+  resolve: true
   repo: elasticsearch <1>
   owner: elastic
   profiles:
+    # Collect all changelogs
+    release-all:
+      products: "* * *" <2>
+      output: "all.yaml"
     # Find changelogs with any lifecycle and a partial date
     serverless-monthly:
-      products: "cloud-serverless {version}-* *" <2>
+      products: "cloud-serverless {version}-* *" <3>
       output: "serverless-{version}.yaml"
       output_products: "cloud-serverless {version}"
 
     # Find changelogs with a specific lifecycle
     elasticsearch-ga-only:
-      products: "elasticsearch {version} ga" <3>
+      products: "elasticsearch {version} ga" <4>
       output: "elasticsearch-{version}.yaml"
 
     # Infer the lifecycle from the version
     elasticsearch-release:
-      hide_features: <4>
+      hide_features: <5>
         - feature-flag-1
         - feature-flag-2
-      products: "elasticsearch {version} {lifecycle}" <5>
+      products: "elasticsearch {version} {lifecycle}" <6>
       output: "elasticsearch-{version}.yaml"
       output_products: "elasticsearch {version}"
 ```
 
 1. Bundle-level defaults that apply to all profiles. Individual profiles can override these.
-2. Bundles any changelogs that have `product: cloud-serverless`, any lifecycle, and the date partially specified in the command. This is equivalent to the `--input-products` command option's support for wildcards.
-3. Bundles any changelogs that have `product: elasticsearch`, `lifecycle: ga`, and the version specified in the command.
-4. Adds a `hide-features` array in the bundle. This is equivalent to the `--hide-features` command option.
-5. In this case, the lifecycle is inferred from the version string passed as the second command argument (for example, `9.2.0-beta.1` → `beta`).
+2. Collects all changelogs from the `directory`. This is equivalent to the `--all` command.
+3. Collects any changelogs that have `product: cloud-serverless`, any lifecycle, and the date partially specified in the command. This is equivalent to the `--input-products` command option's support for wildcards.
+4. Collects any changelogs that have `product: elasticsearch`, `lifecycle: ga`, and the version specified in the command.
+5. Adds a `hide-features` array in the bundle. This is equivalent to the `--hide-features` command option.
+6. In this case, the lifecycle is inferred from the version string passed as the second command argument (for example, `9.2.0-beta.1` → `beta`).
 
 `output_products: "elasticsearch {version} {lifecycle}"` produces a single, authoritative product entry in the bundle derived from the release tag — for example, tag `v9.2.0` gives `elasticsearch 9.2.0 ga` and tag `v9.2.0-beta.1` gives `elasticsearch 9.2.0 beta`. Without `output_products`, the bundle products array is instead derived from the matched changelog files' own `products` fields, which is the consistent fallback for all profile types. Set `output_products` when you need a single clean product entry that reflects the release identity rather than the diverse metadata across individual changelog files.
 
@@ -488,6 +500,17 @@ bundle:
 The `products` field determines which changelog files are gathered for consideration. **`rules.bundle` still applies** afterward (see the note under [`--input-products`](#options)). Input stage and bundle filtering stage are conceptually separate.
 :::
 
+For profiles that use static patterns (without `{version}` or `{lifecycle}` placeholders), the second argument is still required but serves no functional purpose. You can pass any placeholder value. For example:
+
+```sh
+# Profile with static patterns - second argument unused but required
+docs-builder changelog bundle release-all '*'
+docs-builder changelog bundle release-all 'unused'
+docs-builder changelog bundle release-all 'none'
+```
+
+If you are using the `{version}` placeholder in the `output_products` or `output` fields, you must provide an appropriate value even though it's not used by the `products` filter.
+
 ### Bundle by report or URL list [profile-bundle-report-examples]
 
 You can also create profiles that are equivalent to the `--prs`, `--issues`, and `--report` filter options.
diff --git a/docs/cli/release/changelog-evaluate-pr.md b/docs/cli/changelog/evaluate-pr.md
similarity index 100%
rename from docs/cli/release/changelog-evaluate-pr.md
rename to docs/cli/changelog/evaluate-pr.md
diff --git a/docs/cli/release/changelog-gh-release.md b/docs/cli/changelog/gh-release.md
similarity index 97%
rename from docs/cli/release/changelog-gh-release.md
rename to docs/cli/changelog/gh-release.md
index bf0950c91e..d89984f77b 100644
--- a/docs/cli/release/changelog-gh-release.md
+++ b/docs/cli/changelog/gh-release.md
@@ -55,7 +55,7 @@ The product, target version, and lifecycle are inferred automatically from the r
 
 The `rules.bundle` section of your `changelog.yml` applies to bundles created by this command (after changelog files are gathered from the release).
 Which fields take effect depends on [bundle rule modes](/contribute/changelog.md#bundle-rule-modes).
-For details, refer to [Rules for filtered bundles](/cli/release/changelog-bundle.md#changelog-bundle-rules).
+For details, refer to [Rules for filtered bundles](/cli/changelog/bundle.md#changelog-bundle-rules).
 If you use per-product rule overrides, refer to [Single-product rule resolution (Mode 3 only)](/contribute/changelog.md#changelog-bundle-rule-resolution).
 
 ## Examples
diff --git a/docs/cli/changelog/index.md b/docs/cli/changelog/index.md
new file mode 100644
index 0000000000..7efbfc40fe
--- /dev/null
+++ b/docs/cli/changelog/index.md
@@ -0,0 +1,15 @@
+---
+navigation_title: "changelog"
+---
+
+# Changelog commands
+
+These commands are associated with product release documentation.
+
+- [changelog add](add.md) - Create a changelog file
+- [changelog bundle](bundle.md) - Create a changelog bundle file
+- [changelog gh-release](gh-release.md) - Create changelogs and a bundle from a GitHub release
+- [changelog init](init.md) - Initialize changelog configuration and folder structure
+- [changelog bundle-amend](bundle-amend.md) - Add entries to an existing bundle
+- [changelog render](render.md) - Generate markdown output from changelog bundle files
+- [changelog evaluate-pr](evaluate-pr.md) - (CI) Evaluate a PR for changelog generation eligibility
diff --git a/docs/cli/release/changelog-init.md b/docs/cli/changelog/init.md
similarity index 100%
rename from docs/cli/release/changelog-init.md
rename to docs/cli/changelog/init.md
diff --git a/docs/cli/release/changelog-remove.md b/docs/cli/changelog/remove.md
similarity index 95%
rename from docs/cli/release/changelog-remove.md
rename to docs/cli/changelog/remove.md
index 8972e2fe35..77a58fd405 100644
--- a/docs/cli/release/changelog-remove.md
+++ b/docs/cli/changelog/remove.md
@@ -4,7 +4,7 @@ Remove changelog YAML files from a directory.
 
 You can use either profile-based or command-option-based removal:
 
-- **Profile-based**: `docs-builder changelog remove <profile> <version|promotion-report>` — uses the same `bundle.profiles` configuration as [`changelog bundle`](/cli/release/changelog-bundle.md) to determine which changelogs to remove.
+- **Profile-based**: `docs-builder changelog remove <profile> <version|promotion-report>` — uses the same `bundle.profiles` configuration as [`changelog bundle`](/cli/changelog/bundle.md) to determine which changelogs to remove.
 - **Option-based**: `docs-builder changelog remove --products "..." ` (or `--prs`, `--issues`, `--all`, `--release-version`, `--report`) — specify the filter directly.
 
 These modes are mutually exclusive. You can't combine a profile argument with the command filter options.
@@ -31,7 +31,7 @@ These arguments apply to profile-based removal:
 `[1] <string?>`
 :   Version number, promotion report URL/path, or URL list file.
 :   For example, `9.2.0`, `https://buildkite.../promotion-report.html`, or `/path/to/prs.txt`.
-:   See [Profile argument types](/cli/release/changelog-bundle.md#profile-argument-types) for details on accepted formats.
+:   See [Profile argument types](/cli/changelog/bundle.md#profile-argument-types) for details on accepted formats.
 
 `[2] <string?>`
 :   Optional: Promotion report URL/path or URL list file when the second argument is a version string.
@@ -150,7 +150,7 @@ You can use `--release-version` to fetch pull request references directly from G
 Only automated GitHub release notes (the default format or [Release Drafter](https://github.com/release-drafter/release-drafter) format) are supported at this time.
 :::
 
-This mirrors the equivalent [`--release-version` option on `changelog bundle`](/cli/release/changelog-bundle.md#changelog-bundle-release-version) and is useful when cleaning up after a release-based bundle.
+This mirrors the equivalent [`--release-version` option on `changelog bundle`](/cli/changelog/bundle.md#changelog-bundle-release-version) and is useful when cleaning up after a release-based bundle.
 For example:
 
 ```sh
@@ -223,7 +223,7 @@ You can remove the matching changelogs with:
 docs-builder changelog remove elasticsearch-release 9.2.0 --dry-run
 ```
 
-This removes changelogs for `elasticsearch 9.2.0 ga` — the same set that `docs-builder changelog bundle elasticsearch-release 9.2.0` would include. The lifecycle is inferred from the version string: `9.2.0` → `ga`, `9.2.0-beta.1` → `beta`. Refer to [Lifecycle inference for standard profiles](/cli/release/changelog-bundle.md#changelog-bundle-standard-profile-lifecycle) for details.
+This removes changelogs for `elasticsearch 9.2.0 ga` — the same set that `docs-builder changelog bundle elasticsearch-release 9.2.0` would include. The lifecycle is inferred from the version string: `9.2.0` → `ga`, `9.2.0-beta.1` → `beta`. Refer to [Lifecycle inference for standard profiles](/cli/changelog/bundle.md#changelog-bundle-standard-profile-lifecycle) for details.
 
 ### Remove by report or URL list
 
@@ -283,4 +283,4 @@ docs-builder changelog remove agent-gh-release 1.34.0 --dry-run
 The `repo` and `owner` used to identify the release follow the same precedence as bundling: profile-level `repo`/`owner` override `bundle.repo`/`bundle.owner`, which in turn override the default owner `elastic`.
 :::
 
-For the full list of profile configuration fields, go to [Profile configuration fields](/cli/release/changelog-bundle.md#changelog-bundle-profile-config).
+For the full list of profile configuration fields, go to [Profile configuration fields](/cli/changelog/bundle.md#changelog-bundle-profile-config).
diff --git a/docs/cli/release/changelog-render.md b/docs/cli/changelog/render.md
similarity index 98%
rename from docs/cli/release/changelog-render.md
rename to docs/cli/changelog/render.md
index 54df08f966..81c756e27b 100644
--- a/docs/cli/release/changelog-render.md
+++ b/docs/cli/changelog/render.md
@@ -2,7 +2,7 @@
 
 Generate markdown or asciidoc files from changelog bundle files.
 
-To create the bundle files, use [](/cli/release/changelog-bundle.md).
+To create the bundle files, use [](/cli/changelog/bundle.md).
 For details and examples, go to [](/contribute/changelog.md).
 
 ## Usage
@@ -37,7 +37,7 @@ docs-builder changelog render [options...] [-h|--help]
 :   Paths support tilde (`~`) expansion and relative paths.
 
 :::{note}
-The `render` command automatically discovers and merges `.amend-*.yaml` files with their parent bundle. For more information about amended bundles, go to [](changelog-bundle-amend.md).
+The `render` command automatically discovers and merges `.amend-*.yaml` files with their parent bundle. For more information about amended bundles, go to [](bundle-amend.md).
 :::
 
 `--file-type <string>`
diff --git a/docs/cli/index.md b/docs/cli/index.md
index 044b19b216..55f5242de0 100644
--- a/docs/cli/index.md
+++ b/docs/cli/index.md
@@ -51,4 +51,4 @@ Assembler builds bring together all isolated documentation set builds and turn t
 
 Commands that pertain to creating and publishing product release documentation.
 
-[See available CLI commands for release docs](release/index.md)
+[See available CLI commands for release docs](changelog/index.md)
diff --git a/docs/cli/release/index.md b/docs/cli/release/index.md
deleted file mode 100644
index 4cb8469092..0000000000
--- a/docs/cli/release/index.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-navigation_title: "changelog"
----
-
-# Changelog commands
-
-These commands are associated with product release documentation.
-
-- [changelog add](changelog-add.md) - Create a changelog file
-- [changelog bundle](changelog-bundle.md) - Create a changelog bundle file
-- [changelog gh-release](changelog-gh-release.md) - Create changelogs and a bundle from a GitHub release
-- [changelog init](changelog-init.md) - Initialize changelog configuration and folder structure
-- [changelog bundle-amend](changelog-bundle-amend.md) - Add entries to an existing bundle
-- [changelog render](changelog-render.md) - Generate markdown output from changelog bundle files
-- [changelog evaluate-pr](changelog-evaluate-pr.md) - (CI) Evaluate a PR for changelog generation eligibility
diff --git a/docs/contribute/changelog.md b/docs/contribute/changelog.md
index f34fa5f9bd..379bdce823 100644
--- a/docs/contribute/changelog.md
+++ b/docs/contribute/changelog.md
@@ -24,7 +24,7 @@ To use the `docs-builder changelog` commands in your development workflow:
 1. Optional: Add labels to your GitHub pull requests to indicate that they are not notable and should not generate changelogs. For example, `non-issue` or `release_notes:skip`. Alternatively, you can assume that all PRs are *not* notable unless a specific label is present (for example, `@Public`).
 1. [Configure changelog settings](#changelog-settings) to correctly interpret your PR labels.
 1. [Create changelogs](#changelog-add) with the `docs-builder changelog add` command.
-   - Alternatively, if you already have automated release notes for GitHub releases, you can use the `docs-builder changelog gh-release` command to create changelog files and a bundle from your GitHub release notes. Refer to [](/cli/release/changelog-gh-release.md).
+   - Alternatively, if you already have automated release notes for GitHub releases, you can use the `docs-builder changelog gh-release` command to create changelog files and a bundle from your GitHub release notes. Refer to [](/cli/changelog/gh-release.md).
 1. [Create changelog bundles](#changelog-bundle) with the `docs-builder changelog bundle` command. For example, create a bundle for the pull requests that are included in a product release.
 1. [Create documentation](#render-changelogs) with the `docs-builder changelog render` command.
 
@@ -363,7 +363,7 @@ Ideally this task will be automated such that it's performed by a bot or GitHub
 If you run it from the command line, you must precede any special characters (such as backquotes) with a backslash escape character (`\`).
 :::
 
-For up-to-date command usage information, use the `-h` option or refer to [](/cli/release/changelog-add.md).
+For up-to-date command usage information, use the `-h` option or refer to [](/cli/changelog/add.md).
 
 ### Authorization
 
@@ -506,7 +506,7 @@ docs-builder changelog add \
   --strip-title-prefix
 ```
 
-In this case, the changelog file derives the title, type, areas, and products from the pull request. If none of the PR's labels match `pivot.products`, the command falls back to `products.default` or repository name inference from `--repo` (refer to [Products resolution](/cli/release/changelog-add.md#products-resolution) for more details).
+In this case, the changelog file derives the title, type, areas, and products from the pull request. If none of the PR's labels match `pivot.products`, the command falls back to `products.default` or repository name inference from `--repo` (refer to [Products resolution](/cli/changelog/add.md#products-resolution) for more details).
 The command also looks for patterns like `Fixes #123`, `Closes owner/repo#456`, `Resolves https://github.com/.../issues/789` in the pull request to derive its issues. Similarly, when using `--issues`, the command extracts linked PRs from the issue body (for example, "Fixed by #123"). You can turn off this behavior in either case with the `--no-extract-issues` flag or by setting `extract.issues: false` in the changelog configuration file. The `extract.issues` setting applies to both directions: issues extracted from PR bodies (when using `--prs`) and PRs extracted from issue bodies (when using `--issues`).
 
 The `--strip-title-prefix` option in this example means that if the PR title has a prefix in square brackets (such as `[ES|QL]` or `[Security]`), it is automatically removed from the changelog title. Multiple square bracket prefixes are also supported (for example `[Discover][ESQL] Title` becomes `Title`). If a colon follows the closing bracket, it is also removed.
@@ -629,7 +629,7 @@ The option precedence is: CLI option > `changelog.yml` bundle section > built-in
 :::
 
 You can use the `docs-builder changelog gh-release` command as a one-shot alternative to `changelog add` and `changelog bundle` commands.
-The command parses the release notes, creates one changelog file per pull request found, and creates a `changelog-bundle.yaml` file — all in a single step. Refer to [](/cli/release/changelog-gh-release.md)
+The command parses the release notes, creates one changelog file per pull request found, and creates a `changelog-bundle.yaml` file — all in a single step. Refer to [](/cli/changelog/gh-release.md)
 
 :::{note}
 This command requires a `GITHUB_TOKEN` or `GH_TOKEN` environment variable (or an active `gh` login) to fetch release details from the GitHub API. Refer to [Authorization](#authorization) for details.
@@ -640,7 +640,7 @@ This command requires a `GITHUB_TOKEN` or `GH_TOKEN` environment variable (or an
 You can use the `docs-builder changelog bundle` command to create a YAML file that lists multiple changelogs.
 The command has two modes of operation: you can specify all the command options or you can define "profiles" in the changelog configuration file.
 The latter is more convenient and consistent for repetitive workflows.
-For up-to-date details, use the `-h` option or refer to [](/cli/release/changelog-bundle.md).
+For up-to-date details, use the `-h` option or refer to [](/cli/changelog/bundle.md).
 
 The command supports two mutually exclusive usage modes:
 
@@ -714,7 +714,7 @@ Top-level `bundle` fields:
 | `repo` | Default GitHub repository name applied to all profiles. Falls back to product ID if not set at any level. |
 | `owner` | Default GitHub repository owner applied to all profiles. |
 | `resolve` | When `true`, embeds full changelog entry content in the bundle (same as `--resolve`). Required when `sanitize_private_links` is enabled. |
-| `sanitize_private_links` | When `true`, rewrites PR/issue references that target private repositories (per `assembler.yml` `references`) to quoted `# PRIVATE:` sentinel strings in bundle YAML. Requires `resolve: true` and a non-empty `references` section in `assembler.yml`. Default `false`. Refer to  [Private link sanitization at bundle time](/cli/release/changelog-bundle.md#private-link-sanitization). |
+| `sanitize_private_links` | When `true`, rewrites PR/issue references that target private repositories (per `assembler.yml` `references`) to quoted `# PRIVATE:` sentinel strings in bundle YAML. Requires `resolve: true` and a non-empty `references` section in `assembler.yml`. Default `false`. Refer to  [Private link sanitization at bundle time](/cli/changelog/bundle.md#private-link-sanitization). |
 
 Profile configuration fields in `bundle.profiles`:
 
@@ -950,7 +950,7 @@ You can also combine multiple `--prs` options:
 4. Optionally include the contents of each changelog in the output file.
 
 :::{tip}
-You can use these files with profile-based bundling too. Refer to [](/cli/release/changelog-bundle.md).
+You can use these files with profile-based bundling too. Refer to [](/cli/changelog/bundle.md).
 :::
 
 If you have changelog files that reference those pull requests, the command creates a file like this:
@@ -1001,7 +1001,7 @@ The bundle's product metadata is inferred automatically from the release tag and
 
 :::{tip}
 If you are not creating changelogs when you create your pull requests, consider the `docs-builder changelog gh-release` command as a one-shot alternative to the `changelog add` and `changelog bundle` commands.
-It parses the release notes, creates one changelog file per pull request found, and creates a `changelog-bundle.yaml` file — all in a single step. Refer to [](/cli/release/changelog-gh-release.md)
+It parses the release notes, creates one changelog file per pull request found, and creates a `changelog-bundle.yaml` file — all in a single step. Refer to [](/cli/changelog/gh-release.md)
 :::
 
 ### Hide features [changelog-bundle-hide-features]
@@ -1020,7 +1020,7 @@ docs-builder changelog bundle \
 <!--
 TO-DO: Add info about how to do this in bundle.
 :::{tip}
-You can do this with profile-based bundling too. Refer to [](/cli/release/changelog-bundle.md).
+You can do this with profile-based bundling too. Refer to [](/cli/changelog/bundle.md).
 ::: -->
 
 The bundle output will include a `hide-features` field:
@@ -1048,9 +1048,9 @@ The `--hide-features` option on the `render` command and the `hide-features` fie
 
 A changelog can reference multiple pull requests and issues in the `prs` and `issues` array fields.
 
-To comment out the private links in all changelogs in your bundles, refer to [changelog bundle](/cli/release/changelog-bundle.md#private-link-sanitization).
+To comment out the private links in all changelogs in your bundles, refer to [changelog bundle](/cli/changelog/bundle.md#private-link-sanitization).
 
-If you are working in a private repo and do not want any pull request or issue links to appear (even if they target a public repo), you also have the option to configure link visibiblity in the [changelog directive](/syntax/changelog.md) and [changelog render](/cli/release/changelog-render.md) command.
+If you are working in a private repo and do not want any pull request or issue links to appear (even if they target a public repo), you also have the option to configure link visibiblity in the [changelog directive](/syntax/changelog.md) and [changelog render](/cli/changelog/render.md) command.
 
 :::{tip}
 You must run the `docs-builder changelog bundle` command with the `--resolve` option or set `bundle.resolve` to `true` in the changelog configuration file (so that bundle files are self-contained) in order to hide the private links.
@@ -1068,7 +1068,7 @@ The changelogs from all matching amend files are combined with the parent bundle
 If you explicitly list the amend bundles in the `--input` option of the `docs-builder changelog render` command, you'll get duplicate entries in the output files. List only the original bundles.
 :::
 
-For more details and examples, go to [](/cli/release/changelog-bundle-amend.md).
+For more details and examples, go to [](/cli/changelog/bundle-amend.md).
 
 ## Create documentation
 
@@ -1141,7 +1141,7 @@ All product-specific filtering must be configured at bundle time via `rules.bund
 ### Generate markdown or asciidoc [render-changelogs]
 
 The `docs-builder changelog render` command creates markdown or asciidoc files from changelog bundles for documentation purposes.
-For up-to-date details, use the `-h` command option or refer to [](/cli/release/changelog-render.md).
+For up-to-date details, use the `-h` command option or refer to [](/cli/changelog/render.md).
 
 Before you can use this command you must create changelog files and collect them into bundles.
 For example, the `docs-builder changelog bundle` command creates a file like this:
@@ -1335,4 +1335,4 @@ When using a file for `--prs` or `--issues`, every line must be a fully-qualifie
 docs-builder changelog remove --products "elasticsearch 9.3.0 *" --dry-run
 ```
 
-For full option details, go to [](/cli/release/changelog-remove.md).
+For full option details, go to [](/cli/changelog/remove.md).
diff --git a/docs/syntax/changelog.md b/docs/syntax/changelog.md
index be0651a4ef..a3086b735f 100644
--- a/docs/syntax/changelog.md
+++ b/docs/syntax/changelog.md
@@ -132,10 +132,10 @@ Reserved for future configuration use. The directive does not currently load or
 
 You can filter changelog entries at bundle time using the `rules.bundle` configuration in your `changelog.yml` file. This is evaluated during `changelog bundle` and `changelog gh-release`, before the bundle is written. Entries that don't match are excluded from the bundle entirely.
 
-The `{changelog}` directive and the `changelog render` command both do not apply `rules.publish`. To filter entries, use `rules.bundle` at bundle time so entries are excluded before bundling. Both receive only the bundled entries. See the [changelog bundle documentation](/cli/release/changelog-bundle.md#changelog-bundle-rules) for full syntax.
+The `{changelog}` directive and the `changelog render` command both do not apply `rules.publish`. To filter entries, use `rules.bundle` at bundle time so entries are excluded before bundling. Both receive only the bundled entries. See the [changelog bundle documentation](/cli/changelog/bundle.md#changelog-bundle-rules) for full syntax.
 
 `rules.bundle` supports product, type, and area filtering, and per-product overrides.
-For full syntax, refer to the [rules for filtered bundles](/cli/release/changelog-bundle.md#changelog-bundle-rules).
+For full syntax, refer to the [rules for filtered bundles](/cli/changelog/bundle.md#changelog-bundle-rules).
 
 ## Hiding features
 
@@ -299,12 +299,12 @@ The following renders all changelog bundles from the default `changelog/bundles/
 | Generating static markdown files for external use | `changelog render` command |
 | Selective rendering of specific versions | `changelog render` command |
 
-The `{changelog}` directive is ideal for release notes pages that should always show the complete changelog history. For more selective workflows or external publishing, use the [`changelog render`](../cli/release/changelog-render.md) command.
+The `{changelog}` directive is ideal for release notes pages that should always show the complete changelog history. For more selective workflows or external publishing, use the [`changelog render`](/cli/changelog/render.md) command.
 
 ## Related
 
-- [Create and bundle changelogs](../contribute/changelog.md) — Learn how to create changelog entries and bundles
-- [`changelog add`](../cli/release/changelog-add.md) — CLI command to create changelog entries
-- [`changelog bundle`](../cli/release/changelog-bundle.md) — CLI command to bundle changelog entries
-- [`changelog remove`](../cli/release/changelog-remove.md) — CLI command to remove changelog files
-- [`changelog render`](../cli/release/changelog-render.md) — CLI command to render changelogs to markdown files
+- [Create and bundle changelogs](/contribute/changelog.md) — Learn how to create changelog entries and bundles
+- [`changelog add`](/cli/changelog/add.md) — CLI command to create changelog entries
+- [`changelog bundle`](/cli/changelog/bundle.md) — CLI command to bundle changelog entries
+- [`changelog remove`](/cli/changelog/remove.md) — CLI command to remove changelog files
+- [`changelog render`](/cli/changelog/render.md) — CLI command to render changelogs to markdown files
diff --git a/tests/authoring/Generator/LinkReferenceFile.fs b/tests/authoring/Generator/LinkReferenceFile.fs
index 8b0ae43f52..e5e9b7f1e5 100644
--- a/tests/authoring/Generator/LinkReferenceFile.fs
+++ b/tests/authoring/Generator/LinkReferenceFile.fs
@@ -64,6 +64,15 @@ Through various means $$$including-this-inline-syntax$$$
          },
          "url_path_prefix": "",
          "links": {
+           "cli/changelog/add.md": {},
+           "cli/changelog/bundle-amend.md": {},
+           "cli/changelog/bundle.md": {},
+           "cli/changelog/evaluate-pr.md": {},
+           "cli/changelog/gh-release.md": {},
+           "cli/changelog/index.md": {},
+           "cli/changelog/init.md": {},
+           "cli/changelog/remove.md": {},
+           "cli/changelog/render.md": {},
            "file.md": {},
            "index.md": {
              "anchors": [
@@ -96,12 +105,39 @@ Through various means $$$including-this-inline-syntax$$$
            "cli/mcp.md": {
              "to": "index.md"
            },
+           "cli/release/changelog-add.md": {
+             "to": "cli/changelog/add.md"
+           },
            "cli/release/changelog-evaluate-artifact.md": {
              "to": "index.md"
            },
+           "cli/release/changelog-evaluate-pr.md": {
+             "to": "cli/changelog/evaluate-pr.md"
+           },
+           "cli/release/changelog-bundle.md": {
+             "to": "cli/changelog/bundle.md"
+           },
+           "cli/release/changelog-bundle-amend.md": {
+             "to": "cli/changelog/bundle-amend.md"
+           },
+           "cli/release/changelog-gh-release.md": {
+             "to": "cli/changelog/gh-release.md"
+           },
+           "cli/release/changelog-init.md": {
+             "to": "cli/changelog/init.md"
+           },
            "cli/release/changelog-prepare-artifact.md": {
              "to": "index.md"
            },
+           "cli/release/changelog-remove.md": {
+             "to": "cli/changelog/remove.md"
+           },
+           "cli/release/changelog-render.md": {
+             "to": "cli/changelog/render.md"
+           },
+           "cli/release/index.md": {
+             "to": "cli/changelog/index.md"
+           },
            "testing/redirects/4th-page.md": {
              "to": "testing/redirects/5th-page.md"
            },

From a798bb07da64f7ca1a6de151f5f9511165fd17ac Mon Sep 17 00:00:00 2001
From: Martijn Laarman <Mpdreamz@gmail.com>
Date: Thu, 2 Apr 2026 19:40:48 +0200
Subject: [PATCH 056/226] Deploy: separate read/write scoped filesystems in
 IncrementalDeployService (#3023)

IncrementalDeployService accepted a single ScopedFileSystem used for both
reading and writing. The deploy commands passed RealRead which lacks
AllowedSpecialFolder.Temp, causing ScopedFileSystemException when
AwsS3SyncApplyStrategy stages files in /tmp/ for S3 upload.

Rather than just swapping RealRead for RealWrite, properly separate the
concerns: the service now accepts distinct read and write filesystems,
using each for the appropriate operations (plan file reads vs temp dir
writes). This also fixes the Plan command which was writing its output
file through a read-scoped filesystem.

Made-with: Cursor
---
 .../Deploying/IncrementalDeployService.cs          | 14 +++++++-------
 .../Commands/Assembler/DeployCommands.cs           |  7 ++-----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/services/Elastic.Documentation.Assembler/Deploying/IncrementalDeployService.cs b/src/services/Elastic.Documentation.Assembler/Deploying/IncrementalDeployService.cs
index 6167412be6..3b43039222 100644
--- a/src/services/Elastic.Documentation.Assembler/Deploying/IncrementalDeployService.cs
+++ b/src/services/Elastic.Documentation.Assembler/Deploying/IncrementalDeployService.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.IO.Abstractions;
 using Actions.Core.Services;
 using Amazon.S3;
 using Amazon.S3.Transfer;
@@ -21,14 +20,15 @@ public class IncrementalDeployService(
 	AssemblyConfiguration assemblyConfiguration,
 	IConfigurationContext configurationContext,
 	ICoreService githubActionsService,
-	ScopedFileSystem fileSystem
+	ScopedFileSystem readFileSystem,
+	ScopedFileSystem writeFileSystem
 ) : IService
 {
 	private readonly ILogger _logger = logFactory.CreateLogger<IncrementalDeployService>();
 
 	public async Task<bool> Plan(IDiagnosticsCollector collector, string environment, string s3BucketName, string @out, float? deleteThreshold, Cancel ctx)
 	{
-		var assembleContext = new AssembleContext(assemblyConfiguration, configurationContext, environment, collector, fileSystem, fileSystem, null, null);
+		var assembleContext = new AssembleContext(assemblyConfiguration, configurationContext, environment, collector, readFileSystem, writeFileSystem, null, null);
 		var s3Client = new AmazonS3Client();
 		var planner = new AwsS3SyncPlanStrategy(logFactory, s3Client, s3BucketName, assembleContext);
 		var plan = await planner.Plan(deleteThreshold, ctx);
@@ -51,7 +51,7 @@ public async Task<bool> Plan(IDiagnosticsCollector collector, string environment
 		if (!string.IsNullOrEmpty(@out))
 		{
 			var output = SyncPlan.Serialize(plan);
-			await using var fileStream = fileSystem.File.Create(@out);
+			await using var fileStream = writeFileSystem.File.Create(@out);
 			await using var writer = new StreamWriter(fileStream);
 			await writer.WriteAsync(output);
 			_logger.LogInformation("Plan written to {OutputFile}", @out);
@@ -62,19 +62,19 @@ public async Task<bool> Plan(IDiagnosticsCollector collector, string environment
 
 	public async Task<bool> Apply(IDiagnosticsCollector collector, string environment, string s3BucketName, string planFile, Cancel ctx)
 	{
-		var assembleContext = new AssembleContext(assemblyConfiguration, configurationContext, environment, collector, fileSystem, fileSystem, null, null);
+		var assembleContext = new AssembleContext(assemblyConfiguration, configurationContext, environment, collector, readFileSystem, writeFileSystem, null, null);
 		var s3Client = new AmazonS3Client();
 		var transferUtility = new TransferUtility(s3Client, new TransferUtilityConfig
 		{
 			ConcurrentServiceRequests = Environment.ProcessorCount * 2,
 			MinSizeBeforePartUpload = S3EtagCalculator.PartSize
 		});
-		if (!fileSystem.File.Exists(planFile))
+		if (!readFileSystem.File.Exists(planFile))
 		{
 			collector.EmitError(planFile, "Plan file does not exist.");
 			return false;
 		}
-		var planJson = await fileSystem.File.ReadAllTextAsync(planFile, ctx);
+		var planJson = await readFileSystem.File.ReadAllTextAsync(planFile, ctx);
 		var plan = SyncPlan.Deserialize(planJson);
 		_logger.LogInformation("Remote listing completed: {RemoteListingCompleted}", plan.RemoteListingCompleted);
 		_logger.LogInformation("Total files to sync: {TotalFiles}", plan.TotalSyncRequests);
diff --git a/src/tooling/docs-builder/Commands/Assembler/DeployCommands.cs b/src/tooling/docs-builder/Commands/Assembler/DeployCommands.cs
index 6142177e2f..ac307d213f 100644
--- a/src/tooling/docs-builder/Commands/Assembler/DeployCommands.cs
+++ b/src/tooling/docs-builder/Commands/Assembler/DeployCommands.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.IO.Abstractions;
 using Actions.Core.Services;
 using ConsoleAppFramework;
 using Elastic.Documentation.Assembler.Deploying;
@@ -33,8 +32,7 @@ public async Task<int> Plan(string environment, string s3BucketName, string @out
 	{
 		await using var serviceInvoker = new ServiceInvoker(collector);
 
-		var fs = FileSystemFactory.RealRead;
-		var service = new IncrementalDeployService(logFactory, assemblyConfiguration, configurationContext, githubActionsService, fs);
+		var service = new IncrementalDeployService(logFactory, assemblyConfiguration, configurationContext, githubActionsService, FileSystemFactory.RealRead, FileSystemFactory.RealWrite);
 		serviceInvoker.AddCommand(service, (environment, s3BucketName, @out, deleteThreshold),
 			static async (s, collector, state, ctx) => await s.Plan(collector, state.environment, state.s3BucketName, state.@out, state.deleteThreshold, ctx)
 		);
@@ -51,8 +49,7 @@ public async Task<int> Apply(string environment, string s3BucketName, string pla
 	{
 		await using var serviceInvoker = new ServiceInvoker(collector);
 
-		var fs = FileSystemFactory.RealWrite;
-		var service = new IncrementalDeployService(logFactory, assemblyConfiguration, configurationContext, githubActionsService, fs);
+		var service = new IncrementalDeployService(logFactory, assemblyConfiguration, configurationContext, githubActionsService, FileSystemFactory.RealRead, FileSystemFactory.RealWrite);
 		serviceInvoker.AddCommand(service, (environment, s3BucketName, planFile),
 			static async (s, collector, state, ctx) => await s.Apply(collector, state.environment, state.s3BucketName, state.planFile, ctx)
 		);

From c69e47f52d35c9bf34fa836c187a966bc86785c0 Mon Sep 17 00:00:00 2001
From: Felipe Cotti <felipe.cotti@elastic.co>
Date: Thu, 2 Apr 2026 16:44:04 -0300
Subject: [PATCH 057/226] Add skip-labels to evaluate-pr's output (#3013)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add skip-labels to evaluate-pr's output

* Add tests

* Resolve conflicts

* Fix docs-builder redirect tests (#3008)

* Fix redirect tests

* Remove changelog redirects implemented elsewhere

* Search: Use default semantic_text inference, remove Jina mappings (#3014)

Elasticsearch Serverless now defaults semantic_text to Jina, making
the explicit Jina sub-fields redundant and the ELSER inference ID
unnecessary. This removes both inference ID constants, all .jina
field mappings, and lets semantic_text fields use the platform default.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* chore: Update config/versions.yml eck 3.3.2 (#3019)

Made with ❤️️ by updatecli

Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com>

* Deploy: Use write-scoped filesystem for apply command (#3021)

The deploy apply command used RealRead which lacks AllowedSpecialFolder.Temp,
causing ScopedFileSystemException when AwsS3SyncApplyStrategy stages files
in /tmp/ for S3 upload. Switch to RealWrite which permits temp directory access.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Update Azure EDOT CF version (#3022)

+CC @zmoog

* Enable AOT/trim analyzers on library projects and skip AOT publish on PRs (#2971)

Add IsAotCompatible to 12 library projects referenced by docs-builder so
Roslyn's trim/AOT analyzers (IL2026/IL3050) run during regular builds.
This catches AOT issues at compile time, removing the need for the
expensive native ILC publish step on pull requests.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* HTML: Omit version meta tags for versionless pages (#3020)

* HTML: Omit version meta tags for versionless pages

Versionless pages (serverless, cloud, etc.) were rendering the sentinel
value 99999.0+ in product_version and DC.identifier meta tags. Now these
tags are omitted entirely when the page's versioning system is versionless.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* HTML: Restore required modifier on CurrentVersion property

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Layout: Adapt to static elastic-nav by making secondary nav sticky (#3025)

* Layout: Adapt to static elastic-nav by making secondary nav sticky

The global elastic-nav.js (v2026-03) changed the header from fixed to
static positioning. This makes the secondary docs nav sticky at the top
and simplifies --offset-top to match its height.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Layout: Only make secondary nav sticky on md+ viewports

On mobile the sticky secondary nav takes too much vertical space.
Keep it static on small screens (--offset-top: 0) and only sticky
on md+ where it provides persistent navigation.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* chore: Upgrade lodash to 4.18.x to fix high severity vulnerabilities

Fixes code injection via _.template (GHSA-r5fr-rjxr-66jc) and
prototype pollution via _.unset/_.omit (GHSA-f23m-r3pf-42rh).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Layout: Add bottom border to secondary nav

The visual separator was coming from #main-container's border-top,
which scrolls away. Adding border-b to the nav itself keeps the
line visible while sticky.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Layout: Remove border-top from main-container

The secondary nav now has border-b, so the main-container border-t
was causing a double border.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* lint

---------

Co-authored-by: Lisa Cawley <lcawley@elastic.co>
Co-authored-by: Jan Calanog <jan.calanog@elastic.co>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com>
Co-authored-by: Fabrizio Ferri-Benedetti <fabri.ferribenedetti@elastic.co>
---
 .../ChangelogPrEvaluationService.cs           |  43 ++++-
 .../ChangelogPrEvaluationServiceTests.cs      | 172 ++++++++++++++++++
 2 files changed, 212 insertions(+), 3 deletions(-)

diff --git a/src/services/Elastic.Changelog/Evaluation/ChangelogPrEvaluationService.cs b/src/services/Elastic.Changelog/Evaluation/ChangelogPrEvaluationService.cs
index cc92d1dc51..bfc807a9da 100644
--- a/src/services/Elastic.Changelog/Evaluation/ChangelogPrEvaluationService.cs
+++ b/src/services/Elastic.Changelog/Evaluation/ChangelogPrEvaluationService.cs
@@ -75,10 +75,11 @@ public async Task<bool> EvaluatePr(IDiagnosticsCollector collector, EvaluatePrAr
 		}
 
 		// Label-based skip check
+		var skipLabels = CollectExcludeLabels(config.Rules?.Create);
 		if (PrInfoProcessor.AreAllProductsBlocked(input.PrLabels, config.Rules?.Create))
 		{
 			_logger.LogInformation("Skipping: all products blocked by label rules");
-			return await SetOutputs(PrEvaluationResult.Skipped);
+			return await SetOutputs(PrEvaluationResult.Skipped, skipLabels: skipLabels);
 		}
 
 		// Resolve title: prefer release notes from PR body, fall back to PR title
@@ -142,7 +143,8 @@ public async Task<bool> EvaluatePr(IDiagnosticsCollector collector, EvaluatePrAr
 				PrEvaluationResult.NoLabel, title,
 				resolvedDescription: description,
 				labelTable: BuildLabelTable(config.LabelToType),
-				productLabelTable: productLabelTable
+				productLabelTable: productLabelTable,
+				skipLabels: skipLabels
 			);
 		}
 
@@ -169,7 +171,8 @@ private async Task<bool> SetOutputs(
 		string? labelTable = null,
 		string? productLabelTable = null,
 		string? changelogDir = null,
-		string? existingFilename = null)
+		string? existingFilename = null,
+		string? skipLabels = null)
 	{
 		var statusString = status == PrEvaluationResult.Success
 			? ProceedStatus
@@ -196,10 +199,44 @@ private async Task<bool> SetOutputs(
 			await coreService.SetOutputAsync("changelog-dir", changelogDir);
 		if (existingFilename != null)
 			await coreService.SetOutputAsync("existing-changelog-filename", existingFilename);
+		if (skipLabels != null)
+			await coreService.SetOutputAsync("skip-labels", skipLabels);
 
 		return true;
 	}
 
+	/// <summary>
+	/// Collects all exclude-mode labels from global and per-product create rules.
+	/// Returns a comma-separated string of unique labels, or null when none are configured.
+	/// </summary>
+	internal static string? CollectExcludeLabels(CreateRules? createRules)
+	{
+		if (createRules == null)
+			return null;
+
+		var labels = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+		if (createRules is { Mode: FieldMode.Exclude, Labels.Count: > 0 })
+		{
+			foreach (var label in createRules.Labels)
+				_ = labels.Add(label);
+		}
+
+		if (createRules.ByProduct is { Count: > 0 })
+		{
+			foreach (var (_, productRules) in createRules.ByProduct)
+			{
+				if (productRules is { Mode: FieldMode.Exclude, Labels.Count: > 0 })
+				{
+					foreach (var label in productRules.Labels)
+						_ = labels.Add(label);
+				}
+			}
+		}
+
+		return labels.Count > 0 ? string.Join(",", labels) : null;
+	}
+
 	/// <summary>
 	/// Finds an existing changelog file for the given PR in the changelog directory.
 	/// Returns the filename (not the full path) if found, or null.
diff --git a/tests/Elastic.Changelog.Tests/Evaluation/ChangelogPrEvaluationServiceTests.cs b/tests/Elastic.Changelog.Tests/Evaluation/ChangelogPrEvaluationServiceTests.cs
index 38f626af09..822eedbdf4 100644
--- a/tests/Elastic.Changelog.Tests/Evaluation/ChangelogPrEvaluationServiceTests.cs
+++ b/tests/Elastic.Changelog.Tests/Evaluation/ChangelogPrEvaluationServiceTests.cs
@@ -8,6 +8,8 @@
 using Elastic.Changelog.GitHub;
 using Elastic.Changelog.Tests.Changelogs;
 using Elastic.Documentation.Configuration;
+using Elastic.Documentation.Configuration.Changelog;
+using Elastic.Documentation.ReleaseNotes;
 using FakeItEasy;
 
 namespace Elastic.Changelog.Tests.Evaluation;
@@ -638,4 +640,174 @@ New aggregation pipeline support
 		result.Should().BeTrue();
 		VerifyOutputSet("title", "New aggregation pipeline support");
 	}
+
+	// --- CollectExcludeLabels unit tests ---
+
+	[Fact]
+	public void CollectExcludeLabels_Null_ReturnsNull() =>
+		ChangelogPrEvaluationService.CollectExcludeLabels(null).Should().BeNull();
+
+	[Fact]
+	public void CollectExcludeLabels_NoLabels_ReturnsNull() =>
+		ChangelogPrEvaluationService.CollectExcludeLabels(new CreateRules()).Should().BeNull();
+
+	[Fact]
+	public void CollectExcludeLabels_GlobalExcludeLabels_ReturnsCommaSeparated()
+	{
+		var rules = new CreateRules
+		{
+			Mode = FieldMode.Exclude,
+			Labels = [">non-issue", ">test"]
+		};
+
+		var result = ChangelogPrEvaluationService.CollectExcludeLabels(rules);
+
+		result.Should().NotBeNull();
+		result.Split(',').Should().BeEquivalentTo([">non-issue", ">test"]);
+	}
+
+	[Fact]
+	public void CollectExcludeLabels_IncludeMode_ReturnsNull()
+	{
+		var rules = new CreateRules
+		{
+			Mode = FieldMode.Include,
+			Labels = [">non-issue"]
+		};
+
+		ChangelogPrEvaluationService.CollectExcludeLabels(rules).Should().BeNull();
+	}
+
+	[Fact]
+	public void CollectExcludeLabels_PerProductExcludeOnly_ReturnsLabels()
+	{
+		var rules = new CreateRules
+		{
+			ByProduct = new Dictionary<string, CreateRules>
+			{
+				["cloud-hosted"] = new() { Mode = FieldMode.Exclude, Labels = [">skip-ech"] },
+				["cloud-serverless"] = new() { Mode = FieldMode.Exclude, Labels = [">skip-ess"] }
+			}
+		};
+
+		var result = ChangelogPrEvaluationService.CollectExcludeLabels(rules);
+
+		result.Should().NotBeNull();
+		result.Split(',').Should().BeEquivalentTo([">skip-ech", ">skip-ess"]);
+	}
+
+	[Fact]
+	public void CollectExcludeLabels_GlobalAndPerProduct_MergesUniqueLabels()
+	{
+		var rules = new CreateRules
+		{
+			Mode = FieldMode.Exclude,
+			Labels = [">skip-all", ">shared"],
+			ByProduct = new Dictionary<string, CreateRules>
+			{
+				["cloud-hosted"] = new() { Mode = FieldMode.Exclude, Labels = [">shared", ">skip-ech"] }
+			}
+		};
+
+		var result = ChangelogPrEvaluationService.CollectExcludeLabels(rules);
+
+		result.Should().NotBeNull();
+		result.Split(',').Should().BeEquivalentTo([">skip-all", ">shared", ">skip-ech"]);
+	}
+
+	[Fact]
+	public void CollectExcludeLabels_PerProductIncludeMode_IgnoresIncludeProducts()
+	{
+		var rules = new CreateRules
+		{
+			Mode = FieldMode.Exclude,
+			Labels = [">global"],
+			ByProduct = new Dictionary<string, CreateRules>
+			{
+				["cloud-hosted"] = new() { Mode = FieldMode.Include, Labels = [">include-only"] }
+			}
+		};
+
+		var result = ChangelogPrEvaluationService.CollectExcludeLabels(rules);
+
+		result.Should().NotBeNull();
+		result.Split(',').Should().BeEquivalentTo([">global"]);
+	}
+
+	// --- skip-labels output integration tests ---
+
+	private const string ConfigWithExcludeRules = """
+		pivot:
+		  types:
+		    feature: "type:feature"
+		    bug-fix: "type:bug"
+		    breaking-change: "type:breaking"
+		    enhancement:
+		    deprecation:
+		    docs:
+		    known-issue:
+		    other:
+		    regression:
+		    security:
+		rules:
+		  create:
+		    exclude: ">non-issue, >test"
+		""";
+
+	[Fact]
+	public async Task EvaluatePr_WithExcludeRules_AllBlocked_OutputsSkipLabels()
+	{
+		await WriteMinimalConfig(content: ConfigWithExcludeRules);
+		var service = CreateService();
+		var args = DefaultArgs(prLabels: [">non-issue"]);
+
+		var result = await service.EvaluatePr(Collector, args, CancellationToken.None);
+
+		result.Should().BeTrue();
+		VerifyOutputSet("status", "skipped");
+		A.CallTo(() => _mockCore.SetOutputAsync("skip-labels", A<string>.That.Contains(">non-issue"))).MustHaveHappened();
+		A.CallTo(() => _mockCore.SetOutputAsync("skip-labels", A<string>.That.Contains(">test"))).MustHaveHappened();
+	}
+
+	[Fact]
+	public async Task EvaluatePr_WithExcludeRules_NoLabel_OutputsSkipLabels()
+	{
+		await WriteMinimalConfig(content: ConfigWithExcludeRules);
+		var service = CreateService();
+		var args = DefaultArgs(prLabels: ["unrelated-label"]);
+
+		var result = await service.EvaluatePr(Collector, args, CancellationToken.None);
+
+		result.Should().BeTrue();
+		VerifyOutputSet("status", "no-label");
+		A.CallTo(() => _mockCore.SetOutputAsync("skip-labels", A<string>.That.Contains(">non-issue"))).MustHaveHappened();
+	}
+
+	[Fact]
+	public async Task EvaluatePr_WithoutExcludeRules_DoesNotOutputSkipLabels()
+	{
+		await WriteMinimalConfig();
+		var service = CreateService();
+		var args = DefaultArgs();
+
+		var result = await service.EvaluatePr(Collector, args, CancellationToken.None);
+
+		result.Should().BeTrue();
+		VerifyOutputSet("status", "proceed");
+		A.CallTo(() => _mockCore.SetOutputAsync("skip-labels", A<string>._)).MustNotHaveHappened();
+	}
+
+	[Fact]
+	public async Task EvaluatePr_HappyPath_WithExcludeRules_DoesNotOutputSkipLabels()
+	{
+		await WriteMinimalConfig(content: ConfigWithExcludeRules);
+		var service = CreateService();
+		var args = DefaultArgs(prLabels: ["type:feature"]);
+
+		var result = await service.EvaluatePr(Collector, args, CancellationToken.None);
+
+		result.Should().BeTrue();
+		VerifyOutputSet("status", "proceed");
+		A.CallTo(() => _mockCore.SetOutputAsync("skip-labels", A<string>._)).MustNotHaveHappened();
+	}
 }

From e49938abbf3a6e0b37306f5c742d0516f3f2adfa Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Tue, 7 Apr 2026 15:41:14 +0200
Subject: [PATCH 058/226] fix(markdown): use placeholder rule when detection
 rule TOML cannot be parsed

Made-with: Cursor
---
 .../DetectionRules/DetectionRule.cs           | 31 +++++++++++++++++++
 .../DetectionRules/DetectionRuleFile.cs       |  9 +++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRule.cs b/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRule.cs
index 7a66e4147a..bc3c7c4c1e 100644
--- a/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRule.cs
+++ b/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRule.cs
@@ -5,6 +5,7 @@
 using System.Collections.Frozen;
 using System.Diagnostics.CodeAnalysis;
 using System.IO.Abstractions;
+using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -136,6 +137,36 @@ public static void InitializeVersionLock(IFileSystem fileSystem, IDirectoryInfo?
 		}
 	}
 
+	/// <summary>Fallback when upstream TOML uses constructs Tomlet cannot parse (e.g. newer table-array forms).</summary>
+	public static DetectionRule ForUnparsableSource(IFileInfo source, string parseErrorDetail)
+	{
+		var fullHex = Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(source.FullName)));
+		var idSuffix = fullHex[..8].ToLowerInvariant();
+		return new DetectionRule
+		{
+			Name = Path.GetFileNameWithoutExtension(source.Name),
+			Authors = [],
+			Note = parseErrorDetail,
+			Query = null,
+			Setup = null,
+			Tags = null,
+			Severity = "unknown",
+			RuleId = $"unparsed-{idSuffix}",
+			RiskScore = 0,
+			License = "Elastic-2.0",
+			Description = "This detection rule file could not be parsed as TOML during the documentation build.",
+			Type = "unknown",
+			Language = null,
+			Indices = null,
+			RunsEvery = null,
+			IndicesFromDateMath = null,
+			MaximumAlertsPerExecution = 100,
+			References = null,
+			Version = 1,
+			Threats = []
+		};
+	}
+
 	[SuppressMessage("Reliability", "CA2012:Use ValueTasks correctly")]
 	public static DetectionRule From(IFileInfo source)
 	{
diff --git a/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRuleFile.cs b/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRuleFile.cs
index 059fe728e7..3c28f0f8aa 100644
--- a/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRuleFile.cs
+++ b/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRuleFile.cs
@@ -97,7 +97,14 @@ BuildContext build
 	{
 		RuleSourceMarkdownPath = SourcePath(sourceFile, build);
 		LinkReferenceRelativePath = Path.GetRelativePath(build.DocumentationSourceDirectory.FullName, RuleSourceMarkdownPath.FullName);
-		Rule = DetectionRule.From(sourceFile);
+		try
+		{
+			Rule = DetectionRule.From(sourceFile);
+		}
+		catch (Exception ex)
+		{
+			Rule = DetectionRule.ForUnparsableSource(sourceFile, ex.InnerException?.Message ?? ex.Message);
+		}
 	}
 
 	private static IFileInfo SourcePath(IFileInfo rulePath, BuildContext build)

From 822bba0d7dc3d63b08d3bed4fb7034cf749472da Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Tue, 7 Apr 2026 15:41:14 +0200
Subject: [PATCH 059/226] fix(site): use #pages-nav for cross-group HTMX OOB
 and omit preload when empty

Made-with: Cursor
---
 .../Assets/web-components/shared/htmx/utils.ts            | 4 ++--
 src/Elastic.Documentation.Site/Htmx.cs                    | 8 +++++---
 src/Elastic.Documentation.Site/IHtmxAttributeProvider.cs  | 2 ++
 .../Assembler/AssemblerHtmxMarkdownLinkTests.cs           | 6 +++---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/web-components/shared/htmx/utils.ts b/src/Elastic.Documentation.Site/Assets/web-components/shared/htmx/utils.ts
index 6caba2af75..3ecdc23a26 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/shared/htmx/utils.ts
+++ b/src/Elastic.Documentation.Site/Assets/web-components/shared/htmx/utils.ts
@@ -19,7 +19,7 @@ const getHxSelectOob = (targetUrl: string, currentPathname: string): string => {
     const base =
         currentSegment === targetSegment
             ? '#content-container,#toc-nav'
-            : '#content-container,#toc-nav,#nav-tree,#nav-dropdown'
+            : '#content-container,#toc-nav,#pages-nav'
     return config.buildType === 'codex' ? `${base},#codex-breadcrumbs` : base
 }
 
@@ -29,7 +29,7 @@ const getHxSelectOob = (targetUrl: string, currentPathname: string): string => {
  *
  * - For simple swap paths (landing, /docs/api/*, /g/*): swap only #main-container
  * - For same top-level group: swap #content-container,#toc-nav
- * - For different top-level group: swap #content-container,#toc-nav,#nav-tree,#nav-dropdown
+ * - For different top-level group: swap #content-container,#toc-nav,#pages-nav
  */
 export const applyHtmxAttributes = (
     anchor: HTMLAnchorElement,
diff --git a/src/Elastic.Documentation.Site/Htmx.cs b/src/Elastic.Documentation.Site/Htmx.cs
index b4fe31adf2..f460f899e0 100644
--- a/src/Elastic.Documentation.Site/Htmx.cs
+++ b/src/Elastic.Documentation.Site/Htmx.cs
@@ -16,7 +16,7 @@ public class DefaultHtmxAttributeProvider(string rootPath) : IHtmxAttributeProvi
 	public virtual string GetHxSelectOob(bool hasSameTopLevelGroup) =>
 		hasSameTopLevelGroup
 			? "#content-container,#toc-nav"
-			: "#content-container,#toc-nav,#nav-tree,#nav-dropdown";
+			: "#content-container,#toc-nav,#pages-nav";
 
 	public string GetHxAttributes(
 		bool hasSameTopLevelGroup = false,
@@ -26,7 +26,8 @@ public string GetHxAttributes(
 	{
 		var attributes = new StringBuilder();
 		_ = attributes.Append($" hx-select-oob={hxSwapOob ?? GetHxSelectOob(hasSameTopLevelGroup)}");
-		_ = attributes.Append($" preload={preload}");
+		if (!string.IsNullOrEmpty(preload))
+			_ = attributes.Append($" preload={preload}");
 		return attributes.ToString();
 	}
 
@@ -34,7 +35,8 @@ public string GetNavHxAttributes(bool hasSameTopLevelGroup = false, string? prel
 	{
 		var attributes = new StringBuilder();
 		_ = attributes.Append($" hx-select-oob={GetHxSelectOob(hasSameTopLevelGroup)}");
-		_ = attributes.Append($" preload={preload}");
+		if (!string.IsNullOrEmpty(preload))
+			_ = attributes.Append($" preload={preload}");
 		return attributes.ToString();
 	}
 }
diff --git a/src/Elastic.Documentation.Site/IHtmxAttributeProvider.cs b/src/Elastic.Documentation.Site/IHtmxAttributeProvider.cs
index 9924a221ee..657a52e1da 100644
--- a/src/Elastic.Documentation.Site/IHtmxAttributeProvider.cs
+++ b/src/Elastic.Documentation.Site/IHtmxAttributeProvider.cs
@@ -14,8 +14,10 @@ public interface IHtmxAttributeProvider
 	string GetHxSelectOob(bool hasSameTopLevelGroup);
 
 	/// <summary>Gets HTMX attributes for a link.</summary>
+	/// <param name="preload">htmx-ext-preload trigger (e.g. mousedown). Null or empty omits preload (avoids duplicate GET with the real navigation request).</param>
 	string GetHxAttributes(bool hasSameTopLevelGroup = false, string? preload = "mousedown", string? hxSwapOob = null);
 
 	/// <summary>Gets HTMX attributes for navigation links.</summary>
+	/// <param name="preload">Same as <see cref="GetHxAttributes"/>; pass null for sidebar V2 links to disable preload.</param>
 	string GetNavHxAttributes(bool hasSameTopLevelGroup = false, string? preload = "mousedown");
 }
diff --git a/tests/Elastic.Markdown.Tests/Assembler/AssemblerHtmxMarkdownLinkTests.cs b/tests/Elastic.Markdown.Tests/Assembler/AssemblerHtmxMarkdownLinkTests.cs
index 9698c3f306..d031a35420 100644
--- a/tests/Elastic.Markdown.Tests/Assembler/AssemblerHtmxMarkdownLinkTests.cs
+++ b/tests/Elastic.Markdown.Tests/Assembler/AssemblerHtmxMarkdownLinkTests.cs
@@ -29,7 +29,7 @@ protected override BuildContext CreateBuildContext(
 
 	[Fact]
 	public void CrossLink_UsesGranularSwap_ForAssembler() =>
-		Html.Should().Contain("hx-select-oob=\"#content-container,#toc-nav,#nav-tree,#nav-dropdown\"");
+		Html.Should().Contain("hx-select-oob=\"#content-container,#toc-nav,#pages-nav\"");
 
 	[Fact]
 	public void CrossLink_HasPreload() =>
@@ -98,7 +98,7 @@ protected override BuildContext CreateBuildContext(
 	public void AbsolutePathLink_GetsHtmxAttributes_ForAssembler()
 	{
 		// Assembler: absolute path links get HTMX (granular swap when hasSameTopLevelGroup is false)
-		Html.Should().Contain("hx-select-oob=\"#content-container,#toc-nav,#nav-tree,#nav-dropdown\"");
+		Html.Should().Contain("hx-select-oob=\"#content-container,#toc-nav,#pages-nav\"");
 		Html.Should().Contain("preload=\"mousedown\"");
 	}
 
@@ -158,7 +158,7 @@ protected override BuildContext CreateBuildContext(
 
 	[Fact]
 	public void EmptyTextCrossLink_UsesGranularSwap_ForAssembler() =>
-		Html.Should().Contain("hx-select-oob=\"#content-container,#toc-nav,#nav-tree,#nav-dropdown\"");
+		Html.Should().Contain("hx-select-oob=\"#content-container,#toc-nav,#pages-nav\"");
 
 	[Fact]
 	public void EmptyTextCrossLink_NoTargetBlank() =>

From 287adac00ce224cbe09b719fe53cb158870ebb33 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Tue, 7 Apr 2026 15:41:14 +0200
Subject: [PATCH 060/226] feat(site): enable navigation V2 shell for isolated
 documentation serve

Made-with: Cursor
---
 .../Navigation/IsolatedBuildNavigationHtmlWriter.cs           | 4 +++-
 src/tooling/docs-builder/Http/DocumentationWebHost.cs         | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Elastic.Documentation.Site/Navigation/IsolatedBuildNavigationHtmlWriter.cs b/src/Elastic.Documentation.Site/Navigation/IsolatedBuildNavigationHtmlWriter.cs
index 7c34fcee6f..6614277e8e 100644
--- a/src/Elastic.Documentation.Site/Navigation/IsolatedBuildNavigationHtmlWriter.cs
+++ b/src/Elastic.Documentation.Site/Navigation/IsolatedBuildNavigationHtmlWriter.cs
@@ -72,7 +72,9 @@ private NavigationViewModel CreateNavigationModel(IRootNavigationItem<INavigatio
 			IsGlobalAssemblyBuild = false,
 			TopLevelItems = navigation.NavigationItems.OfType<INodeNavigationItem<INavigationModel, INavigationItem>>().ToList(),
 			Htmx = htmx,
-			BuildType = context.BuildType
+			BuildType = context.BuildType,
+			// Isolated serve (e.g. port 3000): reuse V2 sidebar markup/CSS/JS for local styling; tree is still docset TOC only.
+			IsNavV2 = context.BuildType == BuildType.Isolated
 		};
 	}
 
diff --git a/src/tooling/docs-builder/Http/DocumentationWebHost.cs b/src/tooling/docs-builder/Http/DocumentationWebHost.cs
index 9fe23eda14..93a8e5c149 100644
--- a/src/tooling/docs-builder/Http/DocumentationWebHost.cs
+++ b/src/tooling/docs-builder/Http/DocumentationWebHost.cs
@@ -71,6 +71,7 @@ bool isWatchBuild
 		Context = new BuildContext(collector, readFs, writeFs, configurationContext, ExportOptions.Default, path, null)
 		{
 			CanonicalBaseUrl = new Uri(hostUrl),
+			BuildType = BuildType.Isolated,
 		};
 
 		// Enable diagnostics panel in serve mode

From 5debd277dfe3b10c99213ce2f48e832171263ddb Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Tue, 7 Apr 2026 15:41:14 +0200
Subject: [PATCH 061/226] fix(docs-builder): serve dev Site _static for
 assembler serve; bust static hash on file change

Made-with: Cursor
---
 .../StaticFileContentHashProvider.cs          | 13 +--
 .../docs-builder/Http/StaticWebHost.cs        | 80 ++++++++++++++-----
 2 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/src/Elastic.Documentation.Site/FileProviders/StaticFileContentHashProvider.cs b/src/Elastic.Documentation.Site/FileProviders/StaticFileContentHashProvider.cs
index 20a995bd6d..8b8b9bf777 100644
--- a/src/Elastic.Documentation.Site/FileProviders/StaticFileContentHashProvider.cs
+++ b/src/Elastic.Documentation.Site/FileProviders/StaticFileContentHashProvider.cs
@@ -8,22 +8,23 @@ namespace Elastic.Documentation.Site.FileProviders;
 
 public class StaticFileContentHashProvider(EmbeddedOrPhysicalFileProvider fileProvider)
 {
-	private readonly ConcurrentDictionary<string, string> _contentHashes = [];
+	private readonly ConcurrentDictionary<string, (string Hash, DateTimeOffset LastModified)> _contentHashes = [];
 
 	public string GetContentHash(string path)
 	{
-		if (_contentHashes.TryGetValue(path, out var contentHash))
-			return contentHash;
-
 		var fileInfo = fileProvider.GetFileInfo(path);
 
 		if (!fileInfo.Exists)
 			return string.Empty;
 
+		if (_contentHashes.TryGetValue(path, out var cached) && cached.LastModified == fileInfo.LastModified)
+			return cached.Hash;
+
 		using var stream = fileInfo.CreateReadStream();
 		using var sha = System.Security.Cryptography.SHA256.Create();
 		var fullHash = sha.ComputeHash(stream);
-		_contentHashes[path] = Convert.ToHexString(fullHash).ToLowerInvariant()[..16];
-		return _contentHashes[path];
+		var hash = Convert.ToHexString(fullHash).ToLowerInvariant()[..16];
+		_contentHashes[path] = (hash, fileInfo.LastModified);
+		return hash;
 	}
 }
diff --git a/src/tooling/docs-builder/Http/StaticWebHost.cs b/src/tooling/docs-builder/Http/StaticWebHost.cs
index 788509e6bc..06d16b0da2 100644
--- a/src/tooling/docs-builder/Http/StaticWebHost.cs
+++ b/src/tooling/docs-builder/Http/StaticWebHost.cs
@@ -111,6 +111,12 @@ private async Task<IResult> ServeDocumentationFile(string slug, Cancel _)
 			return Results.NotFound();
 
 		await Task.CompletedTask;
+
+#if DEBUG
+		if (TryResolveDevSiteStaticFile(slug, out var devStatic))
+			return Results.File(devStatic.FullName, GetStaticMimeType(devStatic.Extension));
+#endif
+
 		var contentRoot = Path.GetFullPath(_contentRoot);
 		var localPath = Path.GetFullPath(Path.Join(contentRoot, slug.Replace('/', Path.DirectorySeparatorChar)));
 		if (!localPath.StartsWith(contentRoot + Path.DirectorySeparatorChar, StringComparison.Ordinal))
@@ -121,28 +127,60 @@ private async Task<IResult> ServeDocumentationFile(string slug, Cancel _)
 			fileInfo = new FileInfo(Path.Join(directoryInfo.FullName, "index.html"));
 
 		if (fileInfo.Exists)
-		{
-			var mimetype = fileInfo.Extension switch
-			{
-				".js" => "text/javascript",
-				".css" => "text/css",
-				".png" => "image/png",
-				".jpg" => "image/jpeg",
-				".gif" => "image/gif",
-				".svg" => "image/svg+xml",
-				".ico" => "image/x-icon",
-				".json" => "application/json",
-				".map" => "application/json",
-				".txt" => "text/plain",
-				".xml" => "text/xml",
-				".yml" => "text/yaml",
-				".md" => "text/markdown",
-				_ => "text/html"
-			};
-			return Results.File(fileInfo.FullName, mimetype);
-		}
-
+			return Results.File(fileInfo.FullName, GetStaticMimeType(fileInfo.Extension));
 
 		return Results.NotFound();
 	}
+
+	private static string GetStaticMimeType(string extension) =>
+		extension switch
+		{
+			".js" => "text/javascript",
+			".css" => "text/css",
+			".png" => "image/png",
+			".jpg" => "image/jpeg",
+			".gif" => "image/gif",
+			".svg" => "image/svg+xml",
+			".ico" => "image/x-icon",
+			".json" => "application/json",
+			".map" => "application/json",
+			".txt" => "text/plain",
+			".xml" => "text/xml",
+			".yml" => "text/yaml",
+			".md" => "text/markdown",
+			_ => "text/html"
+		};
+
+#if DEBUG
+	/// <summary>
+	/// <c>assembler serve</c> reads pre-built HTML from <c>.artifacts/assembly</c>; static assets there lag behind
+	/// <c>src/Elastic.Documentation.Site/_static</c> until <c>assembler build</c> runs. In Debug, prefer the live Parcel output when present.
+	/// </summary>
+	private static bool TryResolveDevSiteStaticFile(string slug, out FileInfo devStatic)
+	{
+		devStatic = null!;
+		const string marker = "_static/";
+		var idx = slug.IndexOf(marker, StringComparison.Ordinal);
+		if (idx < 0)
+			return false;
+
+		var solutionRoot = Paths.GetSolutionDirectory();
+		if (solutionRoot is null)
+			return false;
+
+		var relativeWithinStatic = slug[(idx + marker.Length)..].Replace('/', Path.DirectorySeparatorChar);
+		var devStaticRoot = Path.GetFullPath(Path.Join(solutionRoot.FullName, "src", "Elastic.Documentation.Site", "_static"));
+		var candidatePath = Path.GetFullPath(Path.Join(devStaticRoot, relativeWithinStatic));
+		var devPrefix = devStaticRoot + Path.DirectorySeparatorChar;
+		if (!candidatePath.StartsWith(devPrefix, StringComparison.Ordinal) && !string.Equals(candidatePath, devStaticRoot, StringComparison.Ordinal))
+			return false;
+
+		var candidate = new FileInfo(candidatePath);
+		if (!candidate.Exists)
+			return false;
+
+		devStatic = candidate;
+		return true;
+	}
+#endif
 }

From a521e8bd8cd209ac01c59b4a2e39e87b9e594a3a Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Tue, 7 Apr 2026 15:41:14 +0200
Subject: [PATCH 062/226] feat(site): refine navigation V2 sidebar spacing,
 typography, and hover states

Made-with: Cursor
---
 src/Elastic.Documentation.Site/Assets/main.ts |  22 ++-
 .../Assets/pages-nav-v2.ts                    | 183 +++++++++++-------
 .../Assets/styles.css                         | 120 ++++++++----
 .../Navigation/_TocTreeNavV2.cshtml           |  41 ++--
 .../package-lock.json                         |  36 +++-
 5 files changed, 258 insertions(+), 144 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/main.ts b/src/Elastic.Documentation.Site/Assets/main.ts
index 858c40e98e..cc0fc57cff 100644
--- a/src/Elastic.Documentation.Site/Assets/main.ts
+++ b/src/Elastic.Documentation.Site/Assets/main.ts
@@ -101,13 +101,7 @@ function initMath() {
     })
 }
 
-// Initialize on initial page load
-document.addEventListener('DOMContentLoaded', function () {
-    initMath()
-    initMermaid()
-})
-
-document.addEventListener('htmx:load', function () {
+function initPageAfterContentSwap() {
     initTocNav()
     initHighlight()
     initCopyButton()
@@ -132,6 +126,20 @@ document.addEventListener('htmx:load', function () {
     if (editParam) {
         $('.edit-this-page.hidden')?.classList.remove('hidden')
     }
+}
+
+// htmx defers the initial htmx:load to setTimeout(0); prime V2 sidebar on first paint so isolated serve shows behaviour before that tick.
+document.addEventListener('DOMContentLoaded', function () {
+    initMath()
+    initMermaid()
+    const v2Nav = document.querySelector<HTMLElement>('[data-nav-v2]')
+    if (v2Nav) {
+        initNavV2(v2Nav)
+    }
+})
+
+document.addEventListener('htmx:load', function () {
+    initPageAfterContentSwap()
 })
 
 // Don't remove style tags because they are used by the elastic global nav.
diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 5d6a54ecd5..6dc3df3d40 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -5,7 +5,7 @@ import type { Instance } from 'tippy.js'
 const navV2CollapsedStorageKey = 'docs-builder-nav-v2-collapsed-ids'
 
 let navV2FolderLinkToggleBound = false
-let navV2OutsideCollapseBound = false
+let navV2OptimisticNavigateBound = false
 
 let navV2TruncationTippyInstances: Instance[] = []
 
@@ -51,6 +51,11 @@ function normalizeDocPathname(pathname: string) {
     return p === '' ? '/' : p
 }
 
+/** Matches {@link markCurrentPage} / {@link expandToCurrentPage} href selectors (not root-normalized). */
+function stripTrailingSlashForNavHref(pathname: string) {
+    return pathname.replace(/\/$/, '')
+}
+
 function linkPathMatchesCurrentPage(anchor: HTMLAnchorElement) {
     const href = anchor.getAttribute('href')
     if (!href) {
@@ -128,77 +133,78 @@ function ensureNavV2FolderLinkToggle() {
     )
 }
 
-/** True if this folder row's li contains the click or an ancestor folder li (same branch) does. */
-function folderStaysOpenForNavClick(
-    folderLi: Element,
-    target: Node,
-    nav: Element
-): boolean {
-    if (folderLi.contains(target)) {
-        return true
-    }
-
-    let node: Element | null = folderLi.parentElement
-    while (node && node !== nav) {
-        if (node.matches('li.group-navigation') && node.contains(target)) {
-            return true
-        }
-        node = node.parentElement
-    }
-
-    return false
-}
-
 /**
- * Collapse expanded folders when the click is outside their branch (not under an ancestor folder row
- * in the same hierarchy). Runs in capture phase after {@link ensureNavV2FolderLinkToggle}.
+ * Apply current + subtree highlight from the clicked href before HTMX finishes (hx-boost),
+ * so the sidebar does not wait for the network response to update.
  */
-function ensureNavV2CollapseOutsideExpandedFolders() {
-    if (navV2OutsideCollapseBound) {
+function ensureNavV2OptimisticCurrentOnNavigate() {
+    if (navV2OptimisticNavigateBound) {
         return
     }
 
-    navV2OutsideCollapseBound = true
+    navV2OptimisticNavigateBound = true
 
     document.addEventListener(
         'click',
         (e: MouseEvent) => {
-            if (!(e.target instanceof Node)) {
+            if (!(e.target instanceof Element)) {
                 return
             }
 
-            if (e.button !== 0) {
+            if (
+                e.defaultPrevented ||
+                e.button !== 0 ||
+                e.metaKey ||
+                e.ctrlKey ||
+                e.shiftKey ||
+                e.altKey
+            ) {
                 return
             }
 
-            const nav = document.querySelector<HTMLElement>('[data-nav-v2]')
+            const a = e.target.closest(
+                'nav[data-nav-v2] a.sidebar-link'
+            ) as HTMLAnchorElement | null
+
+            if (!a || a.hasAttribute('hx-disable')) {
+                return
+            }
+
+            const nav = a.closest('[data-nav-v2]') as HTMLElement | null
             if (!nav) {
                 return
             }
 
-            // Clicks on top-level section titles should not close nested open folders.
-            if (
-                e.target instanceof Element &&
-                e.target.closest(
-                    'nav[data-nav-v2] .docs-sidebar-nav-v2__label--top'
-                )
-            ) {
+            const li = a.closest('li.group-navigation')
+            const folderRowInLi =
+                li?.querySelector<HTMLAnchorElement>(
+                    ':scope > .nav-folder-peer > a.sidebar-link'
+                ) ?? null
+            if (folderRowInLi === a && linkPathMatchesCurrentPage(a)) {
                 return
             }
 
-            const target = e.target
-            nav.querySelectorAll<HTMLInputElement>(
-                'li.group-navigation input[type="checkbox"]:checked'
-            ).forEach((cb) => {
-                const li = cb.closest('li.group-navigation')
-                if (!li || folderStaysOpenForNavClick(li, target, nav)) {
-                    return
-                }
+            const href = a.getAttribute('href')
+            if (!href) {
+                return
+            }
 
-                cb.checked = false
-                cb.dispatchEvent(new Event('change', { bubbles: true }))
-                persistFolderCheckboxCollapsedState(cb)
-            })
+            let path: string
+            try {
+                path = new URL(href, window.location.href).pathname
+            } catch {
+                return
+            }
+
+            const here = window.location.pathname.replace(/\/$/, '')
+            const pathStripped = path.replace(/\/$/, '')
+            if (pathStripped === here) {
+                return
+            }
+
+            markCurrentPageForPath(nav, path)
+            expandToCurrentPageForPath(nav, path)
+            applyActiveSubtreeHighlight(nav)
         },
         true
     )
@@ -237,6 +243,11 @@ function initAccordion(nav: HTMLElement) {
     nav.querySelectorAll<HTMLInputElement>(
         '[data-v2-accordion] > .peer input[type=checkbox]'
     ).forEach((cb) => {
+        if (cb.dataset.navV2AccordionBound === 'true') {
+            return
+        }
+
+        cb.dataset.navV2AccordionBound = 'true'
         cb.addEventListener('change', (e) => {
             const target = e.target as HTMLInputElement
             if (target.checked) {
@@ -250,13 +261,12 @@ function initAccordion(nav: HTMLElement) {
 
 function clearActiveSubtreeHighlight(nav: HTMLElement) {
     nav.querySelectorAll(
-        '.nav-v2-active-subtree, .nav-v2-active-leaf, .nav-v2-active-ancestor, .nav-v2-active-label-ancestor'
+        '.nav-v2-active-subtree, .nav-v2-active-leaf, .nav-v2-active-ancestor'
     ).forEach((el) => {
         el.classList.remove(
             'nav-v2-active-subtree',
             'nav-v2-active-leaf',
-            'nav-v2-active-ancestor',
-            'nav-v2-active-label-ancestor'
+            'nav-v2-active-ancestor'
         )
     })
 }
@@ -336,8 +346,7 @@ function applyActiveSubtreeHighlight(nav: HTMLElement) {
 
     /*
      * Walk DOM ancestors: folder rows (li.group-navigation) whose own link is not .current
-     * get nav-v2-active-ancestor (CSS: font-weight like .current; default link color). Section
-     * titles (label--top / label--nested) are not links and must not receive ancestor styling.
+     * get nav-v2-active-ancestor (CSS: semibold + #1D2A3E on clickable rows only).
      */
     let walk: Element | null = hostLi
     while (walk && walk !== nav) {
@@ -355,29 +364,55 @@ function applyActiveSubtreeHighlight(nav: HTMLElement) {
 }
 
 /**
- * Mark the current page's nav link with the "current" CSS class.
+ * Mark all nav links whose href matches {@code pathname} with the "current" CSS class.
  */
-function markCurrentPage(nav: HTMLElement) {
-    // Remove stale current markers
+function markCurrentPageForPath(nav: HTMLElement, pathnameRaw: string) {
     $$('.current', nav).forEach((el) => el.classList.remove('current'))
 
-    const pathname = window.location.pathname.replace(/\/$/, '')
+    const pathname = stripTrailingSlashForNavHref(pathnameRaw)
     $$(`a[href="${pathname}"], a[href="${pathname}/"]`, nav).forEach((el) =>
         el.classList.add('current')
     )
 }
 
 /**
- * Expand all ancestor collapsible sections that contain the current page link,
- * so that navigating directly to a URL reveals its location in the sidebar.
- * Does not re-open a folder row that the user collapsed while that folder index
- * is the current page (see session storage + folder row link match).
+ * Mark the current page's nav link with the "current" CSS class.
  */
-function expandToCurrentPage(nav: HTMLElement) {
-    const pathname = window.location.pathname.replace(/\/$/, '')
-    const link = nav.querySelector<HTMLElement>(
+function markCurrentPage(nav: HTMLElement) {
+    markCurrentPageForPath(nav, window.location.pathname)
+}
+
+function pickDeepestAnchorMatchingPath(
+    nav: HTMLElement,
+    pathnameRaw: string
+): HTMLElement | null {
+    const pathname = stripTrailingSlashForNavHref(pathnameRaw)
+    const matches = nav.querySelectorAll<HTMLElement>(
         `a[href="${pathname}"], a[href="${pathname}/"]`
     )
+    if (matches.length === 0) {
+        return null
+    }
+
+    let best = matches[0]
+    let bestDepth = navListItemDepthFromAnchor(best, nav)
+    for (let i = 1; i < matches.length; i++) {
+        const m = matches[i]
+        const d = navListItemDepthFromAnchor(m, nav)
+        if (d > bestDepth) {
+            bestDepth = d
+            best = m
+        }
+    }
+    return best
+}
+
+/**
+ * Expand all ancestor collapsible sections that contain the link for {@code pathnameRaw}.
+ * Uses the deepest matching anchor when several share the URL.
+ */
+function expandToCurrentPageForPath(nav: HTMLElement, pathnameRaw: string) {
+    const link = pickDeepestAnchorMatchingPath(nav, pathnameRaw)
     if (!link) {
         return
     }
@@ -398,7 +433,11 @@ function expandToCurrentPage(nav: HTMLElement) {
                     rowLink !== null && rowLink === link
 
                 if (collapsedIds.has(cb.id)) {
-                    if (!currentIsThisFolderRow) {
+                    if (currentIsThisFolderRow) {
+                        // User collapsed this folder while its index is current; HTML swap often
+                        // re-checks the input — force closed so a second click can stay collapsed.
+                        cb.checked = false
+                    } else {
                         collapsedIds.delete(cb.id)
                         writeCollapsedFolderIds(collapsedIds)
                         cb.checked = true
@@ -415,6 +454,16 @@ function expandToCurrentPage(nav: HTMLElement) {
     }
 }
 
+/**
+ * Expand all ancestor collapsible sections that contain the current page link,
+ * so that navigating directly to a URL reveals its location in the sidebar.
+ * Does not re-open a folder row that the user collapsed while that folder index
+ * is the current page (see session storage + folder row link match).
+ */
+function expandToCurrentPage(nav: HTMLElement) {
+    expandToCurrentPageForPath(nav, window.location.pathname)
+}
+
 function destroyNavV2TruncationTooltips() {
     for (const instance of navV2TruncationTippyInstances) {
         instance.destroy()
@@ -498,4 +547,4 @@ export function initNavV2(nav: HTMLElement) {
 }
 
 ensureNavV2FolderLinkToggle()
-ensureNavV2CollapseOutsideExpandedFolders()
+ensureNavV2OptimisticCurrentOnNavigate()
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 0877cc57bb..fbdf6ade05 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -131,11 +131,16 @@ body {
 				max-height 0.3s ease;
 		}
 
-		/* Shared by V1 and V2. V2-only rules: nest under .docs-sidebar-nav-v2 (see _TocTree.cshtml). */
+		/* Shared by V1 and V2 base. Hover ink: V1 pages tree + non-pages sidebars only — Nav V2 keeps color on hover (see #pages-nav nav[data-nav-v2]). */
 		.sidebar-link {
-			@apply text-ink-light inline-block text-[14px] leading-[20px] text-pretty hover:text-black;
+			@apply text-ink-light inline-block text-[14px] leading-[20px] text-pretty;
 			word-break: break-word;
 		}
+
+		#pages-nav .pages-nav-menu > ul .sidebar-link:hover,
+		.sidebar-nav:not(#pages-nav) .sidebar-link:hover {
+			@apply text-black;
+		}
 	}
 }
 
@@ -167,6 +172,24 @@ body:has([data-nav-v2]) aside.sidebar {
 	list-style: none;
 }
 
+/* No gap between rows inside a subsection list (links under a nested subtitle). */
+#pages-nav nav[data-nav-v2] li > .docs-sidebar-nav-v2__label--nested + ul {
+	gap: 0 !important;
+}
+
+/* Gap between sibling subsection blocks (each li: nested subtitle + its ul) under a top icon section only. */
+#pages-nav nav[data-nav-v2] li > .docs-sidebar-nav-v2__label--top + ul {
+	gap: 0 !important;
+}
+
+#pages-nav
+	nav[data-nav-v2]
+	li
+	> .docs-sidebar-nav-v2__label--top
+	+ ul:has(> li > .docs-sidebar-nav-v2__label--nested) {
+	gap: 0.5rem !important;
+}
+
 /* Folder child lists: hidden when checkbox unchecked (fixes conflict: global ul{display:flex} beat Tailwind .hidden) */
 #pages-nav
 	nav[data-nav-v2]
@@ -187,7 +210,7 @@ body:has([data-nav-v2]) aside.sidebar {
 /* Nav V2: vertical padding on top-level li under the root ul (not nested folder children). */
 #pages-nav nav[data-nav-v2] ul.docs-sidebar-nav-v2__tree > li {
 	padding-top: 16px;
-	padding-bottom: 32px;
+	padding-bottom: 24px;
 }
 
 /* Tippy mounts inside nav; clip tooltips so nothing paints outside the sidebar column */
@@ -196,26 +219,17 @@ nav.docs-sidebar-nav-v2 {
 	overflow: hidden;
 }
 
-/* Nav V2: top-level section titles (with icon) — sans stack from theme */
+/* Nav V2: top-level section titles (with icon) — inherit body font stack */
 nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--top {
-	font-family: var(--font-sans);
 	font-weight: 600;
 	margin: 8px 0 12px 0;
 }
 
-/* Nav V2: nested subgroup section titles */
+/* Nav V2: nested subgroup section titles (non-clickable; color never overridden by active path) */
 nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--nested {
 	font-weight: 500;
-	margin: 16px 0 8px 0;
-}
-
-/* First nested header directly under a top icon title (e.g. Platform → Ingest) */
-nav.docs-sidebar-nav-v2
-	li:has(> .docs-sidebar-nav-v2__label--top)
-	> ul
-	> li:first-child
-	.docs-sidebar-nav-v2__label--nested {
-	margin-top: 12px;
+	margin: 12px 0 4px 0;
+	color: #a2b1c9;
 }
 
 /* Nav V2: top-level section titles — icon 16×16, 8px gap via gap-2 on flex parent */
@@ -262,14 +276,14 @@ nav.docs-sidebar-nav-v2
 	display: block;
 }
 
-/* Nav V2: default link ink; placeholders keep .text-grey-40. Current = blue + regular (400). */
+/* Nav V2: default link ink; placeholders keep .text-grey-40. Current = blue + semibold (600). */
 #pages-nav nav[data-nav-v2] a.sidebar-link {
 	box-sizing: border-box;
 	width: 100%;
 	max-width: 100%;
 	min-width: 0;
-	font-weight: 300;
-	border-radius: 6px;
+	font-weight: 400;
+	border-radius: 8px;
 	background-color: transparent;
 	transition:
 		color 0s ease,
@@ -287,8 +301,7 @@ nav.docs-sidebar-nav-v2
 #pages-nav
 	nav[data-nav-v2]
 	a.sidebar-link:not(.text-grey-40):not(.current):hover {
-	color: #1d2a3e;
-	background-color: #f1f6ff;
+	background-color: #ecf1f9;
 }
 
 #pages-nav nav[data-nav-v2] a.sidebar-link.text-grey-40 {
@@ -296,13 +309,12 @@ nav.docs-sidebar-nav-v2
 }
 
 #pages-nav nav[data-nav-v2] a.sidebar-link.text-grey-40:not(.current):hover {
-	color: #1d2a3e;
-	background-color: #f1f6ff;
+	background-color: #ecf1f9;
 }
 
 #pages-nav nav[data-nav-v2] a.sidebar-link.current {
 	color: #0b64dd !important;
-	font-weight: 400 !important;
+	font-weight: 600 !important;
 	background-color: #f1f6ff !important;
 }
 
@@ -311,15 +323,15 @@ nav.docs-sidebar-nav-v2
 	background-color: #f1f6ff !important;
 }
 
-/* Nav V2: active section background (#F1F6FF) — subtree vs leaf driven by pages-nav-v2.ts */
+/* Nav V2: active section background — subtree vs leaf driven by pages-nav-v2.ts */
 #pages-nav nav[data-nav-v2] li.nav-v2-active-subtree {
-	background-color: #f1f6ff;
-	border-radius: 6px;
+	background-color: #d9e8ff;
+	border-radius: 8px;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-leaf {
-	background-color: #f1f6ff;
-	border-radius: 6px;
+	background-color: #d9e8ff;
+	border-radius: 8px;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-subtree a.sidebar-link,
@@ -331,8 +343,7 @@ nav.docs-sidebar-nav-v2
 	nav[data-nav-v2]
 	li.nav-v2-active-subtree
 	a.sidebar-link:not(.current):hover {
-	color: #1d2a3e;
-	background-color: #f1f6ff !important;
+	background-color: #bfdbff !important;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-subtree a.sidebar-link.current,
@@ -347,8 +358,7 @@ nav.docs-sidebar-nav-v2
 	nav[data-nav-v2]
 	li.nav-v2-active-leaf
 	> a.sidebar-link:not(.current):hover {
-	color: #1d2a3e;
-	background-color: #f1f6ff !important;
+	background-color: #ecf1f9 !important;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-leaf > a.sidebar-link.current,
@@ -360,9 +370,8 @@ nav.docs-sidebar-nav-v2
 }
 
 /*
- * Ancestor folder rows (current is deeper): default ink + font-weight like .current.
- * !important on color beats #pages-nav .current / a.sidebar-link.current when the folder href
- * is also marked .current (common duplicate index URL), and keeps chevron currentColor in sync.
+ * Ancestor folder rows (current is deeper): semibold + dark ink on the open path.
+ * .current on the same row (duplicate index URL) stays blue.
  */
 #pages-nav
 	nav[data-nav-v2]
@@ -370,7 +379,16 @@ nav.docs-sidebar-nav-v2
 	> .nav-folder-peer
 	> a.sidebar-link {
 	color: #1d2a3e !important;
-	font-weight: 400 !important;
+	font-weight: 600 !important;
+}
+
+#pages-nav
+	nav[data-nav-v2]
+	li.nav-v2-active-ancestor
+	> .nav-folder-peer
+	> a.sidebar-link.current {
+	color: #0b64dd !important;
+	font-weight: 600 !important;
 }
 
 #pages-nav
@@ -379,28 +397,48 @@ nav.docs-sidebar-nav-v2
 	> .nav-folder-peer
 	> a.sidebar-link.text-grey-40 {
 	color: var(--color-grey-40) !important;
+	font-weight: 600 !important;
 }
 
 #pages-nav
 	nav[data-nav-v2]
 	li.nav-v2-active-ancestor
 	> .nav-folder-peer
-	> a.sidebar-link:hover {
-	color: #1d2a3e !important;
+	> a.sidebar-link:not(.current):hover {
+	background-color: #ecf1f9;
 }
 
 #pages-nav
 	nav[data-nav-v2]
 	li.nav-v2-active-ancestor
 	> .nav-folder-peer
-	> a.sidebar-link.text-grey-40:hover {
-	color: #1d2a3e !important;
+	> a.sidebar-link.current:hover {
+	color: #0b64dd !important;
 }
 
 #pages-nav nav[data-nav-v2] .nav-folder-peer {
 	min-width: 0;
 }
 
+/* Chevrons: muted by default; match link ink when row is current or ancestor-active */
+#pages-nav nav[data-nav-v2] .nav-folder-chevron {
+	color: #a2b1c9;
+}
+
+#pages-nav
+	nav[data-nav-v2]
+	.nav-folder-peer
+	> a.sidebar-link.current
+	.nav-folder-chevron,
+#pages-nav
+	nav[data-nav-v2]
+	li.nav-v2-active-ancestor
+	> .nav-folder-peer
+	> a.sidebar-link
+	.nav-folder-chevron {
+	color: currentColor;
+}
+
 .docs-sidebar-nav-v2 .nav-folder-peer .nav-folder-chevron svg {
 	display: block;
 	width: 12px;
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index f6815e95de..fd695a4e01 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -17,10 +17,10 @@
 	if (item is LabelNavigationNode label)
 	{
 		@* Subsection headers: spacing via CSS (li:has .label--nested:not(:first-child)) so every title matches, not a hardcoded list *@
-		<li class="@(isTopLevel ? "border-t border-[#ECF1F9] first:border-t-0 relative" : "relative")">
+		<li class="@(isTopLevel ? "border-t border-[#F6F9FC] first:border-t-0 relative" : "relative")">
 			@if (isTopLevel)
 			{
-				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--top flex items-center gap-2 px-[8px] py-0 text-sm leading-5 text-[#111C2C]">
+				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--top flex items-center gap-2 px-[10px] py-0 text-sm leading-5 text-[#111C2C]">
 					@if (label.NavigationTitle == "Elasticsearch fundamentals")
 					{
 						@* EUI icon: documentation *@
@@ -31,9 +31,10 @@
 					}
 					else if (label.NavigationTitle == "Install, deploy, and administer")
 					{
-						@* EUI icon: cluster *@
+						@* EUI icon: storage *@
 						<svg class="docs-sidebar-nav-v2__label-icon" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M4.5 1a3.5 3.5 0 0 1 3.465 3h3.12a1.5 1.5 0 1 1 0 1h-3.12a3.482 3.482 0 0 1-.662 1.596l2.1 2.1A3.5 3.5 0 1 1 8.036 12h-3.12a1.5 1.5 0 1 1 0-.999h3.12a3.482 3.482 0 0 1 .662-1.596l-2.1-2.1A3.5 3.5 0 1 1 4.5 1Zm0 6a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5ZM12 4.5a.5.5 0 1 0 1 0 .5.5 0 0 0-1 0Zm-.5 9.5a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5ZM4 11.5a.5.5 0 1 1-1 0 .5.5 0 0 1 1 0Z"/>
+							<path fill="currentColor" d="M5 5H3V4h2v1Zm0 2H3V6h2v1Zm-1 4a1 1 0 1 0 0-2 1 1 0 0 0 0 2Zm5-7v3H8V4h1Zm4 3V4h-1v3h1Z"/>
+							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M1 3a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v9a1 1 0 0 1-1 1h-1v1h-1v-1H4v1H3v-1H2a1 1 0 0 1-1-1V3Zm5 0H2v9h4V3Zm1 0v9h3V3H7Zm4 0v9h3V3h-3Z"/>
 						</svg>
 					}
 					else if (label.NavigationTitle == "The Elasticsearch Platform")
@@ -47,10 +48,12 @@
 					}
 					else if (label.NavigationTitle == "Solutions and project types")
 					{
-						@* EUI icon: folderOpen *@
-						<svg class="docs-sidebar-nav-v2__label-icon" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-							<path fill="currentColor" d="M5.191 2a1 1 0 0 1 .894.553L6.809 4H13a1 1 0 0 1 1 1v1.5h-1V5H6.191l-.138-.276L5.19 3H1v8.751l-.317 1.111a.5.5 0 0 0 .48.638h11.96a.5.5 0 0 0 .48-.362L14 11.75V13a1 1 0 0 1-1 1H1a1 1 0 0 1-.995-.898L0 13V3a1 1 0 0 1 1-1h4.191Z"/>
-							<path fill="currentColor" d="M14.837 6a1 1 0 0 1 .962 1.274l-1.715 6a1 1 0 0 1-.961.726H1.163a1 1 0 0 1-.962-1.274l1.715-6A1 1 0 0 1 2.877 6h11.96ZM1.163 13h11.96l1.714-6H2.877l-1.714 6Z"/>
+						@* EUI icon: productDashboard *@
+						<svg class="docs-sidebar-nav-v2__label-icon" width="16" height="16" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M12 22C13.1046 22 14 22.8954 14 24V26L13.9902 26.2051C13.8876 27.2133 13.0354 28 12 28H4C2.89543 28 2 27.1046 2 26V24C2 22.8954 2.89543 22 4 22H12ZM4 26H12V24H4V26Z"/>
+							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M28 14C29.1046 14 30 14.8954 30 16V26C30 27.1046 29.1046 28 28 28H18C16.8954 28 16 27.1046 16 26V16C16 14.8954 16.8954 14 18 14H28ZM18 26H28V16H18V26Z"/>
+							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M12 14C13.1046 14 14 14.8954 14 16V18L13.9902 18.2051C13.8876 19.2133 13.0354 20 12 20H4C2.89543 20 2 19.1046 2 18V16C2 14.8954 2.89543 14 4 14H12ZM4 18H12V16H4V18Z"/>
+							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M28 4C29.0354 4 29.8876 4.78666 29.9902 5.79492L30 6V10C30 11.1046 29.1046 12 28 12H4C2.89543 12 2 11.1046 2 10V6C2 4.89543 2.89543 4 4 4H28ZM4 10H28V6H4V10Z"/>
 						</svg>
 					}
 					else
@@ -66,7 +69,7 @@
 			}
 			else
 			{
-				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--nested docs-sidebar-nav-v2__nav-text block px-[8px] py-0 text-xs leading-4 uppercase text-[#A2B1C9]">
+				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--nested docs-sidebar-nav-v2__nav-text block px-[10px] py-0 text-xs leading-4 uppercase text-[#A2B1C9]">
 					@label.NavigationTitle
 				</span>
 			}
@@ -91,8 +94,8 @@
 		<li class="flex group/li">
 			<a
 				href="@placeholder.Url"
-				@Model.Htmx.GetNavHxAttributes(true)
-				class="sidebar-link docs-sidebar-nav-v2__nav-text grow px-[8px] py-[6px] text-grey-40">
+				@Model.Htmx.GetNavHxAttributes(true, null)
+				class="sidebar-link docs-sidebar-nav-v2__nav-text grow px-[10px] py-[6px] text-grey-40">
 				@placeholder.NavigationTitle
 			</a>
 		</li>
@@ -113,8 +116,8 @@
 				}
 				<a
 					href="@placeholderGroup.Url"
-					@Model.Htmx.GetNavHxAttributes(true)
-					class="sidebar-link flex w-full items-center gap-2 px-[8px] py-[6px] text-grey-40">
+					@Model.Htmx.GetNavHxAttributes(true, null)
+					class="sidebar-link flex w-full items-center gap-2 px-[10px] py-[6px] text-grey-40">
 					<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@placeholderGroup.NavigationTitle</span>
 					@if (!allHidden)
 					{
@@ -153,8 +156,8 @@
 		<li class="flex group/li">
 			<a
 				href="@group.Url"
-				@Model.Htmx.GetNavHxAttributes(true)
-				class="sidebar-link docs-sidebar-nav-v2__nav-text px-[8px] py-[6px]"
+				@Model.Htmx.GetNavHxAttributes(true, null)
+				class="sidebar-link docs-sidebar-nav-v2__nav-text px-[10px] py-[6px]"
 			>
 				@group.NavigationTitle
 			</a>
@@ -176,8 +179,8 @@
 				}
 				<a
 					href="@(folder.Url)"
-					@Model.Htmx.GetNavHxAttributes(true)
-					class="sidebar-link flex w-full items-center gap-2 px-[8px] py-[6px]">
+					@Model.Htmx.GetNavHxAttributes(true, null)
+					class="sidebar-link flex w-full items-center gap-2 px-[10px] py-[6px]">
 					<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@(folder.NavigationTitle)</span>
 					@if (!allHidden)
 					{
@@ -216,8 +219,8 @@
 		<li class="flex group/li">
 			<a
 				href="@leaf.Url"
-				@Model.Htmx.GetNavHxAttributes(true)
-				class="sidebar-link docs-sidebar-nav-v2__nav-text grow px-[8px] py-[6px]"
+				@Model.Htmx.GetNavHxAttributes(true, null)
+				class="sidebar-link docs-sidebar-nav-v2__nav-text grow px-[10px] py-[6px]"
 			>
 				@leaf.NavigationTitle
 			</a>
diff --git a/src/Elastic.Documentation.Site/package-lock.json b/src/Elastic.Documentation.Site/package-lock.json
index b6d1a50c76..bc623a0636 100644
--- a/src/Elastic.Documentation.Site/package-lock.json
+++ b/src/Elastic.Documentation.Site/package-lock.json
@@ -156,6 +156,7 @@
       "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.3",
@@ -2038,6 +2039,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -2061,6 +2063,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -2393,6 +2396,7 @@
       "version": "11.13.5",
       "resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.13.5.tgz",
       "integrity": "sha512-wQdD0Xhkn3Qy2VNcIzbLP9MR8TafI0MJb7BEAXKp+w4+XqErksWR4OXomuDzPsN4InLdGhVe6EYcn2ZIUCpB8w==",
+      "peer": true,
       "dependencies": {
         "@emotion/babel-plugin": "^11.13.5",
         "@emotion/cache": "^11.13.5",
@@ -2415,6 +2419,7 @@
       "version": "11.14.0",
       "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
       "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
@@ -4525,6 +4530,7 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
       "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
       "license": "Apache-2.0",
+      "peer": true,
       "engines": {
         "node": ">=8.0.0"
       }
@@ -6352,6 +6358,7 @@
       "integrity": "sha512-a0CgrW5A5kwuSu5J1RFRoMQaMs9yagvfH2jJMYVw56+/7NRI4KOtu612SG9Y1ERWfY55ZwzyFxtLWvD6LO+Anw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@mischnic/json-sourcemap": "^0.1.1",
         "@parcel/cache": "2.16.4",
@@ -24313,8 +24320,7 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
       "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
@@ -24529,6 +24535,7 @@
       "version": "18.3.23",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.23.tgz",
       "integrity": "sha512-/LDXMQh55EzZQ0uVAZmKKhfENivEvWz6E+EYzh+/MCjMhNsotd+ZHhBGIjFDTi6+fz0OhQQQLbTgdQIxxCsC0w==",
+      "peer": true,
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -24659,6 +24666,7 @@
       "integrity": "sha512-BtE0k6cjwjLZoZixN0t5AKP0kSzlGu7FctRXYuPAm//aaiZhmfq1JwdYpYr1brzEspYyFeF+8XF5j2VK6oalrA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.54.0",
         "@typescript-eslint/types": "8.54.0",
@@ -25200,6 +25208,7 @@
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -25770,6 +25779,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -26475,8 +26485,7 @@
       "version": "0.5.16",
       "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
       "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/dom-serializer": {
       "version": "2.0.0",
@@ -26831,6 +26840,7 @@
       "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -29441,6 +29451,7 @@
       "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "cssstyle": "^4.2.1",
         "data-urls": "^5.0.0",
@@ -30023,7 +30034,6 @@
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
       "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "dev": true,
-      "peer": true,
       "bin": {
         "lz-string": "bin/bin.js"
       }
@@ -30269,6 +30279,7 @@
       "version": "2.30.1",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
       "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "peer": true,
       "engines": {
         "node": "*"
       }
@@ -31261,6 +31272,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -31308,6 +31320,7 @@
       "integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -31402,7 +31415,6 @@
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
       "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
@@ -31417,7 +31429,6 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -31546,6 +31557,7 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
       "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -31568,6 +31580,7 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
       "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.2"
@@ -31906,6 +31919,7 @@
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
       "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.9.2"
       }
@@ -32898,6 +32912,7 @@
       "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -33044,8 +33059,7 @@
     "node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "peer": true
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "node_modules/type-check": {
       "version": "0.4.0",
@@ -33092,6 +33106,7 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -33944,7 +33959,8 @@
       "version": "0.15.1",
       "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.15.1.tgz",
       "integrity": "sha512-XE96n56IQpJM7NAoXswY3XRLcWFW83xe0BiAOeMD7K5k5xecOeul3Qcpx6GqEeeHNkW5DWL5zOyTbEfB4eti8w==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/zustand": {
       "version": "5.0.11",

From 4130966aea135f3904e77db190bf537e4bac5f69 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri-Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 8 Apr 2026 09:48:12 +0200
Subject: [PATCH 063/226] Wire Install, deploy, and administer nav section
 (#3049)

* feat(nav-v2): wire entire Install, deploy, and administer section

Replace ~97 placeholder title: entries with real page: cross-links
across the full "Install, deploy, and administer" label section:

- Distributed architecture: 6 pages + group index
- Plan your install: 5 pages (versioning, deployment comparison,
  reference architectures, production guidance)
- Install and deploy: 4 pages + group indices (Cloud, ECE, ECK,
  self-managed, command line tools via elasticsearch://)
- Administer your deployment: ~80 pages covering autoscaling, backup
  tools, security (24 pages), auth/users/roles, API keys, remote
  clusters, monitoring, cloud organization, licenses, maintenance,
  upgrades, and uninstall
- Deployment tools: ECCTL via toc: ecctl://reference

3 placeholder titles dropped (Skills pages and Overview roundup) as
no matching pages exist in docs-content.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(nav-v2): restore dropped placeholder titles

Re-add 3 placeholder titles that were incorrectly removed:
- Skills for installation and deployment
- Skills for cluster and deployment administration
- Overview (roundup) under Deployment and administration tools

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 303 ++++++++++++++++++++++++++-------------
 1 file changed, 205 insertions(+), 98 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 9b65396ac1..5ab7d8720a 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -27,146 +27,253 @@ nav:
   - label: Install, deploy, and administer
     children:
     - group: Distributed architecture
+      page: docs-content://deploy-manage/distributed-architecture.md
       children:
-      - title: Clusters nodes and shards
-      - title: Discovery and cluster formation
-      - title: Kibana task management
-      - title: Reading and writing documents
-      - title: Shard allocation relocation and recovery
-      - title: The shard request cache
-    - group: Plan your install (name TBD)
+      - page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards.md
+        title: Clusters nodes and shards
+      - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation.md
+        title: Discovery and cluster formation
+      - page: docs-content://deploy-manage/distributed-architecture/kibana-tasks-management.md
+        title: Kibana task management
+      - page: docs-content://deploy-manage/distributed-architecture/reading-and-writing-documents.md
+        title: Reading and writing documents
+      - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md
+        title: Shard allocation relocation and recovery
+      - page: docs-content://deploy-manage/distributed-architecture/shard-request-cache.md
+        title: The shard request cache
+    - group: Plan your install
       children:
-      - title: Versioning and compatibility
-      - title: Detailed deployment comparison
+      - page: docs-content://get-started/versioning-availability.md
+        title: Versioning and compatibility
+      - page: docs-content://deploy-manage/deploy/deployment-comparison.md
+        title: Detailed deployment comparison
       - group: Reference architectures
+        page: docs-content://deploy-manage/reference-architectures.md
         children:
-        - title: Hot/Frozen - High Availability
+        - page: docs-content://deploy-manage/reference-architectures/hotfrozen-high-availability.md
+          title: Hot/Frozen - High Availability
       - group: Production guidance
+        page: docs-content://deploy-manage/production-guidance.md
         children:
-        - title: Run Elasticsearch in production
-        - title: Run Kibana in production
+        - page: docs-content://deploy-manage/production-guidance/elasticsearch-in-production-environments.md
+          title: Run Elasticsearch in production
+        - page: docs-content://deploy-manage/production-guidance/kibana-in-production-environments.md
+          title: Run Kibana in production
     - group: Install and deploy Elasticsearch
+      page: docs-content://deploy-manage/deploy.md
       children:
       - title: Skills for installation and deployment
-      - title: Deploy in Elastic Cloud
-      - title: Elastic Cloud Enterprise
-      - title: Elastic Cloud on Kubernetes
+      - page: docs-content://deploy-manage/deploy/elastic-cloud.md
+        title: Deploy in Elastic Cloud
+      - page: docs-content://deploy-manage/deploy/cloud-enterprise.md
+        title: Elastic Cloud Enterprise
+      - page: docs-content://deploy-manage/deploy/cloud-on-k8s.md
+        title: Elastic Cloud on Kubernetes
       - group: Self-managed cluster
+        page: docs-content://deploy-manage/deploy/self-managed.md
         children:
-        - title: "[XREF] Command line tools"
+        - page: elasticsearch://reference/elasticsearch/command-line-tools/index.md
+          title: Command line tools
     - group: Administer your deployment
       children:
       - title: Skills for cluster and deployment administration
-      - title: Elastic Stack settings
+      - page: docs-content://deploy-manage/stack-settings.md
+        title: Elastic Stack settings
       - group: Autoscaling
+        page: docs-content://deploy-manage/autoscaling.md
         children:
-        - title: Autoscaling deciders
-        - title: Autoscaling in ECE and ECH
-        - title: Autoscaling in ECK
-        - title: Trained model autoscaling
+        - page: docs-content://deploy-manage/autoscaling/autoscaling-deciders.md
+          title: Autoscaling deciders
+        - page: docs-content://deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md
+          title: Autoscaling in ECE and ECH
+        - page: docs-content://deploy-manage/autoscaling/autoscaling-in-eck.md
+          title: Autoscaling in ECK
+        - page: docs-content://deploy-manage/autoscaling/trained-model-autoscaling.md
+          title: Trained model autoscaling
       - group: Backup high availability and resilience tools
+        page: docs-content://deploy-manage/tools.md
         children:
-        - title: Cross-cluster replication
-        - title: Snapshot and restore
-      - title: Cloud Connect
+        - page: docs-content://deploy-manage/tools/cross-cluster-replication.md
+          title: Cross-cluster replication
+        - page: docs-content://deploy-manage/tools/snapshot-and-restore.md
+          title: Snapshot and restore
+      - page: docs-content://deploy-manage/cloud-connect.md
+        title: Cloud Connect
       - group: Security and encryption
+        page: docs-content://deploy-manage/security.md
         children:
-        - title: Encrypt your deployment data
-        - title: Elastic Cloud Static IPs
-        - title: Enabling cipher suites for stronger encryption
-        - title: Use a customer-managed encryption key
-        - title: Securing HTTP client applications
-        - title: Manage IP filtering in ECK and self-managed
-        - title: Manage IP filters in ECH or Serverless
-        - title: Manage HTTP certificates on ECK
-        - title: Kubernetes network policies
-        - title: Secure settings on ECK
-        - title: Manage transport certificates on ECK
-        - title: Mutual TLS between Kibana and Elasticsearch
-        - title: Kibana session management
-        - title: Security limitations
-        - title: Security logging
-        - title: Network security
-        - title: Private connectivity
-        - title: Secure other Elastic Stack components
-        - title: TLS encryption for cluster communications
-        - title: Secure Kibana saved objects
-        - title: Secure your settings
-        - title: Secure your ECK orchestrator
-        - title: Secure your ECE installation
-        - title: Set up security in self-managed
+        - page: docs-content://deploy-manage/security/data-security.md
+          title: Encrypt your deployment data
+        - page: docs-content://deploy-manage/security/elastic-cloud-static-ips.md
+          title: Elastic Cloud Static IPs
+        - page: docs-content://deploy-manage/security/enabling-cipher-suites-for-stronger-encryption.md
+          title: Enabling cipher suites for stronger encryption
+        - page: docs-content://deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md
+          title: Use a customer-managed encryption key
+        - page: docs-content://deploy-manage/security/httprest-clients-security.md
+          title: Securing HTTP client applications
+        - page: docs-content://deploy-manage/security/ip-filtering-basic.md
+          title: Manage IP filtering in ECK and self-managed
+        - page: docs-content://deploy-manage/security/ip-filtering-cloud.md
+          title: Manage IP filters in ECH or Serverless
+        - page: docs-content://deploy-manage/security/k8s-https-settings.md
+          title: Manage HTTP certificates on ECK
+        - page: docs-content://deploy-manage/security/k8s-network-policies.md
+          title: Kubernetes network policies
+        - page: docs-content://deploy-manage/security/k8s-secure-settings.md
+          title: Secure settings on ECK
+        - page: docs-content://deploy-manage/security/k8s-transport-settings.md
+          title: Manage transport certificates on ECK
+        - page: docs-content://deploy-manage/security/kibana-es-mutual-tls.md
+          title: Mutual TLS between Kibana and Elasticsearch
+        - page: docs-content://deploy-manage/security/kibana-session-management.md
+          title: Kibana session management
+        - page: docs-content://deploy-manage/security/limitations.md
+          title: Security limitations
+        - page: docs-content://deploy-manage/security/logging-configuration/security-event-audit-logging.md
+          title: Security logging
+        - page: docs-content://deploy-manage/security/network-security.md
+          title: Network security
+        - page: docs-content://deploy-manage/security/private-connectivity.md
+          title: Private connectivity
+        - page: docs-content://deploy-manage/security/secure-clients-integrations.md
+          title: Secure other Elastic Stack components
+        - page: docs-content://deploy-manage/security/secure-cluster-communications.md
+          title: TLS encryption for cluster communications
+        - page: docs-content://deploy-manage/security/secure-saved-objects.md
+          title: Secure Kibana saved objects
+        - page: docs-content://deploy-manage/security/secure-settings.md
+          title: Secure your settings
+        - page: docs-content://deploy-manage/security/secure-your-eck-installation.md
+          title: Secure your ECK orchestrator
+        - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation.md
+          title: Secure your ECE installation
+        - page: docs-content://deploy-manage/security/self-setup.md
+          title: Set up security in self-managed
       - group: Authentication and authorization
+        page: docs-content://deploy-manage/users-roles.md
         children:
-        - group: Users and roles
-          children:
-          - title: Elastic Cloud Enterprise orchestrator users
-          - title: Cloud organization users
-          - title: Cluster or deployment users
-          - title: Serverless project custom roles
-        - title: Spaces
-        - title: "[child] Using Spaces with Fleet"
+        - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator.md
+          title: Elastic Cloud Enterprise orchestrator users
+        - page: docs-content://deploy-manage/users-roles/cloud-organization.md
+          title: Cloud organization users
+        - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth.md
+          title: Cluster or deployment users
+        - page: docs-content://deploy-manage/users-roles/serverless-custom-roles.md
+          title: Serverless project custom roles
+        - page: docs-content://deploy-manage/manage-spaces.md
+          title: Spaces
+        - page: docs-content://deploy-manage/manage-spaces-fleet.md
+          title: Using Spaces with Fleet
       - group: Elastic API keys
+        page: docs-content://deploy-manage/api-keys.md
         children:
-        - title: Elastic Cloud API keys
-        - title: Elastic Cloud Enterprise API keys
-        - title: Elasticsearch API keys
-        - title: Serverless project API keys
-      - title: Connectors
+        - page: docs-content://deploy-manage/api-keys/elastic-cloud-api-keys.md
+          title: Elastic Cloud API keys
+        - page: docs-content://deploy-manage/api-keys/elastic-cloud-enterprise-api-keys.md
+          title: Elastic Cloud Enterprise API keys
+        - page: docs-content://deploy-manage/api-keys/elasticsearch-api-keys.md
+          title: Elasticsearch API keys
+        - page: docs-content://deploy-manage/api-keys/serverless-project-api-keys.md
+          title: Serverless project API keys
+      - page: docs-content://deploy-manage/manage-connectors.md
+        title: Connectors
       - group: Remote clusters
+        page: docs-content://deploy-manage/remote-clusters.md
         children:
-        - title: Remote cluster connection modes
-        - title: Remote clusters on Elastic Cloud Hosted
-        - title: Remote clusters on Elastic Cloud Enterprise
-        - title: Remote clusters on ECK
-        - title: Remote clusters on self-managed
-        - title: Remote cluster security models
+        - page: docs-content://deploy-manage/remote-clusters/connection-modes.md
+          title: Remote cluster connection modes
+        - page: docs-content://deploy-manage/remote-clusters/ec-enable-ccs.md
+          title: Remote clusters on Elastic Cloud Hosted
+        - page: docs-content://deploy-manage/remote-clusters/ece-enable-ccs.md
+          title: Remote clusters on Elastic Cloud Enterprise
+        - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-landing.md
+          title: Remote clusters on ECK
+        - page: docs-content://deploy-manage/remote-clusters/remote-clusters-self-managed.md
+          title: Remote clusters on self-managed
+        - page: docs-content://deploy-manage/remote-clusters/security-models.md
+          title: Remote cluster security models
       - group: Monitoring
+        page: docs-content://deploy-manage/monitor.md
         children:
-        - title: Performance metrics on Elastic Cloud
-        - title: AutoOps
-        - title: AutoOps and Stack Monitoring comparison
-        - title: Cloud deployment health and performance
-        - title: JVM memory pressure indicator
-        - title: Kibana task manager health monitoring
+        - page: docs-content://deploy-manage/monitor/access-performance-metrics-on-elastic-cloud.md
+          title: Performance metrics on Elastic Cloud
+        - page: docs-content://deploy-manage/monitor/autoops.md
+          title: AutoOps
+        - page: docs-content://deploy-manage/monitor/autoops-vs-stack-monitoring.md
+          title: AutoOps and Stack Monitoring comparison
+        - page: docs-content://deploy-manage/monitor/cloud-health-perf.md
+          title: Cloud deployment health and performance
+        - page: docs-content://deploy-manage/monitor/ec-memory-pressure.md
+          title: JVM memory pressure indicator
+        - page: docs-content://deploy-manage/monitor/kibana-task-manager-health-monitoring.md
+          title: Kibana task manager health monitoring
         - group: Logging
-          children:
-          - title: "[REF] Audit events"
-        - title: Monitoring orchestrators
-        - title: Stack monitoring
-      - title: Configure Kibana reporting
+          page: docs-content://deploy-manage/monitor/logging-configuration.md
+          children:
+          - page: elasticsearch://reference/elasticsearch/elasticsearch-audit-events.md
+            title: Audit events
+        - page: docs-content://deploy-manage/monitor/orchestrators.md
+          title: Monitoring orchestrators
+        - page: docs-content://deploy-manage/monitor/stack-monitoring.md
+          title: Stack monitoring
+      - page: docs-content://deploy-manage/kibana-reporting-configuration.md
+        title: Configure Kibana reporting
       - group: Cloud organization
+        page: docs-content://deploy-manage/cloud-organization.md
         children:
-        - title: Billing
-        - title: Operational emails
-        - title: Service status
-        - title: Tools and APIs for your Cloud organization
+        - page: docs-content://deploy-manage/cloud-organization/billing.md
+          title: Billing
+        - page: docs-content://deploy-manage/cloud-organization/operational-emails.md
+          title: Operational emails
+        - page: docs-content://deploy-manage/cloud-organization/service-status.md
+          title: Service status
+        - page: docs-content://deploy-manage/cloud-organization/tools-and-apis.md
+          title: Tools and APIs for your Cloud organization
       - group: Licenses and subscriptions
+        page: docs-content://deploy-manage/license.md
         children:
-        - title: Manage your license in ECE
-        - title: Manage your license in ECK
-        - title: Manage your license in self-managed
+        - page: docs-content://deploy-manage/license/manage-your-license-in-ece.md
+          title: Manage your license in ECE
+        - page: docs-content://deploy-manage/license/manage-your-license-in-eck.md
+          title: Manage your license in ECK
+        - page: docs-content://deploy-manage/license/manage-your-license-in-self-managed-cluster.md
+          title: Manage your license in self-managed
       - group: Maintenance
+        page: docs-content://deploy-manage/maintenance.md
         children:
-        - title: Add and remove Elasticsearch nodes
-        - title: ECE maintenance
-        - title: Start and stop routing requests
-        - title: Start and stop services
+        - page: docs-content://deploy-manage/maintenance/add-and-remove-elasticsearch-nodes.md
+          title: Add and remove Elasticsearch nodes
+        - page: docs-content://deploy-manage/maintenance/ece.md
+          title: ECE maintenance
+        - page: docs-content://deploy-manage/maintenance/start-stop-routing-requests.md
+          title: Start and stop routing requests
+        - page: docs-content://deploy-manage/maintenance/start-stop-services.md
+          title: Start and stop services
       - group: Upgrade your deployment, cluster, or orchestrator
+        page: docs-content://deploy-manage/upgrade.md
         children:
-        - title: Upgrade your deployment or cluster
-        - title: Upgrade your ingest components
-        - title: Upgrade your orchestrator
-        - title: Plan your upgrade
-        - title: Prepare to upgrade
+        - page: docs-content://deploy-manage/upgrade/deployment-or-cluster.md
+          title: Upgrade your deployment or cluster
+        - page: docs-content://deploy-manage/upgrade/ingest-components.md
+          title: Upgrade your ingest components
+        - page: docs-content://deploy-manage/upgrade/orchestrator.md
+          title: Upgrade your orchestrator
+        - page: docs-content://deploy-manage/upgrade/plan-upgrade.md
+          title: Plan your upgrade
+        - page: docs-content://deploy-manage/upgrade/prepare-to-upgrade.md
+          title: Prepare to upgrade
       - group: Uninstall
+        page: docs-content://deploy-manage/uninstall.md
         children:
-        - title: Uninstall Elastic Cloud Enterprise
-        - title: Uninstall Elastic Cloud on Kubernetes
+        - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md
+          title: Uninstall Elastic Cloud Enterprise
+        - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-on-kubernetes.md
+          title: Uninstall Elastic Cloud on Kubernetes
     - group: Deployment and administration tools
       children:
       - title: Overview (roundup)
-      - title: ECCTL
-      - title: Skills
+      - toc: ecctl://reference
   - label: The Elasticsearch Platform
     children:
     - label: Ingest and manage data

From 1dfdeb1c13c589c0b1b0a8df450a1e0c2c2581b7 Mon Sep 17 00:00:00 2001
From: Aleksandra Spilkowska <96738481+alexandra5000@users.noreply.github.com>
Date: Wed, 15 Apr 2026 16:24:26 +0200
Subject: [PATCH 064/226] Propose IA changes to nav-v2 (#3024)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Propose: extract EDOT SDKs as a top-level ingest tool group

Move the individual EDOT SDK tocs (Android, .NET, iOS, Java, Node.js,
PHP, Python, Browser) out from under the EDOT group and into a
dedicated "EDOT SDKs" sibling group at the same level as Fleet,
APM, Beats, etc. The group links to the existing edot-sdks index page.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Fix EDOT SDK duplication: support child overrides on toc: entries

Add TocOverrideNode wrapper in SiteNavigationV2 so that when a toc:
entry in navigation-v2.yml declares explicit children, those are used
instead of the full V1 node tree — without mutating the shared node.

Update navigation-v2.yml to limit opentelemetry://reference children
to motlp, edot-cloud-forwarder, and edot-collector, keeping individual
EDOT SDKs only in the new sibling EDOT SDKs group.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Revert opentelemetry://reference children override

The edot-sdks deduplication is now handled upstream in elastic/opentelemetry
by removing edot-sdks/index.md from the reference toc. No children override
needed here — toc: opentelemetry://reference renders cleanly without the SDKs.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Wire EDOT SDKs as a proper toc node in navigation.yml

Group the individual SDK tocs under opentelemetry://reference/edot-sdks
in navigation.yml with path_prefix reference/opentelemetry/edot-sdks,
so nav-v2 can reference it as a toc: entry with a correct URL.

Update navigation-v2.yml to use toc: opentelemetry://reference/edot-sdks
instead of group: + page:, which was producing a 404 due to naive URI
path resolution ignoring the path_prefix.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* chore: trigger assembler preview

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/navigation-v2.yml                      | 17 ++++++++
 config/navigation.yml                         | 39 +++++++++---------
 .../V2/SiteNavigationV2.cs                    | 40 ++++++++++++++++++-
 3 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 5ab7d8720a..dba6204258 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -382,6 +382,23 @@ nav:
         page: docs-content://reference/ingestion-tools/index.md
         children:
         - toc: opentelemetry://reference
+          children:
+          - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/index.md
+            title: Quickstarts
+          - page: opentelemetry://reference/architecture/index.md
+            title: Reference Architecture
+          - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/index.md
+            title: Use cases
+          - page: opentelemetry://reference/compatibility/index.md
+            title: Compatibility and support
+          - page: opentelemetry://reference/data-streams.md
+            title: Data streams
+          - page: opentelemetry://reference/central-configuration.md
+            title: Central configuration
+        - toc: opentelemetry://reference/motlp
+        - toc: opentelemetry://reference/edot-cloud-forwarder
+        - toc: elastic-agent://reference/edot-collector
+        - toc: opentelemetry://reference/edot-sdks
         - toc: docs-content://reference/fleet
         - toc: integration-docs://reference
         - toc: elasticsearch://reference/search-connectors
diff --git a/config/navigation.yml b/config/navigation.yml
index 2d05b8f42f..2a096a9318 100644
--- a/config/navigation.yml
+++ b/config/navigation.yml
@@ -474,24 +474,27 @@ toc:
                     path_prefix: reference/opentelemetry/edot-cloud-forwarder/gcp
               - toc: elastic-agent://reference/edot-collector
                 path_prefix: reference/edot-collector
-              - toc: apm-agent-android://reference/edot-android
-                path_prefix: reference/opentelemetry/edot-sdks/android
-              - toc: elastic-otel-dotnet://reference/edot-dotnet
-                path_prefix: reference/opentelemetry/edot-sdks/dotnet
-              - toc: apm-agent-ios://reference/edot-ios
-                path_prefix: reference/opentelemetry/edot-sdks/ios
-              - toc: elastic-otel-java://reference/edot-java
-                path_prefix: reference/opentelemetry/edot-sdks/java
-              - toc: elastic-otel-node://reference/edot-node
-                path_prefix: reference/opentelemetry/edot-sdks/node
-              - toc: elastic-otel-php://reference/edot-php
-                path_prefix: reference/opentelemetry/edot-sdks/php
-              - toc: elastic-otel-python://reference/edot-python
-                path_prefix: reference/opentelemetry/edot-sdks/python
-              # EDOT Browser (RUM)
-              # https://github.com/elastic/elastic-otel-rum-js/blob/main/docs/reference/edot-browser/toc.yml
-              - toc: elastic-otel-rum-js://reference/edot-browser
-                path_prefix: reference/opentelemetry/edot-sdks/browser
+              - toc: opentelemetry://reference/edot-sdks
+                path_prefix: reference/opentelemetry/edot-sdks
+                children:
+                  - toc: apm-agent-android://reference/edot-android
+                    path_prefix: reference/opentelemetry/edot-sdks/android
+                  - toc: elastic-otel-dotnet://reference/edot-dotnet
+                    path_prefix: reference/opentelemetry/edot-sdks/dotnet
+                  - toc: apm-agent-ios://reference/edot-ios
+                    path_prefix: reference/opentelemetry/edot-sdks/ios
+                  - toc: elastic-otel-java://reference/edot-java
+                    path_prefix: reference/opentelemetry/edot-sdks/java
+                  - toc: elastic-otel-node://reference/edot-node
+                    path_prefix: reference/opentelemetry/edot-sdks/node
+                  - toc: elastic-otel-php://reference/edot-php
+                    path_prefix: reference/opentelemetry/edot-sdks/php
+                  - toc: elastic-otel-python://reference/edot-python
+                    path_prefix: reference/opentelemetry/edot-sdks/python
+                  # EDOT Browser (RUM)
+                  # https://github.com/elastic/elastic-otel-rum-js/blob/main/docs/reference/edot-browser/toc.yml
+                  - toc: elastic-otel-rum-js://reference/edot-browser
+                    path_prefix: reference/opentelemetry/edot-sdks/browser
 
           # Elastic Integrations
           # https://github.com/elastic/integration-docs/blob/main/docs/reference/toc.yml
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 9f02805257..8a82d44bef 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -56,12 +56,50 @@ string sitePrefix
 		{
 			LabelNavV2Item label => CreateLabel(label, nodes, parent, sitePrefix),
 			GroupNavV2Item group => CreateGroup(group, nodes, parent, sitePrefix),
-			TocNavV2Item toc => nodes.TryGetValue(toc.Source, out var node) ? node : null,
+			TocNavV2Item toc => CreateToc(toc, nodes, parent, sitePrefix),
 			PageNavV2Item { Page: null, Title: var title } => new PlaceholderNavigationLeaf(title ?? "Untitled", sitePrefix, parent),
 			PageNavV2Item { Page: var page, Title: var title } => new PageCrossLinkLeaf(page, title ?? page.ToString(), sitePrefix, parent),
 			_ => null
 		};
 
+	private static INavigationItem? CreateToc(
+		TocNavV2Item toc,
+		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
+		INodeNavigationItem<INavigationModel, INavigationItem> parent,
+		string sitePrefix
+	)
+	{
+		if (!nodes.TryGetValue(toc.Source, out var node))
+			return null;
+		if (toc.Children.Count == 0)
+			return node;
+		var children = BuildV2Items(toc.Children, nodes, parent, sitePrefix);
+		return new TocOverrideNode(node, children, parent.NavigationRoot, parent);
+	}
+
+	/// <summary>
+	/// Wraps an existing toc node but replaces its children with a V2-specified subset.
+	/// Used when a <c>toc:</c> entry in <c>navigation-v2.yml</c> declares explicit children,
+	/// so we can show fewer items without mutating the shared V1 node.
+	/// </summary>
+	private sealed class TocOverrideNode(
+		IRootNavigationItem<IDocumentationFile, INavigationItem> source,
+		IReadOnlyList<INavigationItem> children,
+		IRootNavigationItem<INavigationModel, INavigationItem> navigationRoot,
+		INodeNavigationItem<INavigationModel, INavigationItem> parent
+	) : INodeNavigationItem<INavigationModel, INavigationItem>
+	{
+		public string Id => source.Id;
+		public string Url => source.Url;
+		public string NavigationTitle => source.NavigationTitle;
+		public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot => navigationRoot;
+		public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; } = parent;
+		public bool Hidden => source.Hidden;
+		public int NavigationIndex { get; set; }
+		public ILeafNavigationItem<INavigationModel> Index => source.Index;
+		public IReadOnlyCollection<INavigationItem> NavigationItems => children;
+	}
+
 	private static LabelNavigationNode CreateLabel(
 		LabelNavV2Item label,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,

From 46d2f6e41e2cef9e748398c72318d5d930369e10 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 15 Apr 2026 17:07:22 +0200
Subject: [PATCH 065/226] fix(nav-v2): use resolvable EDOT SDK navigation links

Keep the new EDOT SDK group in nav-v2 while linking it to the current EDOT SDK index page and restoring only the V1 crosslinks that the assembler can resolve today.

Co-authored-by: OpenAI Assistant <assistant@openai.com>
Made-with: Cursor
---
 config/navigation-v2.yml | 12 +++++++++++-
 config/navigation.yml    | 39 ++++++++++++++++++---------------------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index dba6204258..9013fbcdb4 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -398,7 +398,17 @@ nav:
         - toc: opentelemetry://reference/motlp
         - toc: opentelemetry://reference/edot-cloud-forwarder
         - toc: elastic-agent://reference/edot-collector
-        - toc: opentelemetry://reference/edot-sdks
+        - group: EDOT SDKs
+          page: opentelemetry://reference/edot-sdks/index.md
+          children:
+          - toc: apm-agent-android://reference/edot-android
+          - toc: elastic-otel-dotnet://reference/edot-dotnet
+          - toc: apm-agent-ios://reference/edot-ios
+          - toc: elastic-otel-java://reference/edot-java
+          - toc: elastic-otel-node://reference/edot-node
+          - toc: elastic-otel-php://reference/edot-php
+          - toc: elastic-otel-python://reference/edot-python
+          - toc: elastic-otel-rum-js://reference/edot-browser
         - toc: docs-content://reference/fleet
         - toc: integration-docs://reference
         - toc: elasticsearch://reference/search-connectors
diff --git a/config/navigation.yml b/config/navigation.yml
index 324f30b728..01d93faeec 100644
--- a/config/navigation.yml
+++ b/config/navigation.yml
@@ -479,27 +479,24 @@ toc:
                     path_prefix: reference/opentelemetry/edot-cloud-forwarder/gcp
               - toc: elastic-agent://reference/edot-collector
                 path_prefix: reference/edot-collector
-              - toc: opentelemetry://reference/edot-sdks
-                path_prefix: reference/opentelemetry/edot-sdks
-                children:
-                  - toc: apm-agent-android://reference/edot-android
-                    path_prefix: reference/opentelemetry/edot-sdks/android
-                  - toc: elastic-otel-dotnet://reference/edot-dotnet
-                    path_prefix: reference/opentelemetry/edot-sdks/dotnet
-                  - toc: apm-agent-ios://reference/edot-ios
-                    path_prefix: reference/opentelemetry/edot-sdks/ios
-                  - toc: elastic-otel-java://reference/edot-java
-                    path_prefix: reference/opentelemetry/edot-sdks/java
-                  - toc: elastic-otel-node://reference/edot-node
-                    path_prefix: reference/opentelemetry/edot-sdks/node
-                  - toc: elastic-otel-php://reference/edot-php
-                    path_prefix: reference/opentelemetry/edot-sdks/php
-                  - toc: elastic-otel-python://reference/edot-python
-                    path_prefix: reference/opentelemetry/edot-sdks/python
-                  # EDOT Browser (RUM)
-                  # https://github.com/elastic/elastic-otel-rum-js/blob/main/docs/reference/edot-browser/toc.yml
-                  - toc: elastic-otel-rum-js://reference/edot-browser
-                    path_prefix: reference/opentelemetry/edot-sdks/browser
+              - toc: apm-agent-android://reference/edot-android
+                path_prefix: reference/opentelemetry/edot-sdks/android
+              - toc: elastic-otel-dotnet://reference/edot-dotnet
+                path_prefix: reference/opentelemetry/edot-sdks/dotnet
+              - toc: apm-agent-ios://reference/edot-ios
+                path_prefix: reference/opentelemetry/edot-sdks/ios
+              - toc: elastic-otel-java://reference/edot-java
+                path_prefix: reference/opentelemetry/edot-sdks/java
+              - toc: elastic-otel-node://reference/edot-node
+                path_prefix: reference/opentelemetry/edot-sdks/node
+              - toc: elastic-otel-php://reference/edot-php
+                path_prefix: reference/opentelemetry/edot-sdks/php
+              - toc: elastic-otel-python://reference/edot-python
+                path_prefix: reference/opentelemetry/edot-sdks/python
+              # EDOT Browser (RUM)
+              # https://github.com/elastic/elastic-otel-rum-js/blob/main/docs/reference/edot-browser/toc.yml
+              - toc: elastic-otel-rum-js://reference/edot-browser
+                path_prefix: reference/opentelemetry/edot-sdks/browser
 
           # Elastic Integrations
           # https://github.com/elastic/integration-docs/blob/main/docs/reference/toc.yml

From 21e88aaefa4798fb2994492eb55e6357692d46d1 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 16 Apr 2026 17:10:48 +0200
Subject: [PATCH 066/226] feat(nav-v2): add section: item type for independent
 nav islands

Introduces the `section:` YAML item type in navigation-v2.yml. Each
section owns an independent sidebar tree and optionally appears as a
tab in the secondary nav bar. Sections marked `isolated: true` render
with a back arrow instead of a top bar tab.

Key changes:
- SectionNavV2Item record + YAML parsing in NavV2FileYamlConverter
- SectionNavigationNode nav type + NavigationSection data carrier
- SiteNavigationV2 builds sections, URL-to-section lookup
- GlobalNavigationHtmlWriter renders per-section sidebar (cached)
- NavigationRenderResult carries section metadata
- _SecondaryNav.cshtml is now data-driven (falls back to static V1)
- _TocTree.cshtml shows back arrow for isolated sections
- PlaceholderPageWriter groups by section for per-section nav

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Elastic.Codex/Page/Index.cshtml           |   2 +
 .../Toc/NavigationV2File.cs                   |  25 ++++
 .../V2/NavigationSection.cs                   |  17 +++
 .../V2/SectionNavigationNode.cs               |  77 ++++++++++
 .../V2/SiteNavigationV2.cs                    |  86 ++++++++++-
 .../Layout/_SecondaryNav.cshtml               |  88 +++++++-----
 .../Navigation/INavigationHtmlWriter.cs       |   9 +-
 .../Navigation/NavigationViewModel.cs         |   3 +
 .../Navigation/_TocTree.cshtml                |  11 ++
 src/Elastic.Documentation.Site/_ViewModels.cs |   7 +
 src/Elastic.Markdown/HtmlWriter.cs            |   2 +
 src/Elastic.Markdown/Page/Index.cshtml        |   2 +
 src/Elastic.Markdown/Page/IndexViewModel.cs   |   7 +
 .../Building/PlaceholderPageWriter.cs         |  33 +++--
 .../Navigation/GlobalNavigationHtmlWriter.cs  | 136 +++++++++++++-----
 15 files changed, 419 insertions(+), 86 deletions(-)
 create mode 100644 src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
 create mode 100644 src/Elastic.Documentation.Navigation/V2/SectionNavigationNode.cs

diff --git a/src/Elastic.Codex/Page/Index.cshtml b/src/Elastic.Codex/Page/Index.cshtml
index a7f1f08d7e..af56abd0b0 100644
--- a/src/Elastic.Codex/Page/Index.cshtml
+++ b/src/Elastic.Codex/Page/Index.cshtml
@@ -49,6 +49,8 @@
 		Previous = Model.PreviousDocument,
 		Next = Model.NextDocument,
 		NavigationHtml = Model.NavigationHtml,
+		NavV2Sections = Model.NavV2Sections,
+		ActiveSectionId = Model.ActiveSectionId,
 		UrlPathPrefix = Model.UrlPathPrefix,
 		GithubEditUrl = Model.GithubEditUrl,
 		MarkdownUrl = Model.MarkdownUrl,
diff --git a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
index 9a61e1396f..e43453a081 100644
--- a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
+++ b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
@@ -27,6 +27,18 @@ IReadOnlyList<INavV2Item> Children
 /// </summary>
 public record PageNavV2Item(Uri? Page, string? Title) : INavV2Item;
 
+/// <summary>
+/// A top-level section that owns an independent sidebar tree and (optionally) a tab in the
+/// secondary nav bar. When <see cref="Isolated"/> is <c>true</c> the section does not appear
+/// in the top bar and renders with a back-arrow instead.
+/// </summary>
+public record SectionNavV2Item(
+	string Label,
+	string Url,
+	bool Isolated,
+	IReadOnlyList<INavV2Item> Children
+) : INavV2Item;
+
 /// <summary>
 /// A folder node — has a title and children, with an optional <c>page:</c> URI.
 /// When <see cref="Page"/> is set, the header is a real clickable link; otherwise it renders
@@ -110,6 +122,19 @@ private static IReadOnlyList<INavV2Item> ReadItemList(IParser parser, ObjectDese
 				parser.SkipThisAndNestedEvents();
 		}
 
+		if (dict.TryGetValue("section", out var sectionVal) && sectionVal is string sectionStr)
+		{
+			var sectionUrl = dict.TryGetValue("url", out var suVal) && suVal is string suStr ? suStr : "/";
+			var isolated = dict.TryGetValue("isolated", out var isoVal)
+				&& isoVal is string isoStr
+				&& bool.TryParse(isoStr, out var isoBool)
+				&& isoBool;
+			var sectionChildren = dict.TryGetValue("children", out var sch) && sch is IReadOnlyList<INavV2Item> sChildList
+				? sChildList
+				: [];
+			return new SectionNavV2Item(sectionStr, sectionUrl, isolated, sectionChildren);
+		}
+
 		if (dict.TryGetValue("label", out var labelVal) && labelVal is string labelStr)
 		{
 			var expanded = dict.TryGetValue("expanded", out var expVal)
diff --git a/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs b/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
new file mode 100644
index 0000000000..41c99ee76a
--- /dev/null
+++ b/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
@@ -0,0 +1,17 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+namespace Elastic.Documentation.Navigation.V2;
+
+/// <summary>
+/// Lightweight data carrier for a navigation section, used by the rendering layer
+/// to drive the secondary nav bar tabs and resolve which sidebar to show.
+/// </summary>
+public record NavigationSection(
+	string Id,
+	string Label,
+	string Url,
+	bool Isolated,
+	IReadOnlyList<INavigationItem> NavigationItems
+);
diff --git a/src/Elastic.Documentation.Navigation/V2/SectionNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/SectionNavigationNode.cs
new file mode 100644
index 0000000000..2e0012bf75
--- /dev/null
+++ b/src/Elastic.Documentation.Navigation/V2/SectionNavigationNode.cs
@@ -0,0 +1,77 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Documentation.Extensions;
+
+namespace Elastic.Documentation.Navigation.V2;
+
+/// <summary>
+/// A top-level section that owns an independent sidebar nav tree.
+/// Unlike <see cref="LabelNavigationNode"/>, a section has a real URL (the tab link)
+/// and an <see cref="Isolated"/> flag that controls whether it appears in the top bar.
+/// </summary>
+public class SectionNavigationNode : INodeNavigationItem<INavigationModel, INavigationItem>
+{
+	private readonly SectionIndexLeaf _index;
+
+	public SectionNavigationNode(
+		string label,
+		string url,
+		bool isolated,
+		IReadOnlyCollection<INavigationItem> children,
+		INodeNavigationItem<INavigationModel, INavigationItem>? parent
+	)
+	{
+		Id = ShortId.Create("section", label);
+		NavigationTitle = label;
+		Url = url;
+		Isolated = isolated;
+		NavigationItems = children;
+		Parent = parent;
+		NavigationRoot = parent?.NavigationRoot!;
+		_index = new SectionIndexLeaf(this);
+	}
+
+	/// <summary>Whether this section is excluded from the top bar and renders with a back arrow.</summary>
+	public bool Isolated { get; }
+
+	/// <inheritdoc />
+	public string Id { get; }
+
+	/// <inheritdoc />
+	public string Url { get; }
+
+	/// <inheritdoc />
+	public string NavigationTitle { get; }
+
+	/// <inheritdoc />
+	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
+
+	/// <inheritdoc />
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
+
+	/// <inheritdoc />
+	public bool Hidden => false;
+
+	/// <inheritdoc />
+	public int NavigationIndex { get; set; }
+
+	/// <inheritdoc />
+	public ILeafNavigationItem<INavigationModel> Index => _index;
+
+	/// <inheritdoc />
+	public IReadOnlyCollection<INavigationItem> NavigationItems { get; }
+
+	private sealed class SectionIndexLeaf(SectionNavigationNode owner)
+		: ILeafNavigationItem<INavigationModel>, INavigationModel
+	{
+		public INavigationModel Model => this;
+		public string Url => owner.Url;
+		public string NavigationTitle => owner.NavigationTitle;
+		public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot => owner.NavigationRoot;
+		public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; } = owner;
+		public bool Hidden => true;
+		public int NavigationIndex { get; set; }
+	}
+}
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 8a82d44bef..6f5955d381 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -10,14 +10,19 @@
 namespace Elastic.Documentation.Navigation.V2;
 
 /// <summary>
-/// Extends <see cref="SiteNavigation"/> with a V2 label-structured sidebar tree derived from
+/// Extends <see cref="SiteNavigation"/> with a V2 section-structured sidebar derived from
 /// <c>navigation-v2.yml</c>. Content is built at the same URL paths as V1 (the original
 /// <paramref name="originalFile"/> is passed to the base constructor unchanged).
-/// Only the sidebar presentation changes — <see cref="V2NavigationItems"/> exposes the
-/// label/placeholder hierarchy used by <c>_TocTreeNavV2.cshtml</c>.
+/// <para>
+/// Top-level <c>section:</c> items become independent nav trees (<see cref="Sections"/>).
+/// Each section drives a tab in the secondary nav bar and its own sidebar.
+/// Sections marked <c>isolated: true</c> do not appear in the top bar and render with a back arrow.
+/// </para>
 /// </summary>
 public class SiteNavigationV2 : SiteNavigation
 {
+	private readonly Dictionary<string, NavigationSection> _urlToSection = new(StringComparer.OrdinalIgnoreCase);
+
 	public SiteNavigationV2(
 		NavigationV2File v2File,
 		SiteNavigationFile originalFile,
@@ -25,15 +30,69 @@ public SiteNavigationV2(
 		IReadOnlyCollection<IDocumentationSetNavigation> documentationSetNavigations,
 		string? sitePrefix
 	) : base(originalFile, context, documentationSetNavigations, sitePrefix)
-		=> V2NavigationItems = BuildV2Items(v2File.Nav, Nodes, this, sitePrefix ?? string.Empty);
+	{
+		var prefix = sitePrefix ?? string.Empty;
+		V2NavigationItems = BuildV2Items(v2File.Nav, Nodes, this, prefix);
+		Sections = BuildSections(V2NavigationItems);
+		BuildUrlToSectionLookup();
+	}
 
 	/// <summary>
-	/// Label-structured navigation items for V2 sidebar rendering.
-	/// Contains <see cref="LabelNavigationNode"/>, <see cref="PlaceholderNavigationLeaf"/>,
-	/// <see cref="PageCrossLinkLeaf"/>, and existing <see cref="IRootNavigationItem{TIndex,TChildNavigation}"/> nodes.
+	/// All V2 navigation items (flat list including sections, labels, etc.).
+	/// Used for placeholder generation and full-tree traversal.
 	/// </summary>
 	public IReadOnlyList<INavigationItem> V2NavigationItems { get; }
 
+	/// <summary>
+	/// Top-level sections extracted from <see cref="V2NavigationItems"/>.
+	/// Each section owns an independent sidebar nav tree.
+	/// </summary>
+	public IReadOnlyList<NavigationSection> Sections { get; }
+
+	/// <summary>
+	/// Resolves which section a page belongs to by its URL.
+	/// Returns the first non-isolated section as fallback for unresolved URLs.
+	/// </summary>
+	public NavigationSection? GetSectionForUrl(string? pageUrl)
+	{
+		if (pageUrl is not null)
+		{
+			var normalized = pageUrl.TrimEnd('/');
+			if (_urlToSection.TryGetValue(normalized, out var section))
+				return section;
+			if (_urlToSection.TryGetValue(normalized + "/", out section))
+				return section;
+		}
+		return Sections.FirstOrDefault(s => !s.Isolated);
+	}
+
+	private static IReadOnlyList<NavigationSection> BuildSections(IReadOnlyList<INavigationItem> items) =>
+		items
+			.OfType<SectionNavigationNode>()
+			.Select(s => new NavigationSection(s.Id, s.NavigationTitle, s.Url, s.Isolated, [.. s.NavigationItems]))
+			.ToList();
+
+	private void BuildUrlToSectionLookup()
+	{
+		foreach (var section in Sections)
+			CollectUrls(section.NavigationItems, section);
+	}
+
+	private void CollectUrls(IEnumerable<INavigationItem> items, NavigationSection section)
+	{
+		foreach (var item in items)
+		{
+			if (!string.IsNullOrEmpty(item.Url))
+			{
+				var normalized = item.Url.TrimEnd('/');
+				_ = _urlToSection.TryAdd(normalized, section);
+			}
+
+			if (item is INodeNavigationItem<INavigationModel, INavigationItem> node)
+				CollectUrls(node.NavigationItems, section);
+		}
+	}
+
 	private static IReadOnlyList<INavigationItem> BuildV2Items(
 		IReadOnlyList<INavV2Item> v2Items,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
@@ -54,6 +113,7 @@ string sitePrefix
 	) =>
 		item switch
 		{
+			SectionNavV2Item section => CreateSection(section, nodes, parent, sitePrefix),
 			LabelNavV2Item label => CreateLabel(label, nodes, parent, sitePrefix),
 			GroupNavV2Item group => CreateGroup(group, nodes, parent, sitePrefix),
 			TocNavV2Item toc => CreateToc(toc, nodes, parent, sitePrefix),
@@ -100,6 +160,18 @@ INodeNavigationItem<INavigationModel, INavigationItem> parent
 		public IReadOnlyCollection<INavigationItem> NavigationItems => children;
 	}
 
+	private static SectionNavigationNode CreateSection(
+		SectionNavV2Item section,
+		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
+		INodeNavigationItem<INavigationModel, INavigationItem> parent,
+		string sitePrefix
+	)
+	{
+		var placeholder = new SectionNavigationNode(section.Label, section.Url, section.Isolated, [], parent);
+		var children = BuildV2Items(section.Children, nodes, placeholder, sitePrefix);
+		return new SectionNavigationNode(section.Label, section.Url, section.Isolated, children, parent);
+	}
+
 	private static LabelNavigationNode CreateLabel(
 		LabelNavV2Item label,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index 84f03e90fd..736b5753db 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -1,3 +1,4 @@
+@using System.Linq
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
 <div class="md:sticky md:top-0 md:z-30 bg-grey-10">
 	<ask-ai></ask-ai>
@@ -11,38 +12,61 @@
 				<a href="@Model.Link("/")"
 				   class="text-lg leading-[1em] hover:text-blue-elastic active:text-blue-elastic-100">Docs</a>
 			</div>
-			<ul class="flex gap-6 font-sans font-semibold text-sm text-ink-light md:text-base">
-				<li class="text-nowrap hover:text-blue-elastic active:text-blue-elastic-100">
-					<a
-						href="@Model.Link("/release-notes/")"
-						@Model.Htmx.GetHxAttributes(
-							hxSwapOob: "#main-container,#secondary-nav"
-						)
-					>
-						Release notes
-					</a>
-				</li>
-				<li class="text-nowrap hover:text-blue-elastic active:text-blue-elastic-100">
-					<a
-						href="@Model.Link("/troubleshoot/")"
-						@Model.Htmx.GetHxAttributes(
-							hxSwapOob: "#main-container,#secondary-nav"
-						)
-					>
-						Troubleshoot
-					</a>
-				</li>
-				<li class="text-nowrap hover:text-blue-elastic active:text-blue-elastic-100">
-					<a
-						href="@Model.Link("/reference/")"
-						@Model.Htmx.GetHxAttributes(
-							hxSwapOob: "#main-container,#secondary-nav"
-						)
-					>
-						Reference
-					</a>
-				</li>
-			</ul>
+			@if (Model.NavV2Sections is { Count: > 0 } navTabs)
+			{
+				<ul class="flex gap-6 font-sans font-semibold text-sm text-ink-light md:text-base">
+				@foreach (var navTab in navTabs.Where(s => !s.Isolated))
+				{
+					var isActive = navTab.Id == Model.ActiveSectionId;
+					<li class="text-nowrap @(isActive ? "text-blue-elastic" : "hover:text-blue-elastic active:text-blue-elastic-100")"
+						data-section-id="@navTab.Id">
+						<a
+							href="@Model.Link(navTab.Url)"
+							@Model.Htmx.GetHxAttributes(
+								hxSwapOob: "#main-container,#secondary-nav"
+							)
+						>
+							@navTab.Label
+						</a>
+					</li>
+				}
+				</ul>
+			}
+			else
+			{
+				<ul class="flex gap-6 font-sans font-semibold text-sm text-ink-light md:text-base">
+					<li class="text-nowrap hover:text-blue-elastic active:text-blue-elastic-100">
+						<a
+							href="@Model.Link("/release-notes/")"
+							@Model.Htmx.GetHxAttributes(
+								hxSwapOob: "#main-container,#secondary-nav"
+							)
+						>
+							Release notes
+						</a>
+					</li>
+					<li class="text-nowrap hover:text-blue-elastic active:text-blue-elastic-100">
+						<a
+							href="@Model.Link("/troubleshoot/")"
+							@Model.Htmx.GetHxAttributes(
+								hxSwapOob: "#main-container,#secondary-nav"
+							)
+						>
+							Troubleshoot
+						</a>
+					</li>
+					<li class="text-nowrap hover:text-blue-elastic active:text-blue-elastic-100">
+						<a
+							href="@Model.Link("/reference/")"
+							@Model.Htmx.GetHxAttributes(
+								hxSwapOob: "#main-container,#secondary-nav"
+							)
+						>
+							Reference
+						</a>
+					</li>
+				</ul>
+			}
 		</div>
 	</nav>
 </div>
diff --git a/src/Elastic.Documentation.Site/Navigation/INavigationHtmlWriter.cs b/src/Elastic.Documentation.Site/Navigation/INavigationHtmlWriter.cs
index c26a89a674..6d73feccbf 100644
--- a/src/Elastic.Documentation.Site/Navigation/INavigationHtmlWriter.cs
+++ b/src/Elastic.Documentation.Site/Navigation/INavigationHtmlWriter.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Documentation.Navigation;
+using Elastic.Documentation.Navigation.V2;
 using RazorSlices;
 
 namespace Elastic.Documentation.Site.Navigation;
@@ -26,9 +27,15 @@ public record NavigationRenderResult
 	public static NavigationRenderResult Empty { get; } = new()
 	{
 		Html = string.Empty,
-		Id = "empty-navigation" // random id
+		Id = "empty-navigation"
 	};
 
 	public required string Html { get; init; }
 	public required string Id { get; init; }
+
+	/// <summary>V2 section metadata for the secondary nav bar. Null for V1 builds.</summary>
+	public IReadOnlyList<NavigationSection>? Sections { get; init; }
+
+	/// <summary>The active section ID for highlighting the current tab.</summary>
+	public string? ActiveSectionId { get; init; }
 }
diff --git a/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs b/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
index 57c7b6b9c9..a092e7ac17 100644
--- a/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
+++ b/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
@@ -26,4 +26,7 @@ public class NavigationViewModel
 
 	/// <summary>When true, the sidebar renders using the V2 nav partial with accordion behaviour.</summary>
 	public bool IsNavV2 { get; init; }
+
+	/// <summary>When true, the sidebar renders a back arrow instead of appearing in the top bar.</summary>
+	public bool IsIsolatedSection { get; init; }
 }
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
index 5739ad37a6..bfcb6f13f3 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
@@ -71,6 +71,17 @@
 	<div class="pages-nav-menu min-h-0 min-w-0 flex-1 overflow-y-auto">
 	@if (Model.IsNavV2)
 	{
+		@if (Model.IsIsolatedSection)
+		{
+			<a href="/"
+			   @Model.Htmx.GetNavHxAttributes(true, null)
+			   class="flex items-center gap-2 px-4 py-3 text-sm font-semibold text-ink-light hover:text-blue-elastic border-b border-grey-20">
+				<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="w-4 h-4" aria-hidden="true">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5 3 12m0 0 7.5-7.5M3 12h18"/>
+				</svg>
+				Back to Docs
+			</a>
+		}
 		@* Root for V2-only CSS; JS still uses [data-nav-v2]. Scope overrides: .docs-sidebar-nav-v2 … *@
 		<nav class="docs-sidebar-nav-v2" data-nav-v2>
 			<ul class="docs-sidebar-nav-v2__tree block" id="nav-tree">
diff --git a/src/Elastic.Documentation.Site/_ViewModels.cs b/src/Elastic.Documentation.Site/_ViewModels.cs
index d171e961e8..e08b71ea5d 100644
--- a/src/Elastic.Documentation.Site/_ViewModels.cs
+++ b/src/Elastic.Documentation.Site/_ViewModels.cs
@@ -9,6 +9,7 @@
 using Elastic.Documentation.Configuration.Assembler;
 using Elastic.Documentation.Configuration.Builder;
 using Elastic.Documentation.Navigation;
+using Elastic.Documentation.Navigation.V2;
 using Elastic.Documentation.Site.FileProviders;
 
 namespace Elastic.Documentation.Site;
@@ -66,6 +67,12 @@ public record GlobalLayoutViewModel
 
 	public BuildType BuildType { get; init; } = BuildType.Isolated;
 
+	/// <summary>V2 section metadata for the secondary nav bar tabs. Null for V1 builds.</summary>
+	public IReadOnlyList<NavigationSection>? NavV2Sections { get; init; }
+
+	/// <summary>The active section ID for highlighting the current tab in the secondary nav.</summary>
+	public string? ActiveSectionId { get; init; }
+
 	public bool RenderHamburgerIcon { get; init; } = true;
 
 	/// <summary>Root path for static assets. For codex builds, strips the /r/repoName segment from the URL path prefix.</summary>
diff --git a/src/Elastic.Markdown/HtmlWriter.cs b/src/Elastic.Markdown/HtmlWriter.cs
index 4f309b47f2..08f45da533 100644
--- a/src/Elastic.Markdown/HtmlWriter.cs
+++ b/src/Elastic.Markdown/HtmlWriter.cs
@@ -151,6 +151,8 @@ private async Task<RenderResult> RenderLayout(MarkdownFile markdown, MarkdownDoc
 			NextDocument = next,
 			Breadcrumbs = breadcrumbs,
 			NavigationHtml = navigationHtmlRenderResult.Html,
+			NavV2Sections = navigationHtmlRenderResult.Sections,
+			ActiveSectionId = navigationHtmlRenderResult.ActiveSectionId,
 			UrlPathPrefix = markdown.UrlPathPrefix,
 			SiteRootPath = DocumentationSet.Context.SiteRootPath,
 			AppliesTo = markdown.YamlFrontMatter?.AppliesTo,
diff --git a/src/Elastic.Markdown/Page/Index.cshtml b/src/Elastic.Markdown/Page/Index.cshtml
index c73cdb6f55..f820b165a6 100644
--- a/src/Elastic.Markdown/Page/Index.cshtml
+++ b/src/Elastic.Markdown/Page/Index.cshtml
@@ -35,6 +35,8 @@
 		Previous = Model.PreviousDocument,
 		Next = Model.NextDocument,
 		NavigationHtml = Model.NavigationHtml,
+		NavV2Sections = Model.NavV2Sections,
+		ActiveSectionId = Model.ActiveSectionId,
 		UrlPathPrefix = Model.UrlPathPrefix,
 		GithubEditUrl = Model.GithubEditUrl,
 		MarkdownUrl = Model.MarkdownUrl,
diff --git a/src/Elastic.Markdown/Page/IndexViewModel.cs b/src/Elastic.Markdown/Page/IndexViewModel.cs
index f64968f5e1..790dae37f7 100644
--- a/src/Elastic.Markdown/Page/IndexViewModel.cs
+++ b/src/Elastic.Markdown/Page/IndexViewModel.cs
@@ -11,6 +11,7 @@
 using Elastic.Documentation.Configuration.Products;
 using Elastic.Documentation.Configuration.Versions;
 using Elastic.Documentation.Navigation;
+using Elastic.Documentation.Navigation.V2;
 using Elastic.Documentation.Site;
 using Elastic.Documentation.Site.FileProviders;
 using Elastic.Markdown.IO;
@@ -36,6 +37,12 @@ public class IndexViewModel
 
 	public required string NavigationHtml { get; init; }
 
+	/// <summary>V2 section metadata for the secondary nav bar tabs. Null for V1 builds.</summary>
+	public IReadOnlyList<NavigationSection>? NavV2Sections { get; init; }
+
+	/// <summary>The active section ID for highlighting the current tab in the secondary nav.</summary>
+	public string? ActiveSectionId { get; init; }
+
 	public required string? CurrentVersion { get; init; }
 
 	public required string? AllVersionsUrl { get; init; }
diff --git a/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs b/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs
index 5261a32d97..f3728b995b 100644
--- a/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs
@@ -12,6 +12,7 @@
 using Elastic.Documentation.Navigation;
 using Elastic.Documentation.Navigation.V2;
 using Elastic.Documentation.Site;
+using Elastic.Documentation.Site.Navigation;
 using Elastic.Documentation.Site.FileProviders;
 using Elastic.Markdown;
 using Elastic.Markdown.Page;
@@ -39,16 +40,24 @@ StaticFileContentHashProvider staticFileHashProvider
 
 	public async Task WriteAllAsync(Cancel ctx)
 	{
-		var navHtml = (await htmlWriter.RenderNavigation(navigation, navigation.Index, ctx)).Html;
-
 		var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-		var placeholders = CollectPlaceholders(navigation.V2NavigationItems);
+		var placeholders = CollectPlaceholders(navigation.V2NavigationItems).ToList();
 
-		foreach (var (title, navItem) in placeholders)
+		// Group placeholders by section so we render each section's nav once
+		var groups = placeholders.GroupBy(p => navigation.GetSectionForUrl(p.Item.Url));
+		foreach (var group in groups)
 		{
-			if (!seen.Add(navItem.Url))
-				continue;
-			await WritePlaceholderPageAsync(title, navItem, navHtml, ctx);
+			var section = group.Key;
+			// Use the first placeholder in the group to resolve the section's nav HTML
+			var representative = group.First().Item;
+			var renderResult = await htmlWriter.RenderNavigation(navigation, representative, ctx);
+
+			foreach (var (title, navItem) in group)
+			{
+				if (!seen.Add(navItem.Url))
+					continue;
+				await WritePlaceholderPageAsync(title, navItem, renderResult, ctx);
+			}
 		}
 
 		_logger.LogInformation("Wrote {Count} placeholder pages", seen.Count);
@@ -85,11 +94,11 @@ IReadOnlyList<INavigationItem> items
 	private async Task WritePlaceholderPageAsync(
 		string title,
 		ILeafNavigationItem<INavigationModel> navItem,
-		string navHtml,
+		NavigationRenderResult renderResult,
 		Cancel ctx
 	)
 	{
-		var model = CreateViewModel(title, navItem, navHtml);
+		var model = CreateViewModel(title, navItem, renderResult);
 		var slice = PlaceholderPage.Create(model);
 		var html = await slice.RenderAsync(cancellationToken: ctx);
 
@@ -106,7 +115,7 @@ Cancel ctx
 	private MarkdownLayoutViewModel CreateViewModel(
 		string title,
 		ILeafNavigationItem<INavigationModel> navItem,
-		string navHtml
+		NavigationRenderResult renderResult
 	)
 	{
 		var env = context.Environment;
@@ -123,7 +132,9 @@ string navHtml
 			CurrentNavigationItem = navItem,
 			Previous = null,
 			Next = null,
-			NavigationHtml = navHtml,
+			NavigationHtml = renderResult.Html,
+			NavV2Sections = renderResult.Sections,
+			ActiveSectionId = renderResult.ActiveSectionId,
 			UrlPathPrefix = urlPathPrefix,
 			Htmx = new DefaultHtmxAttributeProvider(rootPath),
 			CanonicalBaseUrl = context.CanonicalBaseUrl,
diff --git a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
index 49af8a0d33..e94418a7d1 100644
--- a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -23,15 +23,13 @@ public class GlobalNavigationHtmlWriter(ILoggerFactory logFactory, SiteNavigatio
 
 	public async Task<NavigationRenderResult> RenderNavigation(
 		IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation,
-#pragma warning disable IDE0060
-		INavigationItem currentNavigationItem, // temporary https://github.com/elastic/docs-content/pull/3730
-#pragma warning restore IDE0060
+		INavigationItem currentNavigationItem,
 		Cancel ctx = default
 	)
 	{
-		// V2 nav: always render the full V2 tree regardless of current section
+		// V2 nav: render per-section sidebar based on current page
 		if (globalNavigation is SiteNavigationV2 navV2)
-			return await RenderV2Navigation(navV2, ctx);
+			return await RenderSectionNavigation(navV2, currentNavigationItem, ctx);
 
 		if (currentRootNavigation is SiteNavigation)
 			return NavigationRenderResult.Empty;
@@ -69,25 +67,50 @@ public async Task<NavigationRenderResult> RenderNavigation(
 		}
 	}
 
-	private const string NavV2CacheKey = "nav-v2";
-
-	private async Task<NavigationRenderResult> RenderV2Navigation(SiteNavigationV2 navV2, Cancel ctx)
+	private async Task<NavigationRenderResult> RenderSectionNavigation(
+		SiteNavigationV2 navV2,
+		INavigationItem currentNavigationItem,
+		Cancel ctx
+	)
 	{
-		if (_renderedNavigationCache.TryGetValue(NavV2CacheKey, out var cachedHtml))
-			return new NavigationRenderResult { Html = cachedHtml, Id = NavV2CacheKey };
+		var section = navV2.GetSectionForUrl(currentNavigationItem.Url);
+		if (section is null)
+		{
+			// Fallback: render full V2 tree if no sections are defined
+			return await RenderFullV2Navigation(navV2, ctx);
+		}
+
+		var cacheKey = $"nav-v2-section-{section.Id}";
+		if (_renderedNavigationCache.TryGetValue(cacheKey, out var cachedHtml))
+			return CreateSectionResult(cachedHtml, section, navV2);
 
 		await _semaphore.WaitAsync(ctx);
 		try
 		{
-			if (_renderedNavigationCache.TryGetValue(NavV2CacheKey, out cachedHtml))
-				return new NavigationRenderResult { Html = cachedHtml, Id = NavV2CacheKey };
+			if (_renderedNavigationCache.TryGetValue(cacheKey, out cachedHtml))
+				return CreateSectionResult(cachedHtml, section, navV2);
 
-			_logger.LogInformation("Rendering V2 navigation");
+			_logger.LogInformation("Rendering V2 section navigation: {SectionLabel} ({SectionId})", section.Label, section.Id);
+
+			var wrapper = new SectionNavigationV2Wrapper(section, navV2);
+			var model = new NavigationViewModel
+			{
+				Title = section.Label,
+				TitleUrl = section.Url,
+				Tree = wrapper,
+				IsPrimaryNavEnabled = true,
+				IsUsingNavigationDropdown = false,
+				IsGlobalAssemblyBuild = true,
+				TopLevelItems = [],
+				Htmx = new DefaultHtmxAttributeProvider("/"),
+				BuildType = BuildType.Assembler,
+				IsNavV2 = true,
+				IsIsolatedSection = section.Isolated
+			};
 
-			var model = CreateV2NavigationModel(navV2);
 			var html = await ((INavigationHtmlWriter)this).Render(model, ctx);
-			_renderedNavigationCache[NavV2CacheKey] = html;
-			return new NavigationRenderResult { Html = html, Id = NavV2CacheKey };
+			_renderedNavigationCache[cacheKey] = html;
+			return CreateSectionResult(html, section, navV2);
 		}
 		finally
 		{
@@ -95,22 +118,53 @@ private async Task<NavigationRenderResult> RenderV2Navigation(SiteNavigationV2 n
 		}
 	}
 
-	private static NavigationViewModel CreateV2NavigationModel(SiteNavigationV2 navV2)
-	{
-		var syntheticV2Root = new SiteNavigationV2Wrapper(navV2);
-		return new NavigationViewModel
+	private static NavigationRenderResult CreateSectionResult(string html, NavigationSection activeSection, SiteNavigationV2 navV2) =>
+		new()
 		{
-			Title = "Elastic Docs",
-			TitleUrl = navV2.Url,
-			Tree = syntheticV2Root,
-			IsPrimaryNavEnabled = true,
-			IsUsingNavigationDropdown = false,
-			IsGlobalAssemblyBuild = true,
-			TopLevelItems = [],
-			Htmx = new DefaultHtmxAttributeProvider("/"),
-			BuildType = BuildType.Assembler,
-			IsNavV2 = true
+			Html = html,
+			Id = $"nav-v2-section-{activeSection.Id}",
+			Sections = navV2.Sections,
+			ActiveSectionId = activeSection.Id
 		};
+
+	/// <summary>Fallback when no <c>section:</c> items exist — renders the full V2 tree as before.</summary>
+	private async Task<NavigationRenderResult> RenderFullV2Navigation(SiteNavigationV2 navV2, Cancel ctx)
+	{
+		const string cacheKey = "nav-v2";
+		if (_renderedNavigationCache.TryGetValue(cacheKey, out var cachedHtml))
+			return new NavigationRenderResult { Html = cachedHtml, Id = cacheKey };
+
+		await _semaphore.WaitAsync(ctx);
+		try
+		{
+			if (_renderedNavigationCache.TryGetValue(cacheKey, out cachedHtml))
+				return new NavigationRenderResult { Html = cachedHtml, Id = cacheKey };
+
+			_logger.LogInformation("Rendering V2 navigation (full tree fallback)");
+
+			var syntheticV2Root = new FullV2Wrapper(navV2);
+			var model = new NavigationViewModel
+			{
+				Title = "Elastic Docs",
+				TitleUrl = navV2.Url,
+				Tree = syntheticV2Root,
+				IsPrimaryNavEnabled = true,
+				IsUsingNavigationDropdown = false,
+				IsGlobalAssemblyBuild = true,
+				TopLevelItems = [],
+				Htmx = new DefaultHtmxAttributeProvider("/"),
+				BuildType = BuildType.Assembler,
+				IsNavV2 = true
+			};
+
+			var html = await ((INavigationHtmlWriter)this).Render(model, ctx);
+			_renderedNavigationCache[cacheKey] = html;
+			return new NavigationRenderResult { Html = html, Id = cacheKey };
+		}
+		finally
+		{
+			_ = _semaphore.Release();
+		}
 	}
 
 	private NavigationViewModel CreateNavigationModel(INodeNavigationItem<INavigationModel, INavigationItem> group)
@@ -136,11 +190,23 @@ public void Dispose()
 		GC.SuppressFinalize(this);
 	}
 
-	/// <summary>
-	/// Thin wrapper so <see cref="SiteNavigationV2.V2NavigationItems"/> is exposed as
-	/// <see cref="INodeNavigationItem{TIndex,TChildNavigation}.NavigationItems"/> for the Razor partial.
-	/// </summary>
-	private sealed class SiteNavigationV2Wrapper(SiteNavigationV2 navV2)
+	/// <summary>Wraps a single <see cref="NavigationSection"/> as the sidebar tree root.</summary>
+	private sealed class SectionNavigationV2Wrapper(NavigationSection section, SiteNavigationV2 navV2)
+		: INodeNavigationItem<INavigationModel, INavigationItem>
+	{
+		public string Id => section.Id;
+		public string Url => section.Url;
+		public string NavigationTitle => section.Label;
+		public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot => navV2;
+		public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
+		public bool Hidden => false;
+		public int NavigationIndex { get; set; }
+		public ILeafNavigationItem<INavigationModel> Index => navV2.Index;
+		public IReadOnlyCollection<INavigationItem> NavigationItems => section.NavigationItems;
+	}
+
+	/// <summary>Fallback wrapper exposing the full V2 tree (used when no sections are defined).</summary>
+	private sealed class FullV2Wrapper(SiteNavigationV2 navV2)
 		: INodeNavigationItem<INavigationModel, INavigationItem>
 	{
 		public string Id => "nav-v2-root";

From 071f456fc232a1a958fa87613363b642d04f73b0 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 16 Apr 2026 17:12:12 +0200
Subject: [PATCH 067/226] feat(nav-v2): migrate top-level labels to section:
 items
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Converts the 4 top-level label: entries in navigation-v2.yml to the
new section: format with explicit url: fields. Each section becomes an
independent nav island with its own sidebar and top bar tab.

Sections:
- Elasticsearch fundamentals → /get-started/
- Install, deploy, and administer → /deploy-manage/deploy/
- The Elasticsearch Platform → /manage-data/ingest/
- Solutions and project types → /solutions/

Nested label: items within sections are unchanged.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 9013fbcdb4..eb6d35bac9 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -1,5 +1,6 @@
 nav:
-  - label: Elasticsearch fundamentals
+  - section: Elasticsearch fundamentals
+    url: /get-started/
     children:
     - group: Get started in seconds
       page: docs-content://get-started/index.md
@@ -24,7 +25,8 @@ nav:
           title: Add search to your site or app
         - page: docs-content://solutions/search/rag.md
           title: RAG
-  - label: Install, deploy, and administer
+  - section: Install, deploy, and administer
+    url: /deploy-manage/deploy/
     children:
     - group: Distributed architecture
       page: docs-content://deploy-manage/distributed-architecture.md
@@ -274,7 +276,8 @@ nav:
       children:
       - title: Overview (roundup)
       - toc: ecctl://reference
-  - label: The Elasticsearch Platform
+  - section: The Elasticsearch Platform
+    url: /manage-data/ingest/
     children:
     - label: Ingest and manage data
       children:
@@ -1402,7 +1405,8 @@ nav:
           title: Manage access to AI features
       - page: docs-content://explore-analyze/ai-features/agent-skills.md
         title: AI agent skills for Elastic
-  - label: Solutions and project types
+  - section: Solutions and project types
+    url: /solutions/
     children:
     - page: docs-content://solutions/index.md
       title: Solutions overview

From 3a4643454d128540c18b90d4aea26b620392334e Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 16 Apr 2026 17:49:00 +0200
Subject: [PATCH 068/226] feat(nav-v2): wrap all content in Docs section; add
 Release notes, Troubleshoot, Reference

Restructures navigation-v2.yml so all existing labels are children of
a single "Docs" section (full V2 tree in one sidebar). Adds Release
notes, Troubleshoot, and Reference as separate section tabs.

Secondary nav bar is now left-aligned, compact, and fully data-driven
from section metadata.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml                      | 5598 +++++++++--------
 .../Layout/_SecondaryNav.cshtml               |   40 +-
 2 files changed, 2818 insertions(+), 2820 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index eb6d35bac9..860de00c0f 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -1,311 +1,2074 @@
 nav:
-  - section: Elasticsearch fundamentals
-    url: /get-started/
+  - section: Docs
+    url: /
     children:
-    - group: Get started in seconds
-      page: docs-content://get-started/index.md
+    - label: Elasticsearch fundamentals
       children:
-      - page: docs-content://get-started/evaluate-elastic.md
-        title: Evaluate Elastic during a trial
-    - group: Elasticsearch concepts
-      children:
-      - page: docs-content://manage-data/data-store.md
-        title: Elasticsearch essentials (Core document database)
-      - page: docs-content://manage-data/ingest.md
-        title: Ingest data into Elasticsearch
-      - page: docs-content://solutions/search.md
-        title: Core search features
-      - page: docs-content://explore-analyze/index.md
-        title: Visualize and analyze (Kibana)
-      - group: Use cases
-        children:
-        - page: docs-content://explore-analyze/geospatial-analysis.md
-          title: Geospatial analysis
-        - page: docs-content://solutions/search/site-or-app.md
-          title: Add search to your site or app
-        - page: docs-content://solutions/search/rag.md
-          title: RAG
-  - section: Install, deploy, and administer
-    url: /deploy-manage/deploy/
-    children:
-    - group: Distributed architecture
-      page: docs-content://deploy-manage/distributed-architecture.md
-      children:
-      - page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards.md
-        title: Clusters nodes and shards
-      - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation.md
-        title: Discovery and cluster formation
-      - page: docs-content://deploy-manage/distributed-architecture/kibana-tasks-management.md
-        title: Kibana task management
-      - page: docs-content://deploy-manage/distributed-architecture/reading-and-writing-documents.md
-        title: Reading and writing documents
-      - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md
-        title: Shard allocation relocation and recovery
-      - page: docs-content://deploy-manage/distributed-architecture/shard-request-cache.md
-        title: The shard request cache
-    - group: Plan your install
-      children:
-      - page: docs-content://get-started/versioning-availability.md
-        title: Versioning and compatibility
-      - page: docs-content://deploy-manage/deploy/deployment-comparison.md
-        title: Detailed deployment comparison
-      - group: Reference architectures
-        page: docs-content://deploy-manage/reference-architectures.md
+      - group: Get started in seconds
+        page: docs-content://get-started/index.md
         children:
-        - page: docs-content://deploy-manage/reference-architectures/hotfrozen-high-availability.md
-          title: Hot/Frozen - High Availability
-      - group: Production guidance
-        page: docs-content://deploy-manage/production-guidance.md
+        - page: docs-content://get-started/evaluate-elastic.md
+          title: Evaluate Elastic during a trial
+      - group: Elasticsearch concepts
         children:
-        - page: docs-content://deploy-manage/production-guidance/elasticsearch-in-production-environments.md
-          title: Run Elasticsearch in production
-        - page: docs-content://deploy-manage/production-guidance/kibana-in-production-environments.md
-          title: Run Kibana in production
-    - group: Install and deploy Elasticsearch
-      page: docs-content://deploy-manage/deploy.md
-      children:
-      - title: Skills for installation and deployment
-      - page: docs-content://deploy-manage/deploy/elastic-cloud.md
-        title: Deploy in Elastic Cloud
-      - page: docs-content://deploy-manage/deploy/cloud-enterprise.md
-        title: Elastic Cloud Enterprise
-      - page: docs-content://deploy-manage/deploy/cloud-on-k8s.md
-        title: Elastic Cloud on Kubernetes
-      - group: Self-managed cluster
-        page: docs-content://deploy-manage/deploy/self-managed.md
-        children:
-        - page: elasticsearch://reference/elasticsearch/command-line-tools/index.md
-          title: Command line tools
-    - group: Administer your deployment
+        - page: docs-content://manage-data/data-store.md
+          title: Elasticsearch essentials (Core document database)
+        - page: docs-content://manage-data/ingest.md
+          title: Ingest data into Elasticsearch
+        - page: docs-content://solutions/search.md
+          title: Core search features
+        - page: docs-content://explore-analyze/index.md
+          title: Visualize and analyze (Kibana)
+        - group: Use cases
+          children:
+          - page: docs-content://explore-analyze/geospatial-analysis.md
+            title: Geospatial analysis
+          - page: docs-content://solutions/search/site-or-app.md
+            title: Add search to your site or app
+          - page: docs-content://solutions/search/rag.md
+            title: RAG
+    - label: Install, deploy, and administer
       children:
-      - title: Skills for cluster and deployment administration
-      - page: docs-content://deploy-manage/stack-settings.md
-        title: Elastic Stack settings
-      - group: Autoscaling
-        page: docs-content://deploy-manage/autoscaling.md
-        children:
-        - page: docs-content://deploy-manage/autoscaling/autoscaling-deciders.md
-          title: Autoscaling deciders
-        - page: docs-content://deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md
-          title: Autoscaling in ECE and ECH
-        - page: docs-content://deploy-manage/autoscaling/autoscaling-in-eck.md
-          title: Autoscaling in ECK
-        - page: docs-content://deploy-manage/autoscaling/trained-model-autoscaling.md
-          title: Trained model autoscaling
-      - group: Backup high availability and resilience tools
-        page: docs-content://deploy-manage/tools.md
-        children:
-        - page: docs-content://deploy-manage/tools/cross-cluster-replication.md
-          title: Cross-cluster replication
-        - page: docs-content://deploy-manage/tools/snapshot-and-restore.md
-          title: Snapshot and restore
-      - page: docs-content://deploy-manage/cloud-connect.md
-        title: Cloud Connect
-      - group: Security and encryption
-        page: docs-content://deploy-manage/security.md
+      - group: Distributed architecture
+        page: docs-content://deploy-manage/distributed-architecture.md
         children:
-        - page: docs-content://deploy-manage/security/data-security.md
-          title: Encrypt your deployment data
-        - page: docs-content://deploy-manage/security/elastic-cloud-static-ips.md
-          title: Elastic Cloud Static IPs
-        - page: docs-content://deploy-manage/security/enabling-cipher-suites-for-stronger-encryption.md
-          title: Enabling cipher suites for stronger encryption
-        - page: docs-content://deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md
-          title: Use a customer-managed encryption key
-        - page: docs-content://deploy-manage/security/httprest-clients-security.md
-          title: Securing HTTP client applications
-        - page: docs-content://deploy-manage/security/ip-filtering-basic.md
-          title: Manage IP filtering in ECK and self-managed
-        - page: docs-content://deploy-manage/security/ip-filtering-cloud.md
-          title: Manage IP filters in ECH or Serverless
-        - page: docs-content://deploy-manage/security/k8s-https-settings.md
-          title: Manage HTTP certificates on ECK
-        - page: docs-content://deploy-manage/security/k8s-network-policies.md
-          title: Kubernetes network policies
-        - page: docs-content://deploy-manage/security/k8s-secure-settings.md
-          title: Secure settings on ECK
-        - page: docs-content://deploy-manage/security/k8s-transport-settings.md
-          title: Manage transport certificates on ECK
-        - page: docs-content://deploy-manage/security/kibana-es-mutual-tls.md
-          title: Mutual TLS between Kibana and Elasticsearch
-        - page: docs-content://deploy-manage/security/kibana-session-management.md
-          title: Kibana session management
-        - page: docs-content://deploy-manage/security/limitations.md
-          title: Security limitations
-        - page: docs-content://deploy-manage/security/logging-configuration/security-event-audit-logging.md
-          title: Security logging
-        - page: docs-content://deploy-manage/security/network-security.md
-          title: Network security
-        - page: docs-content://deploy-manage/security/private-connectivity.md
-          title: Private connectivity
-        - page: docs-content://deploy-manage/security/secure-clients-integrations.md
-          title: Secure other Elastic Stack components
-        - page: docs-content://deploy-manage/security/secure-cluster-communications.md
-          title: TLS encryption for cluster communications
-        - page: docs-content://deploy-manage/security/secure-saved-objects.md
-          title: Secure Kibana saved objects
-        - page: docs-content://deploy-manage/security/secure-settings.md
-          title: Secure your settings
-        - page: docs-content://deploy-manage/security/secure-your-eck-installation.md
-          title: Secure your ECK orchestrator
-        - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation.md
-          title: Secure your ECE installation
-        - page: docs-content://deploy-manage/security/self-setup.md
-          title: Set up security in self-managed
-      - group: Authentication and authorization
-        page: docs-content://deploy-manage/users-roles.md
+        - page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards.md
+          title: Clusters nodes and shards
+        - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation.md
+          title: Discovery and cluster formation
+        - page: docs-content://deploy-manage/distributed-architecture/kibana-tasks-management.md
+          title: Kibana task management
+        - page: docs-content://deploy-manage/distributed-architecture/reading-and-writing-documents.md
+          title: Reading and writing documents
+        - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md
+          title: Shard allocation relocation and recovery
+        - page: docs-content://deploy-manage/distributed-architecture/shard-request-cache.md
+          title: The shard request cache
+      - group: Plan your install
         children:
-        - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator.md
-          title: Elastic Cloud Enterprise orchestrator users
-        - page: docs-content://deploy-manage/users-roles/cloud-organization.md
-          title: Cloud organization users
-        - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth.md
-          title: Cluster or deployment users
-        - page: docs-content://deploy-manage/users-roles/serverless-custom-roles.md
-          title: Serverless project custom roles
-        - page: docs-content://deploy-manage/manage-spaces.md
-          title: Spaces
-        - page: docs-content://deploy-manage/manage-spaces-fleet.md
-          title: Using Spaces with Fleet
-      - group: Elastic API keys
-        page: docs-content://deploy-manage/api-keys.md
+        - page: docs-content://get-started/versioning-availability.md
+          title: Versioning and compatibility
+        - page: docs-content://deploy-manage/deploy/deployment-comparison.md
+          title: Detailed deployment comparison
+        - group: Reference architectures
+          page: docs-content://deploy-manage/reference-architectures.md
+          children:
+          - page: docs-content://deploy-manage/reference-architectures/hotfrozen-high-availability.md
+            title: Hot/Frozen - High Availability
+        - group: Production guidance
+          page: docs-content://deploy-manage/production-guidance.md
+          children:
+          - page: docs-content://deploy-manage/production-guidance/elasticsearch-in-production-environments.md
+            title: Run Elasticsearch in production
+          - page: docs-content://deploy-manage/production-guidance/kibana-in-production-environments.md
+            title: Run Kibana in production
+      - group: Install and deploy Elasticsearch
+        page: docs-content://deploy-manage/deploy.md
         children:
-        - page: docs-content://deploy-manage/api-keys/elastic-cloud-api-keys.md
-          title: Elastic Cloud API keys
-        - page: docs-content://deploy-manage/api-keys/elastic-cloud-enterprise-api-keys.md
-          title: Elastic Cloud Enterprise API keys
-        - page: docs-content://deploy-manage/api-keys/elasticsearch-api-keys.md
-          title: Elasticsearch API keys
-        - page: docs-content://deploy-manage/api-keys/serverless-project-api-keys.md
-          title: Serverless project API keys
-      - page: docs-content://deploy-manage/manage-connectors.md
-        title: Connectors
-      - group: Remote clusters
-        page: docs-content://deploy-manage/remote-clusters.md
+        - title: Skills for installation and deployment
+        - page: docs-content://deploy-manage/deploy/elastic-cloud.md
+          title: Deploy in Elastic Cloud
+        - page: docs-content://deploy-manage/deploy/cloud-enterprise.md
+          title: Elastic Cloud Enterprise
+        - page: docs-content://deploy-manage/deploy/cloud-on-k8s.md
+          title: Elastic Cloud on Kubernetes
+        - group: Self-managed cluster
+          page: docs-content://deploy-manage/deploy/self-managed.md
+          children:
+          - page: elasticsearch://reference/elasticsearch/command-line-tools/index.md
+            title: Command line tools
+      - group: Administer your deployment
         children:
-        - page: docs-content://deploy-manage/remote-clusters/connection-modes.md
-          title: Remote cluster connection modes
-        - page: docs-content://deploy-manage/remote-clusters/ec-enable-ccs.md
-          title: Remote clusters on Elastic Cloud Hosted
-        - page: docs-content://deploy-manage/remote-clusters/ece-enable-ccs.md
-          title: Remote clusters on Elastic Cloud Enterprise
-        - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-landing.md
-          title: Remote clusters on ECK
-        - page: docs-content://deploy-manage/remote-clusters/remote-clusters-self-managed.md
-          title: Remote clusters on self-managed
-        - page: docs-content://deploy-manage/remote-clusters/security-models.md
-          title: Remote cluster security models
-      - group: Monitoring
-        page: docs-content://deploy-manage/monitor.md
+        - title: Skills for cluster and deployment administration
+        - page: docs-content://deploy-manage/stack-settings.md
+          title: Elastic Stack settings
+        - group: Autoscaling
+          page: docs-content://deploy-manage/autoscaling.md
+          children:
+          - page: docs-content://deploy-manage/autoscaling/autoscaling-deciders.md
+            title: Autoscaling deciders
+          - page: docs-content://deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md
+            title: Autoscaling in ECE and ECH
+          - page: docs-content://deploy-manage/autoscaling/autoscaling-in-eck.md
+            title: Autoscaling in ECK
+          - page: docs-content://deploy-manage/autoscaling/trained-model-autoscaling.md
+            title: Trained model autoscaling
+        - group: Backup high availability and resilience tools
+          page: docs-content://deploy-manage/tools.md
+          children:
+          - page: docs-content://deploy-manage/tools/cross-cluster-replication.md
+            title: Cross-cluster replication
+          - page: docs-content://deploy-manage/tools/snapshot-and-restore.md
+            title: Snapshot and restore
+        - page: docs-content://deploy-manage/cloud-connect.md
+          title: Cloud Connect
+        - group: Security and encryption
+          page: docs-content://deploy-manage/security.md
+          children:
+          - page: docs-content://deploy-manage/security/data-security.md
+            title: Encrypt your deployment data
+          - page: docs-content://deploy-manage/security/elastic-cloud-static-ips.md
+            title: Elastic Cloud Static IPs
+          - page: docs-content://deploy-manage/security/enabling-cipher-suites-for-stronger-encryption.md
+            title: Enabling cipher suites for stronger encryption
+          - page: docs-content://deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md
+            title: Use a customer-managed encryption key
+          - page: docs-content://deploy-manage/security/httprest-clients-security.md
+            title: Securing HTTP client applications
+          - page: docs-content://deploy-manage/security/ip-filtering-basic.md
+            title: Manage IP filtering in ECK and self-managed
+          - page: docs-content://deploy-manage/security/ip-filtering-cloud.md
+            title: Manage IP filters in ECH or Serverless
+          - page: docs-content://deploy-manage/security/k8s-https-settings.md
+            title: Manage HTTP certificates on ECK
+          - page: docs-content://deploy-manage/security/k8s-network-policies.md
+            title: Kubernetes network policies
+          - page: docs-content://deploy-manage/security/k8s-secure-settings.md
+            title: Secure settings on ECK
+          - page: docs-content://deploy-manage/security/k8s-transport-settings.md
+            title: Manage transport certificates on ECK
+          - page: docs-content://deploy-manage/security/kibana-es-mutual-tls.md
+            title: Mutual TLS between Kibana and Elasticsearch
+          - page: docs-content://deploy-manage/security/kibana-session-management.md
+            title: Kibana session management
+          - page: docs-content://deploy-manage/security/limitations.md
+            title: Security limitations
+          - page: docs-content://deploy-manage/security/logging-configuration/security-event-audit-logging.md
+            title: Security logging
+          - page: docs-content://deploy-manage/security/network-security.md
+            title: Network security
+          - page: docs-content://deploy-manage/security/private-connectivity.md
+            title: Private connectivity
+          - page: docs-content://deploy-manage/security/secure-clients-integrations.md
+            title: Secure other Elastic Stack components
+          - page: docs-content://deploy-manage/security/secure-cluster-communications.md
+            title: TLS encryption for cluster communications
+          - page: docs-content://deploy-manage/security/secure-saved-objects.md
+            title: Secure Kibana saved objects
+          - page: docs-content://deploy-manage/security/secure-settings.md
+            title: Secure your settings
+          - page: docs-content://deploy-manage/security/secure-your-eck-installation.md
+            title: Secure your ECK orchestrator
+          - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation.md
+            title: Secure your ECE installation
+          - page: docs-content://deploy-manage/security/self-setup.md
+            title: Set up security in self-managed
+        - group: Authentication and authorization
+          page: docs-content://deploy-manage/users-roles.md
+          children:
+          - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator.md
+            title: Elastic Cloud Enterprise orchestrator users
+          - page: docs-content://deploy-manage/users-roles/cloud-organization.md
+            title: Cloud organization users
+          - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth.md
+            title: Cluster or deployment users
+          - page: docs-content://deploy-manage/users-roles/serverless-custom-roles.md
+            title: Serverless project custom roles
+          - page: docs-content://deploy-manage/manage-spaces.md
+            title: Spaces
+          - page: docs-content://deploy-manage/manage-spaces-fleet.md
+            title: Using Spaces with Fleet
+        - group: Elastic API keys
+          page: docs-content://deploy-manage/api-keys.md
+          children:
+          - page: docs-content://deploy-manage/api-keys/elastic-cloud-api-keys.md
+            title: Elastic Cloud API keys
+          - page: docs-content://deploy-manage/api-keys/elastic-cloud-enterprise-api-keys.md
+            title: Elastic Cloud Enterprise API keys
+          - page: docs-content://deploy-manage/api-keys/elasticsearch-api-keys.md
+            title: Elasticsearch API keys
+          - page: docs-content://deploy-manage/api-keys/serverless-project-api-keys.md
+            title: Serverless project API keys
+        - page: docs-content://deploy-manage/manage-connectors.md
+          title: Connectors
+        - group: Remote clusters
+          page: docs-content://deploy-manage/remote-clusters.md
+          children:
+          - page: docs-content://deploy-manage/remote-clusters/connection-modes.md
+            title: Remote cluster connection modes
+          - page: docs-content://deploy-manage/remote-clusters/ec-enable-ccs.md
+            title: Remote clusters on Elastic Cloud Hosted
+          - page: docs-content://deploy-manage/remote-clusters/ece-enable-ccs.md
+            title: Remote clusters on Elastic Cloud Enterprise
+          - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-landing.md
+            title: Remote clusters on ECK
+          - page: docs-content://deploy-manage/remote-clusters/remote-clusters-self-managed.md
+            title: Remote clusters on self-managed
+          - page: docs-content://deploy-manage/remote-clusters/security-models.md
+            title: Remote cluster security models
+        - group: Monitoring
+          page: docs-content://deploy-manage/monitor.md
+          children:
+          - page: docs-content://deploy-manage/monitor/access-performance-metrics-on-elastic-cloud.md
+            title: Performance metrics on Elastic Cloud
+          - page: docs-content://deploy-manage/monitor/autoops.md
+            title: AutoOps
+          - page: docs-content://deploy-manage/monitor/autoops-vs-stack-monitoring.md
+            title: AutoOps and Stack Monitoring comparison
+          - page: docs-content://deploy-manage/monitor/cloud-health-perf.md
+            title: Cloud deployment health and performance
+          - page: docs-content://deploy-manage/monitor/ec-memory-pressure.md
+            title: JVM memory pressure indicator
+          - page: docs-content://deploy-manage/monitor/kibana-task-manager-health-monitoring.md
+            title: Kibana task manager health monitoring
+          - group: Logging
+            page: docs-content://deploy-manage/monitor/logging-configuration.md
+            children:
+            - page: elasticsearch://reference/elasticsearch/elasticsearch-audit-events.md
+              title: Audit events
+          - page: docs-content://deploy-manage/monitor/orchestrators.md
+            title: Monitoring orchestrators
+          - page: docs-content://deploy-manage/monitor/stack-monitoring.md
+            title: Stack monitoring
+        - page: docs-content://deploy-manage/kibana-reporting-configuration.md
+          title: Configure Kibana reporting
+        - group: Cloud organization
+          page: docs-content://deploy-manage/cloud-organization.md
+          children:
+          - page: docs-content://deploy-manage/cloud-organization/billing.md
+            title: Billing
+          - page: docs-content://deploy-manage/cloud-organization/operational-emails.md
+            title: Operational emails
+          - page: docs-content://deploy-manage/cloud-organization/service-status.md
+            title: Service status
+          - page: docs-content://deploy-manage/cloud-organization/tools-and-apis.md
+            title: Tools and APIs for your Cloud organization
+        - group: Licenses and subscriptions
+          page: docs-content://deploy-manage/license.md
+          children:
+          - page: docs-content://deploy-manage/license/manage-your-license-in-ece.md
+            title: Manage your license in ECE
+          - page: docs-content://deploy-manage/license/manage-your-license-in-eck.md
+            title: Manage your license in ECK
+          - page: docs-content://deploy-manage/license/manage-your-license-in-self-managed-cluster.md
+            title: Manage your license in self-managed
+        - group: Maintenance
+          page: docs-content://deploy-manage/maintenance.md
+          children:
+          - page: docs-content://deploy-manage/maintenance/add-and-remove-elasticsearch-nodes.md
+            title: Add and remove Elasticsearch nodes
+          - page: docs-content://deploy-manage/maintenance/ece.md
+            title: ECE maintenance
+          - page: docs-content://deploy-manage/maintenance/start-stop-routing-requests.md
+            title: Start and stop routing requests
+          - page: docs-content://deploy-manage/maintenance/start-stop-services.md
+            title: Start and stop services
+        - group: Upgrade your deployment, cluster, or orchestrator
+          page: docs-content://deploy-manage/upgrade.md
+          children:
+          - page: docs-content://deploy-manage/upgrade/deployment-or-cluster.md
+            title: Upgrade your deployment or cluster
+          - page: docs-content://deploy-manage/upgrade/ingest-components.md
+            title: Upgrade your ingest components
+          - page: docs-content://deploy-manage/upgrade/orchestrator.md
+            title: Upgrade your orchestrator
+          - page: docs-content://deploy-manage/upgrade/plan-upgrade.md
+            title: Plan your upgrade
+          - page: docs-content://deploy-manage/upgrade/prepare-to-upgrade.md
+            title: Prepare to upgrade
+        - group: Uninstall
+          page: docs-content://deploy-manage/uninstall.md
+          children:
+          - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md
+            title: Uninstall Elastic Cloud Enterprise
+          - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-on-kubernetes.md
+            title: Uninstall Elastic Cloud on Kubernetes
+      - group: Deployment and administration tools
         children:
-        - page: docs-content://deploy-manage/monitor/access-performance-metrics-on-elastic-cloud.md
-          title: Performance metrics on Elastic Cloud
-        - page: docs-content://deploy-manage/monitor/autoops.md
-          title: AutoOps
-        - page: docs-content://deploy-manage/monitor/autoops-vs-stack-monitoring.md
-          title: AutoOps and Stack Monitoring comparison
-        - page: docs-content://deploy-manage/monitor/cloud-health-perf.md
-          title: Cloud deployment health and performance
-        - page: docs-content://deploy-manage/monitor/ec-memory-pressure.md
-          title: JVM memory pressure indicator
-        - page: docs-content://deploy-manage/monitor/kibana-task-manager-health-monitoring.md
-          title: Kibana task manager health monitoring
-        - group: Logging
-          page: docs-content://deploy-manage/monitor/logging-configuration.md
-          children:
-          - page: elasticsearch://reference/elasticsearch/elasticsearch-audit-events.md
-            title: Audit events
-        - page: docs-content://deploy-manage/monitor/orchestrators.md
-          title: Monitoring orchestrators
-        - page: docs-content://deploy-manage/monitor/stack-monitoring.md
-          title: Stack monitoring
-      - page: docs-content://deploy-manage/kibana-reporting-configuration.md
-        title: Configure Kibana reporting
-      - group: Cloud organization
-        page: docs-content://deploy-manage/cloud-organization.md
-        children:
-        - page: docs-content://deploy-manage/cloud-organization/billing.md
-          title: Billing
-        - page: docs-content://deploy-manage/cloud-organization/operational-emails.md
-          title: Operational emails
-        - page: docs-content://deploy-manage/cloud-organization/service-status.md
-          title: Service status
-        - page: docs-content://deploy-manage/cloud-organization/tools-and-apis.md
-          title: Tools and APIs for your Cloud organization
-      - group: Licenses and subscriptions
-        page: docs-content://deploy-manage/license.md
+        - title: Overview (roundup)
+        - toc: ecctl://reference
+    - label: The Elasticsearch Platform
+      children:
+      - label: Ingest and manage data
         children:
-        - page: docs-content://deploy-manage/license/manage-your-license-in-ece.md
-          title: Manage your license in ECE
-        - page: docs-content://deploy-manage/license/manage-your-license-in-eck.md
-          title: Manage your license in ECK
-        - page: docs-content://deploy-manage/license/manage-your-license-in-self-managed-cluster.md
-          title: Manage your license in self-managed
-      - group: Maintenance
-        page: docs-content://deploy-manage/maintenance.md
+        - group: "Ingest or migrate: bring your data into Elasticsearch"
+          children:
+          - page: docs-content://manage-data/ingest.md
+            title: Choose/Plan your ingest method
+          - page: docs-content://manage-data/ingest/ingest-reference-architectures.md
+            title: Ingest architectures
+          - group: Ingest by solution
+            children:
+            - page: docs-content://solutions/search/ingest-for-search.md
+              title: Ingesting data for search use cases
+            - title: Ingesting data for observability
+            - page: docs-content://solutions/security/get-started/ingest-data-to-elastic-security.md
+              title: Ingesting data for security (Move from Solutions)
+          - page: docs-content://manage-data/ingest/ingesting-timeseries-data.md
+            title: Ingesting time series data
+          - group: Ingest logs
+            page: docs-content://solutions/observability/logs.md
+            children:
+            - page: docs-content://solutions/observability/logs/get-started-with-system-logs.md
+              title: Get started with system logs
+            - page: docs-content://solutions/observability/logs/stream-any-log-file.md
+              title: Stream any log file
+            - page: docs-content://solutions/observability/logs/stream-any-log-file-using-edot-collector.md
+              title: Stream any log file using EDOT Collector
+            - group: Stream application logs
+              page: docs-content://solutions/observability/logs/stream-application-logs.md
+              children:
+              - page: docs-content://solutions/observability/logs/plaintext-application-logs.md
+                title: Plaintext application logs
+              - page: docs-content://solutions/observability/logs/ecs-formatted-application-logs.md
+                title: ECS formatted application logs
+              - page: docs-content://solutions/observability/logs/apm-agent-log-sending.md
+                title: APM agent log sending
+            - page: docs-content://solutions/observability/logs/parse-route-logs.md
+              title: Parse and route logs
+            - page: docs-content://solutions/observability/logs/filter-aggregate-logs.md
+              title: Filter and aggregate logs
+            - group: Explore logs
+              page: docs-content://solutions/observability/logs/explore-logs.md
+              children:
+              - page: docs-content://solutions/observability/logs/discover-logs.md
+                title: Discover logs
+              - page: docs-content://solutions/observability/logs/categorize-log-entries.md
+                title: Categorize log entries
+              - page: docs-content://solutions/observability/logs/inspect-log-anomalies.md
+                title: Inspect log anomalies
+            - page: docs-content://solutions/observability/logs/run-pattern-analysis-on-log-data.md
+              title: Run pattern analysis on log data
+            - page: docs-content://solutions/observability/logs/log-data-sources.md
+              title: Log data sources
+            - page: docs-content://solutions/observability/logs/logs-data-retention.md
+              title: Logs data retention
+            - page: docs-content://solutions/observability/logs/add-service-name-to-logs.md
+              title: Add service name to logs
+            - group: Logs index template reference
+              page: docs-content://solutions/observability/logs/logs-index-template-reference.md
+              children:
+              - page: docs-content://solutions/observability/logs/logs-index-template-defaults.md
+                title: Logs index template defaults
+          - group: Ingest data with agentless integrations
+            page: docs-content://manage-data/ingest/agentless/agentless-integrations.md
+            children:
+            - page: docs-content://manage-data/ingest/agentless/cloud-connector-deployment.md
+              title: Cloud connector deployment
+            - page: docs-content://manage-data/ingest/agentless/agentless-integrations-faq.md
+              title: Agentless integrations FAQ
+            - page: integration-docs://reference/agentless_integrations.md
+              title: Agentless integrations reference
+          - group: Ingest data from applications
+            page: docs-content://manage-data/ingest/ingesting-data-from-applications.md
+            children:
+            - toc: docs-content://reference/apm-agents
+            - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-with-nodejs-on-elasticsearch-service.md
+              title: Ingest data with Node.js
+            - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-with-python-on-elasticsearch-service.md
+              title: Ingest data with Python
+            - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-from-beats-to-elasticsearch-service-with-logstash-as-proxy.md
+              title: Ingest data from Beats with Logstash as a proxy
+            - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-from-relational-database-into-elasticsearch-service.md
+              title: Ingest data from a relational database
+            - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-python-application-using-filebeat.md
+              title: Ingest logs from a Python application using Filebeat
+            - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-nodejs-web-application-using-filebeat.md
+              title: Ingest logs from a Node.js web application using Filebeat
+          - title: Ingest data using the API
+          - page: docs-content://manage-data/ingest/upload-data-files.md
+            title: Upload data files
+          - page: docs-content://manage-data/ingest/sample-data.md
+            title: Sample data
+          - group: Migrating your Elasticsearch data
+            page: docs-content://manage-data/migrate.md
+            children:
+            - page: docs-content://manage-data/migrate/migrate-from-a-self-managed-cluster-with-a-self-signed-certificate-using-remote-reindex.md
+              title: Reindex using a private CA
+            - page: docs-content://manage-data/migrate/migrate-with-logstash.md
+              title: Migrate Elastic Cloud Hosted data to Serverless with Logstash
+            - page: docs-content://manage-data/migrate/migrate-data-between-elasticsearch-clusters-with-minimal-downtime.md
+              title: Minimal-downtime migration using snapshots
+            - page: docs-content://manage-data/migrate/migrate-internal-indices.md
+              title: Migrate system indices
+        - group: Ingest tools
+          page: docs-content://reference/ingestion-tools/index.md
+          children:
+          - toc: opentelemetry://reference
+            children:
+            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/index.md
+              title: Quickstarts
+            - page: opentelemetry://reference/architecture/index.md
+              title: Reference Architecture
+            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/index.md
+              title: Use cases
+            - page: opentelemetry://reference/compatibility/index.md
+              title: Compatibility and support
+            - page: opentelemetry://reference/data-streams.md
+              title: Data streams
+            - page: opentelemetry://reference/central-configuration.md
+              title: Central configuration
+          - toc: opentelemetry://reference/motlp
+          - toc: opentelemetry://reference/edot-cloud-forwarder
+          - toc: elastic-agent://reference/edot-collector
+          - group: EDOT SDKs
+            page: opentelemetry://reference/edot-sdks/index.md
+            children:
+            - toc: apm-agent-android://reference/edot-android
+            - toc: elastic-otel-dotnet://reference/edot-dotnet
+            - toc: apm-agent-ios://reference/edot-ios
+            - toc: elastic-otel-java://reference/edot-java
+            - toc: elastic-otel-node://reference/edot-node
+            - toc: elastic-otel-php://reference/edot-php
+            - toc: elastic-otel-python://reference/edot-python
+            - toc: elastic-otel-rum-js://reference/edot-browser
+          - toc: docs-content://reference/fleet
+          - toc: integration-docs://reference
+          - toc: elasticsearch://reference/search-connectors
+          - toc: logstash://reference
+          - toc: docs-content://reference/apm
+          - toc: beats://reference
+          - group: Other ingest tools
+            children:
+            - toc: elasticsearch-hadoop://reference
+            - toc: elastic-serverless-forwarder://reference
+        - group: Data storage and lifecycle
+          children:
+          - group: The Elasticsearch data store
+            page: docs-content://manage-data/data-store.md
+            children:
+            - group: Index basics
+              page: docs-content://manage-data/data-store/index-basics.md
+              children:
+              - page: elasticsearch://reference/elasticsearch/index-settings/index.md
+                title: Index settings reference
+              - page: elasticsearch://reference/elasticsearch/index-lifecycle-actions/index.md
+                title: Index lifecycle management actions
+            - page: docs-content://manage-data/data-store/near-real-time-search.md
+              title: Near real-time search
+            - group: Data streams
+              page: docs-content://manage-data/data-store/data-streams.md
+              children:
+              - page: docs-content://manage-data/data-store/data-streams/set-up-data-stream.md
+                title: Set up a data stream
+              - page: docs-content://manage-data/data-store/data-streams/use-data-stream.md
+                title: Use a data stream
+              - page: docs-content://manage-data/data-store/data-streams/modify-data-stream.md
+                title: Modify a data stream
+              - page: docs-content://manage-data/data-store/data-streams/manage-data-stream.md
+                title: Manage a data stream
+              - group: Time series data stream (TSDS)
+                page: docs-content://manage-data/data-store/data-streams/time-series-data-stream-tsds.md
+                children:
+                - page: docs-content://manage-data/data-store/data-streams/quickstart-tsds.md
+                  title: Quickstart
+                - page: docs-content://manage-data/data-store/data-streams/set-up-tsds.md
+                  title: Set up TSDS
+                - group: Downsampling
+                  page: docs-content://manage-data/data-store/data-streams/downsampling-time-series-data-stream.md
+                  children:
+                  - page: docs-content://manage-data/data-store/data-streams/downsampling-concepts.md
+                    title: Downsampling concepts
+                  - page: docs-content://manage-data/data-store/data-streams/run-downsampling.md
+                    title: Run downsampling
+                  - page: docs-content://manage-data/data-store/data-streams/query-downsampled-data.md
+                    title: Query downsampled data
+                - group: Advanced topics
+                  page: docs-content://manage-data/data-store/data-streams/advanced-topics-tsds.md
+                  children:
+                  - page: docs-content://manage-data/data-store/data-streams/time-bound-tsds.md
+                    title: Time-bound TSDS
+                  - page: docs-content://manage-data/data-store/data-streams/reindex-tsds.md
+                    title: Reindex TSDS
+                  - page: docs-content://manage-data/data-store/data-streams/tsds-ingest-otlp.md
+                    title: TSDS ingest OTLP
+              - group: Logs data stream
+                page: docs-content://manage-data/data-store/data-streams/logs-data-stream.md
+                children:
+                - page: docs-content://manage-data/data-store/data-streams/logs-data-stream-configure.md
+                  title: Configure
+                - page: docs-content://manage-data/data-store/data-streams/logs-data-stream-integrations.md
+                  title: Integrations
+              - group: Failure store
+                page: docs-content://manage-data/data-store/data-streams/failure-store.md
+                children:
+                - page: docs-content://manage-data/data-store/data-streams/failure-store-recipes.md
+                  title: Recipes
+            - group: Mapping
+              page: docs-content://manage-data/data-store/mapping.md
+              children:
+              - page: elasticsearch://reference/elasticsearch/mapping-reference/index.md
+                title: Mapping reference
+              - group: Dynamic mapping
+                page: docs-content://manage-data/data-store/mapping/dynamic-mapping.md
+                children:
+                - page: docs-content://manage-data/data-store/mapping/dynamic-field-mapping.md
+                  title: Dynamic field mapping
+                - page: docs-content://manage-data/data-store/mapping/dynamic-templates.md
+                  title: Dynamic templates
+              - page: docs-content://manage-data/data-store/mapping/explicit-mapping.md
+                title: Explicit mapping
+              - group: Runtime fields
+                page: docs-content://manage-data/data-store/mapping/runtime-fields.md
+                children:
+                - page: docs-content://manage-data/data-store/mapping/map-runtime-field.md
+                  title: Map a runtime field
+                - page: docs-content://manage-data/data-store/mapping/define-runtime-fields-in-search-request.md
+                  title: Define in search request
+                - page: docs-content://manage-data/data-store/mapping/override-field-values-at-query-time.md
+                  title: Override values at query time
+                - page: docs-content://manage-data/data-store/mapping/retrieve-runtime-field.md
+                  title: Retrieve a runtime field
+                - page: docs-content://manage-data/data-store/mapping/index-runtime-field.md
+                  title: Index a runtime field
+                - page: docs-content://manage-data/data-store/mapping/explore-data-with-runtime-fields.md
+                  title: Explore data with runtime fields
+              - page: docs-content://manage-data/data-store/mapping/removal-of-mapping-types.md
+                title: Removal of mapping types
+              - page: docs-content://manage-data/data-store/mapping/update-mappings-examples.md
+                title: Update mappings examples
+            - group: Text analysis
+              page: docs-content://manage-data/data-store/text-analysis.md
+              children:
+              - page: elasticsearch://reference/text-analysis/index.md
+                title: Text analysis components
+              - group: Concepts
+                page: docs-content://manage-data/data-store/text-analysis/concepts.md
+                children:
+                - page: docs-content://manage-data/data-store/text-analysis/anatomy-of-an-analyzer.md
+                  title: Anatomy of an analyzer
+                - page: docs-content://manage-data/data-store/text-analysis/index-search-analysis.md
+                  title: Index and search analysis
+                - page: docs-content://manage-data/data-store/text-analysis/stemming.md
+                  title: Stemming
+                - page: docs-content://manage-data/data-store/text-analysis/token-graphs.md
+                  title: Token graphs
+              - group: Configure text analysis
+                page: docs-content://manage-data/data-store/text-analysis/configure-text-analysis.md
+                children:
+                - page: docs-content://manage-data/data-store/text-analysis/test-an-analyzer.md
+                  title: Test an analyzer
+                - page: docs-content://manage-data/data-store/text-analysis/configuring-built-in-analyzers.md
+                  title: Configuring built-in analyzers
+                - page: docs-content://manage-data/data-store/text-analysis/create-custom-analyzer.md
+                  title: Create custom analyzer
+                - page: docs-content://manage-data/data-store/text-analysis/specify-an-analyzer.md
+                  title: Specify an analyzer
+            - group: Templates
+              page: docs-content://manage-data/data-store/templates.md
+              children:
+              - page: docs-content://manage-data/data-store/templates/simulate-multi-component-templates.md
+                title: Simulate multi-component templates
+              - page: docs-content://manage-data/data-store/templates/ignore-missing-component-templates.md
+                title: Ignore missing component templates
+            - page: docs-content://manage-data/data-store/aliases.md
+              title: Aliases
+            - group: Perform index operations
+              page: docs-content://manage-data/data-store/perform-index-operations.md
+              children:
+              - page: docs-content://manage-data/data-store/index-operations-reference.md
+                title: Index operations reference
+            - page: docs-content://manage-data/data-store/manage-data-from-the-command-line.md
+              title: Manage data from the command line
+          - group: Data lifecycle
+            page: docs-content://manage-data/lifecycle.md
+            children:
+            - page: docs-content://manage-data/lifecycle/data-tiers.md
+              title: "Data tiers: hot warm cold frozen"
+            - group: Index lifecycle management (ILM)
+              page: docs-content://manage-data/lifecycle/index-lifecycle-management.md
+              children:
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/index-lifecycle.md
+                title: Index lifecycle
+              - group: Rollover
+                page: docs-content://manage-data/lifecycle/index-lifecycle-management/rollover.md
+                children:
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/skip-rollover.md
+                  title: Skip rollover
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/configure-lifecycle-policy.md
+                title: Configure lifecycle policy
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-apply.md
+                title: Apply policy
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-view-status.md
+                title: View policy status
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/manage-lifecycle-integrations-data.md
+                title: Manage integrations data
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-updates.md
+                title: Policy updates
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/start-stop-index-lifecycle-management.md
+                title: Start and stop ILM
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/restore-managed-data-stream-index.md
+                title: Restore managed index
+              - group: ILM tutorials
+                page: docs-content://manage-data/lifecycle/index-lifecycle-management/ilm-tutorials.md
+                children:
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-time-series-with-data-streams.md
+                  title: Time series with data streams
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-time-series-without-data-streams.md
+                  title: Time series without data streams
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-general-content-with-data-streams.md
+                  title: General content with data streams
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-customize-built-in-policies.md
+                  title: Customize built-in policies
+              - group: Migrate ILM
+                page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-ilm.md
+                children:
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-index-management.md
+                  title: Migrate index management
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/manage-existing-indices.md
+                  title: Manage existing indices
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md
+                  title: Migrate allocation filters to node roles
+            - group: Data stream lifecycle
+              page: docs-content://manage-data/lifecycle/data-stream.md
+              children:
+              - page: docs-content://manage-data/lifecycle/data-stream/tutorial-create-data-stream-with-lifecycle.md
+                title: "Tutorial: Create with lifecycle"
+              - page: docs-content://manage-data/lifecycle/data-stream/tutorial-update-existing-data-stream.md
+                title: "Tutorial: Update existing"
+              - page: docs-content://manage-data/lifecycle/data-stream/tutorial-data-stream-retention.md
+                title: "Tutorial: Retention"
+              - page: docs-content://manage-data/lifecycle/data-stream/tutorial-migrate-ilm-managed-data-stream-to-data-stream-lifecycle.md
+                title: "Tutorial: Migrate from ILM"
+            - page: docs-content://manage-data/lifecycle/curator.md
+              title: Elasticsearch Curator
+            - group: Rollup
+              page: docs-content://manage-data/lifecycle/rollup.md
+              children:
+              - page: docs-content://manage-data/lifecycle/rollup/getting-started-api.md
+                title: Getting started (API)
+              - page: docs-content://manage-data/lifecycle/rollup/getting-started-kibana.md
+                title: Getting started (Kibana)
+              - page: docs-content://manage-data/lifecycle/rollup/understanding-groups.md
+                title: Understanding groups
+              - page: docs-content://manage-data/lifecycle/rollup/rollup-aggregation-limitations.md
+                title: Aggregation limitations
+              - page: docs-content://manage-data/lifecycle/rollup/rollup-search-limitations.md
+                title: Search limitations
+              - page: docs-content://manage-data/lifecycle/rollup/migrating-from-rollup-to-downsampling.md
+                title: Migrating to downsampling
+          - page: docs-content://manage-data/use-case-use-elasticsearch-to-manage-time-series-data.md
+            title: "Use case: time series data management"
+        - group: Transform and enrich data
+          page: docs-content://manage-data/ingest/transform-enrich.md
+          children:
+          - group: Data pipelines
+            children:
+            - page: opentelemetry://reference/motlp/index.md
+              title: Managed pipelines (mOTLP)
+            - group: Elasticsearch ingest pipelines
+              page: docs-content://manage-data/ingest/transform-enrich/ingest-pipelines.md
+              children:
+              - page: docs-content://manage-data/ingest/transform-enrich/example-parse-logs.md
+                title: "Example: Parse logs"
+              - page: docs-content://manage-data/ingest/transform-enrich/readable-maintainable-ingest-pipelines.md
+                title: Readable maintainable pipelines
+              - page: docs-content://manage-data/ingest/transform-enrich/error-handling.md
+                title: Error handling
+            - page: docs-content://manage-data/ingest/transform-enrich/logstash-pipelines.md
+              title: Logstash pipelines
+          - group: Data enrichment
+            page: docs-content://manage-data/ingest/transform-enrich/data-enrichment.md
+            children:
+            - page: docs-content://manage-data/ingest/transform-enrich/set-up-an-enrich-processor.md
+              title: Set up an enrich processor
+            - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-based-on-geolocation.md
+              title: "Example: Enrich by geolocation"
+            - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-based-on-exact-values.md
+              title: "Example: Enrich by exact values"
+            - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-by-matching-value-to-range.md
+              title: "Example: Enrich by matching value to range"
+          - page: docs-content://manage-data/ingest/transform-enrich/index-mapping-text-analysis.md
+            title: Index mapping and text analysis
+          - page: docs-content://manage-data/ingest/transform-enrich/ingest-lag.md
+            title: Calculate ingest lag metadata
+      - label: Search, visualize and analyze
         children:
-        - page: docs-content://deploy-manage/maintenance/add-and-remove-elasticsearch-nodes.md
-          title: Add and remove Elasticsearch nodes
-        - page: docs-content://deploy-manage/maintenance/ece.md
-          title: ECE maintenance
-        - page: docs-content://deploy-manage/maintenance/start-stop-routing-requests.md
-          title: Start and stop routing requests
-        - page: docs-content://deploy-manage/maintenance/start-stop-services.md
-          title: Start and stop services
-      - group: Upgrade your deployment, cluster, or orchestrator
-        page: docs-content://deploy-manage/upgrade.md
+        - group: Search and query
+          children:
+          - group: Get started with search
+            children:
+            - title: APIs and tools for search
+          - group: Search strategies
+            children:
+            - title: Full-text search
+            - title: AI-powered search
+            - title: Hybrid search
+            - title: Ranking and reranking
+          - group: Build search queries with APIs and query languages and search templates
+            children:
+            - title: ES|QL
+            - title: Query DSL
+            - title: "..."
+          - group: Cross-project search
+            children:
+            - title: Link projects for cross-project search
+            - title: Using project routing to limit search scope
+            - title: How search works in CPS
+            - title: Using tags to control search
+          - title: Cross-cluster search
+          - title: Add search to your site or app
+          - group: Querying and filtering in Kibana
+            children:
+            - title: Filtering in Kibana
+            - title: Query languages
+            - title: Query tools
+        - group: Explore and visualize
+          page: docs-content://explore-analyze/explore-and-visualize.md
+          children:
+          - page: docs-content://explore-analyze/kibana-data-exploration-learning-tutorial.md
+            title: Learn data exploration and visualization
+          - group: Discover
+            page: docs-content://explore-analyze/discover.md
+            children:
+            - page: docs-content://explore-analyze/discover/discover-get-started.md
+              title: Explore fields and data with Discover
+            - page: docs-content://explore-analyze/discover/document-explorer.md
+              title: Customize the Discover view
+            - page: docs-content://explore-analyze/discover/discover-search-for-relevance.md
+              title: Search for relevance
+            - page: docs-content://explore-analyze/discover/save-open-search.md
+              title: Save a search for reuse
+            - page: docs-content://explore-analyze/discover/show-field-statistics.md
+              title: View field statistics
+            - page: docs-content://explore-analyze/discover/run-pattern-analysis-discover.md
+              title: Run a pattern analysis on your log data
+            - page: docs-content://explore-analyze/discover/background-search.md
+              title: Run queries in the background
+            - page: docs-content://explore-analyze/discover/try-esql.md
+              title: "Using ES|QL"
+          - group: Dashboards
+            page: docs-content://explore-analyze/dashboards.md
+            children:
+            - page: docs-content://explore-analyze/dashboards/using.md
+              title: Exploring dashboards
+            - group: Building dashboards
+              page: docs-content://explore-analyze/dashboards/building.md
+              children:
+              - page: docs-content://explore-analyze/dashboards/create-dashboard.md
+                title: Create a dashboard
+              - page: docs-content://explore-analyze/dashboards/open-dashboard.md
+                title: Edit a dashboard
+              - page: docs-content://explore-analyze/dashboards/add-controls.md
+                title: Add filter controls
+              - page: docs-content://explore-analyze/dashboards/drilldowns.md
+                title: Add drilldowns
+              - page: docs-content://explore-analyze/dashboards/arrange-panels.md
+                title: Organize dashboard panels
+              - page: docs-content://explore-analyze/dashboards/duplicate-dashboards.md
+                title: Duplicate a dashboard
+              - page: docs-content://explore-analyze/dashboards/import-dashboards.md
+                title: Import a dashboard
+            - page: docs-content://explore-analyze/dashboards/managing.md
+              title: Managing dashboards
+            - page: docs-content://explore-analyze/dashboards/sharing.md
+              title: Sharing dashboards
+            - group: Tutorials
+              page: docs-content://explore-analyze/dashboards/tutorials.md
+              children:
+              - page: docs-content://explore-analyze/dashboards/create-dashboard-of-panels-with-web-server-data.md
+                title: Create a simple dashboard to monitor website logs
+              - page: docs-content://explore-analyze/dashboards/create-dashboard-of-panels-with-ecommerce-data.md
+                title: Create a dashboard with time series charts
+          - group: Panels and visualizations
+            page: docs-content://explore-analyze/visualize.md
+            children:
+            - page: docs-content://explore-analyze/visualize/visualize-library.md
+              title: Visualize Library
+            - page: docs-content://explore-analyze/visualize/manage-panels.md
+              title: Manage panels
+            - group: Lens
+              page: docs-content://explore-analyze/visualize/lens.md
+              children:
+              - page: docs-content://explore-analyze/visualize/charts/area-charts.md
+                title: Area charts
+              - page: docs-content://explore-analyze/visualize/charts/bar-charts.md
+                title: Bar charts
+              - page: docs-content://explore-analyze/visualize/charts/heat-map-charts.md
+                title: Heat map charts
+              - page: docs-content://explore-analyze/visualize/charts/gauge-charts.md
+                title: Gauge charts
+              - page: docs-content://explore-analyze/visualize/charts/line-charts.md
+                title: Line charts
+              - page: docs-content://explore-analyze/visualize/charts/metric-charts.md
+                title: Metric charts
+              - page: docs-content://explore-analyze/visualize/charts/mosaic-charts.md
+                title: Mosaic charts
+              - page: docs-content://explore-analyze/visualize/charts/pie-charts.md
+                title: Pie charts
+              - page: docs-content://explore-analyze/visualize/charts/region-map-charts.md
+                title: Region map charts
+              - page: docs-content://explore-analyze/visualize/charts/tables.md
+                title: Tables
+              - page: docs-content://explore-analyze/visualize/charts/waffle-charts.md
+                title: Waffle charts
+              - page: docs-content://explore-analyze/visualize/charts/tag-cloud-charts.md
+                title: Tag cloud charts
+              - page: docs-content://explore-analyze/visualize/charts/treemap-charts.md
+                title: Treemap charts
+            - page: docs-content://explore-analyze/visualize/esorql.md
+              title: "ES|QL"
+            - page: docs-content://explore-analyze/visualize/custom-visualizations-with-vega.md
+              title: Custom visualizations with Vega
+            - page: docs-content://explore-analyze/visualize/text-panels.md
+              title: Text panels
+            - page: docs-content://explore-analyze/visualize/image-panels.md
+              title: Image panels
+            - page: docs-content://explore-analyze/visualize/link-panels.md
+              title: Link panels
+            - page: docs-content://explore-analyze/visualize/alert-panels.md
+              title: Alert panels
+            - group: Canvas
+              page: docs-content://explore-analyze/visualize/canvas.md
+              children:
+              - page: docs-content://explore-analyze/visualize/canvas/edit-workpads.md
+                title: Edit workpads
+              - page: docs-content://explore-analyze/visualize/canvas/canvas-present-workpad.md
+                title: Present your workpad
+              - page: docs-content://explore-analyze/visualize/canvas/canvas-tutorial.md
+                title: "Tutorial: Create a workpad for monitoring sales"
+              - group: Canvas function reference
+                page: docs-content://explore-analyze/visualize/canvas/canvas-function-reference.md
+                children:
+                - page: docs-content://explore-analyze/visualize/canvas/canvas-tinymath-functions.md
+                  title: TinyMath functions
+            - group: Maps
+              page: docs-content://explore-analyze/visualize/maps.md
+              children:
+              - page: docs-content://explore-analyze/visualize/maps/maps-getting-started.md
+                title: Build a map to compare metrics by country or region
+              - page: docs-content://explore-analyze/visualize/maps/asset-tracking-tutorial.md
+                title: Track, visualize, and alert on assets in real time
+              - page: docs-content://explore-analyze/visualize/maps/reverse-geocoding-tutorial.md
+                title: Map custom regions with reverse geocoding
+              - page: docs-content://explore-analyze/visualize/maps/heatmap-layer.md
+                title: Heat map layer
+              - page: docs-content://explore-analyze/visualize/maps/tile-layer.md
+                title: Tile layer
+              - group: Vector layer
+                page: docs-content://explore-analyze/visualize/maps/vector-layer.md
+                children:
+                - page: docs-content://explore-analyze/visualize/maps/vector-style.md
+                  title: Vector styling
+                - page: docs-content://explore-analyze/visualize/maps/maps-vector-style-properties.md
+                  title: Vector style properties
+                - page: docs-content://explore-analyze/visualize/maps/vector-tooltip.md
+                  title: Vector tooltips
+              - group: Map aggregations
+                page: docs-content://explore-analyze/visualize/maps/maps-aggregations.md
+                children:
+                - page: docs-content://explore-analyze/visualize/maps/maps-grid-aggregation.md
+                  title: Clusters
+                - page: docs-content://explore-analyze/visualize/maps/maps-top-hits-aggregation.md
+                  title: Display the most relevant documents per entity
+                - page: docs-content://explore-analyze/visualize/maps/point-to-point.md
+                  title: Point to point
+                - page: docs-content://explore-analyze/visualize/maps/terms-join.md
+                  title: Term join
+              - group: Search and filter maps
+                page: docs-content://explore-analyze/visualize/maps/maps-search.md
+                children:
+                - page: docs-content://explore-analyze/visualize/maps/maps-create-filter-from-map.md
+                  title: Create filters from a map
+                - page: docs-content://explore-analyze/visualize/maps/maps-layer-based-filtering.md
+                  title: Filter a single layer
+                - page: docs-content://explore-analyze/visualize/maps/maps-search-across-multiple-indices.md
+                  title: Search across multiple indices
+              - page: docs-content://explore-analyze/visualize/maps/maps-settings.md
+                title: Configure map settings
+              - page: docs-content://explore-analyze/visualize/maps/maps-connect-to-ems.md
+                title: Connect to Elastic Maps Service
+              - group: Import geospatial data
+                page: docs-content://explore-analyze/visualize/maps/import-geospatial-data.md
+                children:
+                - page: docs-content://explore-analyze/visualize/maps/maps-clean-data.md
+                  title: Clean your data
+                - page: docs-content://explore-analyze/visualize/maps/indexing-geojson-data-tutorial.md
+                  title: "Tutorial: Index GeoJSON data"
+              - page: docs-content://explore-analyze/visualize/maps/maps-troubleshooting.md
+                title: Troubleshoot
+            - group: Graph
+              page: docs-content://explore-analyze/visualize/graph.md
+              children:
+              - page: docs-content://explore-analyze/visualize/graph/graph-configuration.md
+                title: Configure Graph
+              - page: docs-content://explore-analyze/visualize/graph/graph-troubleshooting.md
+                title: Troubleshooting and limitations
+            - group: Legacy editors
+              page: docs-content://explore-analyze/visualize/legacy-editors.md
+              children:
+              - page: docs-content://explore-analyze/visualize/legacy-editors/aggregation-based.md
+                title: Aggregation-based
+              - page: docs-content://explore-analyze/visualize/legacy-editors/tsvb.md
+                title: TSVB
+              - page: docs-content://explore-analyze/visualize/legacy-editors/timelion.md
+                title: Timelion
+          - group: Find and organize content
+            page: docs-content://explore-analyze/find-and-organize.md
+            children:
+            - page: docs-content://explore-analyze/find-and-organize/data-views.md
+              title: Data views
+            - page: docs-content://explore-analyze/find-and-organize/saved-objects.md
+              title: Saved objects
+            - page: docs-content://explore-analyze/find-and-organize/files.md
+              title: Files
+            - page: docs-content://explore-analyze/find-and-organize/reports.md
+              title: Reports
+            - page: docs-content://explore-analyze/find-and-organize/tags.md
+              title: Tags
+            - page: docs-content://explore-analyze/find-and-organize/find-apps-and-objects.md
+              title: Find apps and objects
+        - group: Track and respond
+          page: docs-content://explore-analyze/track-and-respond.md
+          children:
+          - group: Reporting and sharing
+            page: docs-content://explore-analyze/report-and-share.md
+            children:
+            - page: docs-content://explore-analyze/report-and-share/automating-report-generation.md
+              title: Automatically generate reports
+            - group: Reporting troubleshooting
+              page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting.md
+              children:
+              - page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting-csv.md
+                title: CSV
+              - page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting-pdf.md
+                title: PDF/PNG
+          - group: Alerting
+            page: docs-content://explore-analyze/alerting.md
+            children:
+            - group: Alerts
+              page: docs-content://explore-analyze/alerting/alerts.md
+              children:
+              - page: docs-content://explore-analyze/alerting/alerts/alerting-getting-started.md
+                title: Getting started with alerts
+              - page: docs-content://explore-analyze/alerting/alerts/alerting-setup.md
+                title: Set up
+              - page: docs-content://explore-analyze/alerting/alerts/create-manage-rules.md
+                title: Create and manage rules
+              - page: docs-content://explore-analyze/alerting/alerts/view-alerts.md
+                title: View and manage alerts
+              - page: docs-content://explore-analyze/alerting/alerts/query-alerts.md
+                title: Query alert indices
+              - group: Rule types
+                page: docs-content://explore-analyze/alerting/alerts/rule-types.md
+                children:
+                - page: docs-content://explore-analyze/alerting/alerts/rule-type-index-threshold.md
+                  title: Index threshold
+                - page: docs-content://explore-analyze/alerting/alerts/rule-type-es-query.md
+                  title: Elasticsearch query
+                - page: docs-content://explore-analyze/alerting/alerts/geo-alerting.md
+                  title: Tracking containment
+              - page: docs-content://explore-analyze/alerting/alerts/rule-action-variables.md
+                title: Rule action variables
+              - page: docs-content://explore-analyze/alerting/alerts/notifications-domain-allowlist.md
+                title: Notifications domain allowlist
+              - group: Alerting troubleshooting
+                page: docs-content://explore-analyze/alerting/alerts/alerting-troubleshooting.md
+                children:
+                - page: docs-content://explore-analyze/alerting/alerts/alerting-common-issues.md
+                  title: Common issues
+                - page: docs-content://explore-analyze/alerting/alerts/event-log-index.md
+                  title: Event log index
+                - page: docs-content://explore-analyze/alerting/alerts/testing-connectors.md
+                  title: Test connectors
+              - page: docs-content://explore-analyze/alerting/alerts/maintenance-windows.md
+                title: Maintenance windows
+            - group: Watcher
+              page: docs-content://explore-analyze/alerting/watcher.md
+              children:
+              - page: docs-content://explore-analyze/alerting/watcher/watcher-getting-started.md
+                title: Getting started with Watcher
+              - page: docs-content://explore-analyze/alerting/watcher/how-watcher-works.md
+                title: How Watcher works
+              - page: docs-content://explore-analyze/alerting/watcher/enable-watcher.md
+                title: Enable Watcher
+              - page: docs-content://explore-analyze/alerting/watcher/watcher-ui.md
+                title: Watcher UI
+              - page: docs-content://explore-analyze/alerting/watcher/encrypting-data.md
+                title: Encrypting sensitive data in Watcher
+              - group: Input
+                page: docs-content://explore-analyze/alerting/watcher/input.md
+                children:
+                - page: docs-content://explore-analyze/alerting/watcher/input-simple.md
+                  title: Simple input
+                - page: docs-content://explore-analyze/alerting/watcher/input-search.md
+                  title: Search input
+                - page: docs-content://explore-analyze/alerting/watcher/input-http.md
+                  title: HTTP input
+                - page: docs-content://explore-analyze/alerting/watcher/input-chain.md
+                  title: Chain input
+              - group: Trigger
+                page: docs-content://explore-analyze/alerting/watcher/trigger.md
+                children:
+                - page: docs-content://explore-analyze/alerting/watcher/trigger-schedule.md
+                  title: Schedule trigger
+                - page: docs-content://explore-analyze/alerting/watcher/throttling.md
+                  title: Throttling
+                - page: docs-content://explore-analyze/alerting/watcher/schedule-types.md
+                  title: Schedule Types
+              - group: Condition
+                page: docs-content://explore-analyze/alerting/watcher/condition.md
+                children:
+                - page: docs-content://explore-analyze/alerting/watcher/condition-always.md
+                  title: Always condition
+                - page: docs-content://explore-analyze/alerting/watcher/condition-never.md
+                  title: Never condition
+                - page: docs-content://explore-analyze/alerting/watcher/condition-compare.md
+                  title: Compare condition
+                - page: docs-content://explore-analyze/alerting/watcher/condition-array-compare.md
+                  title: Array compare condition
+                - page: docs-content://explore-analyze/alerting/watcher/condition-script.md
+                  title: Script condition
+              - group: Actions
+                page: docs-content://explore-analyze/alerting/watcher/actions.md
+                children:
+                - page: docs-content://explore-analyze/alerting/watcher/action-foreach.md
+                  title: Running an action for each element in an array
+                - page: docs-content://explore-analyze/alerting/watcher/action-conditions.md
+                  title: Adding conditions to actions
+                - page: docs-content://explore-analyze/alerting/watcher/actions-email.md
+                  title: Email action
+                - page: docs-content://explore-analyze/alerting/watcher/actions-webhook.md
+                  title: Webhook action
+                - page: docs-content://explore-analyze/alerting/watcher/actions-index.md
+                  title: Index action
+                - page: docs-content://explore-analyze/alerting/watcher/actions-logging.md
+                  title: Logging action
+                - page: docs-content://explore-analyze/alerting/watcher/actions-slack.md
+                  title: Slack action
+                - page: docs-content://explore-analyze/alerting/watcher/actions-pagerduty.md
+                  title: PagerDuty action
+                - page: docs-content://explore-analyze/alerting/watcher/actions-jira.md
+                  title: Jira action
+              - group: Transform
+                page: docs-content://explore-analyze/alerting/watcher/transform.md
+                children:
+                - page: docs-content://explore-analyze/alerting/watcher/transform-search.md
+                  title: Search payload transform
+                - page: docs-content://explore-analyze/alerting/watcher/transform-script.md
+                  title: Script payload transform
+                - page: docs-content://explore-analyze/alerting/watcher/transform-chain.md
+                  title: Chain payload transform
+              - page: docs-content://explore-analyze/alerting/watcher/managing-watches.md
+                title: Managing watches
+              - group: Example watches
+                page: docs-content://explore-analyze/alerting/watcher/example-watches.md
+                children:
+                - page: docs-content://explore-analyze/alerting/watcher/watch-cluster-status.md
+                  title: Watching the status of an Elasticsearch cluster
+                - page: docs-content://explore-analyze/alerting/watcher/execute-watch.md
+                  title: Execute a watch
+              - page: docs-content://explore-analyze/alerting/watcher/watcher-limitations.md
+                title: Limitations
+          - group: Cases
+            page: docs-content://explore-analyze/cases.md
+            children:
+            - page: docs-content://explore-analyze/cases/control-case-access.md
+              title: Control access
+            - page: docs-content://explore-analyze/cases/create-cases.md
+              title: Create cases
+            - page: docs-content://explore-analyze/cases/manage-cases.md
+              title: Manage cases
+            - page: docs-content://explore-analyze/cases/attach-objects-to-cases.md
+              title: Attach objects
+            - page: docs-content://explore-analyze/cases/search-share-cases.md
+              title: Search and share
+            - page: docs-content://explore-analyze/cases/configure-case-settings.md
+              title: Configure settings
+            - page: docs-content://explore-analyze/cases/cases-as-data.md
+              title: Cases as data
+      - label: Automate
         children:
-        - page: docs-content://deploy-manage/upgrade/deployment-or-cluster.md
-          title: Upgrade your deployment or cluster
-        - page: docs-content://deploy-manage/upgrade/ingest-components.md
-          title: Upgrade your ingest components
-        - page: docs-content://deploy-manage/upgrade/orchestrator.md
-          title: Upgrade your orchestrator
-        - page: docs-content://deploy-manage/upgrade/plan-upgrade.md
-          title: Plan your upgrade
-        - page: docs-content://deploy-manage/upgrade/prepare-to-upgrade.md
-          title: Prepare to upgrade
-      - group: Uninstall
-        page: docs-content://deploy-manage/uninstall.md
+        - group: Workflows
+          page: docs-content://explore-analyze/workflows.md
+          children:
+          - page: docs-content://explore-analyze/workflows/setup.md
+            title: Set up workflows
+          - page: docs-content://explore-analyze/workflows/get-started.md
+            title: Get started with workflows
+          - group: Core components
+            page: docs-content://explore-analyze/workflows/core-components.md
+            children:
+            - group: Triggers
+              page: docs-content://explore-analyze/workflows/triggers.md
+              children:
+              - page: docs-content://explore-analyze/workflows/triggers/manual-triggers.md
+                title: Manual triggers
+              - page: docs-content://explore-analyze/workflows/triggers/scheduled-triggers.md
+                title: Scheduled triggers
+              - page: docs-content://explore-analyze/workflows/triggers/alert-triggers.md
+                title: Alert triggers
+            - group: Steps
+              page: docs-content://explore-analyze/workflows/steps.md
+              children:
+              - group: Action steps
+                page: docs-content://explore-analyze/workflows/steps/action-steps.md
+                children:
+                - page: docs-content://explore-analyze/workflows/steps/elasticsearch.md
+                  title: Elasticsearch
+                - page: docs-content://explore-analyze/workflows/steps/kibana.md
+                  title: Kibana
+                - page: docs-content://explore-analyze/workflows/steps/external-systems-apps.md
+                  title: External systems and apps
+              - group: Flow control steps
+                page: docs-content://explore-analyze/workflows/steps/flow-control-steps.md
+                children:
+                - page: docs-content://explore-analyze/workflows/steps/if.md
+                  title: If
+                - page: docs-content://explore-analyze/workflows/steps/foreach.md
+                  title: Foreach
+                - page: docs-content://explore-analyze/workflows/steps/wait.md
+                  title: Wait
+              - page: docs-content://explore-analyze/workflows/steps/ai-steps.md
+                title: AI steps
+          - group: Data and error handling
+            page: docs-content://explore-analyze/workflows/data.md
+            children:
+            - page: docs-content://explore-analyze/workflows/data/templating.md
+              title: Templating engine
+          - page: docs-content://explore-analyze/workflows/author-workflows.md
+            title: Author workflows
+          - page: docs-content://explore-analyze/workflows/monitor-troubleshoot.md
+            title: Monitor and troubleshoot workflows
+          - page: docs-content://explore-analyze/workflows/manage-workflows.md
+            title: Manage workflows
+          - page: docs-content://explore-analyze/workflows/templates.md
+            title: Workflow templates
+      - label: AI and machine learning
         children:
-        - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md
-          title: Uninstall Elastic Cloud Enterprise
-        - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-on-kubernetes.md
-          title: Uninstall Elastic Cloud on Kubernetes
-    - group: Deployment and administration tools
-      children:
-      - title: Overview (roundup)
-      - toc: ecctl://reference
-  - section: The Elasticsearch Platform
-    url: /manage-data/ingest/
-    children:
-    - label: Ingest and manage data
+        - group: Machine Learning and NLP
+          page: docs-content://explore-analyze/machine-learning.md
+          children:
+          - page: docs-content://explore-analyze/machine-learning/setting-up-machine-learning.md
+            title: Setup and security
+          - group: Anomaly detection
+            page: docs-content://explore-analyze/machine-learning/anomaly-detection.md
+            children:
+            - group: Finding anomalies
+              page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-finding-anomalies.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-plan.md
+                title: Plan your analysis
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-run-jobs.md
+                title: Run a job
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-view-results.md
+                title: View the results
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-forecast.md
+                title: Forecast future behavior
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-getting-started.md
+              title: Tutorial
+            - group: Concepts
+              page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-concepts.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-algorithms.md
+                title: Anomaly detection algorithms
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-explain.md
+                title: Anomaly score explanation
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-anomaly-detection-job-types.md
+                title: Job types
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/anomaly-detection-scale.md
+                title: Working with anomaly detection at scale
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-delayed-data-detection.md
+                title: Handling delayed data
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-api-quickref.md
+              title: API quick reference
+            - group: How-tos
+              page: docs-content://explore-analyze/machine-learning/anomaly-detection/anomaly-how-tos.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-alerts.md
+                title: Generating alerts for anomaly detection jobs
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-aggregation.md
+                title: Aggregating data for faster performance
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-transform.md
+                title: Altering data in your datafeed with runtime fields
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-detector-custom-rules.md
+                title: Customizing detectors with custom rules
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-categories.md
+                title: Detecting anomalous categories of data
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-populations.md
+                title: Performing population analysis
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-reverting-model-snapshot.md
+                title: Reverting to a model snapshot
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/geographic-anomalies.md
+                title: Detecting anomalous locations in geographic data
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/mapping-anomalies.md
+                title: Mapping anomalies by location
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-url.md
+                title: Adding custom URLs to machine learning results
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-jobs-from-lens.md
+                title: Anomaly detection jobs from visualizations
+            - group: Resources
+              page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-resources.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-limitations.md
+                title: Limitations
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-functions.md
+                title: Analysis function reference
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ootb-ml-jobs.md
+                title: Supplied configurations
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-troubleshooting.md
+                title: Troubleshooting and FAQ
+          - group: Data frame analytics
+            page: docs-content://explore-analyze/machine-learning/data-frame-analytics.md
+            children:
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-overview.md
+              title: Overview
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-finding-outliers.md
+              title: Finding outliers
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-regression.md
+              title: Predicting numerical values with regression
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-classification.md
+              title: Predicting classes with classification
+            - group: Concepts
+              page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-concepts.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-phases.md
+                title: How data frame analytics jobs work
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-scale.md
+                title: Working with data frame analytics at scale
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-custom-urls.md
+                title: Adding custom URLs to data frame analytics jobs
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-encoding.md
+                title: Feature encoding
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-processors.md
+                title: Feature processors
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-importance.md
+                title: Feature importance
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/dfa-regression-lossfunction.md
+                title: Loss functions for regression analyses
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/hyperparameters.md
+                title: Hyperparameter optimization
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-trained-models.md
+                title: Trained models
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfanalytics-apis.md
+              title: API quick reference
+            - group: Resources
+              page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-resources.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-limitations.md
+                title: Limitations
+          - group: NLP
+            page: docs-content://explore-analyze/machine-learning/nlp.md
+            children:
+            - group: Overview
+              page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-overview.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-extract-info.md
+                title: Extract information
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-classify-text.md
+                title: Classify text
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-search-compare.md
+                title: Search and compare text
+            - group: Deploy models
+              page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-deploy-models.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-select-model.md
+                title: Select a trained model
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-import-model.md
+                title: Import the trained model and vocabulary
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-deploy-model.md
+                title: Deploy the model in your cluster
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-test-inference.md
+                title: Try it out
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-inference.md
+              title: Add NLP inference to ingest pipelines
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-apis.md
+              title: API quick reference
+            - group: Built-in models
+              page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-built-in-models.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-elser.md
+                title: ELSER
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-jina.md
+                title: Jina
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-rerank.md
+                title: Elastic Rerank
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-e5.md
+                title: E5
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-lang-ident.md
+                title: Language identification
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-model-ref.md
+              title: Compatible third party models
+            - group: Examples
+              page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-examples.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/nlp/nlp-end-to-end-tutorial.md
+                title: End-to-end tutorial
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-ner-example.md
+                title: Named entity recognition
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-text-emb-vector-search-example.md
+                title: Text embedding and semantic search
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-limitations.md
+              title: Limitations
+          - group: Machine learning in Kibana
+            page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana.md
+            children:
+            - page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-aiops.md
+              title: AIOps Labs
+            - page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana/inference-processing.md
+              title: Inference processing
+        - group: Agent builder
+          page: docs-content://explore-analyze/ai-features/elastic-agent-builder.md
+          children:
+          - page: docs-content://explore-analyze/ai-features/agent-builder/get-started.md
+            title: Get started
+          - page: docs-content://explore-analyze/ai-features/agent-builder/models.md
+            title: Models
+          - group: Chat
+            page: docs-content://explore-analyze/ai-features/agent-builder/chat.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/agent-builder/standalone-and-flyout-modes.md
+              title: Chat UI modes
+          - group: Agents
+            page: docs-content://explore-analyze/ai-features/agent-builder/agent-builder-agents.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/agent-builder/custom-agents.md
+              title: Custom agents
+            - page: docs-content://explore-analyze/ai-features/agent-builder/builtin-agents-reference.md
+              title: Built-in agents
+            - page: docs-content://explore-analyze/ai-features/agent-builder/prompt-engineering.md
+              title: Prompting best practices
+            - page: docs-content://explore-analyze/ai-features/agent-builder/agents-and-workflows.md
+              title: Call agents from workflows
+          - group: Tools
+            page: docs-content://explore-analyze/ai-features/agent-builder/tools.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/builtin-tools-reference.md
+              title: Built-in tools
+            - group: Custom tools
+              page: docs-content://explore-analyze/ai-features/agent-builder/tools/custom-tools.md
+              children:
+              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/esql-tools.md
+                title: "ES|QL tools"
+              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/index-search-tools.md
+                title: Index search tools
+              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/mcp-tools.md
+                title: MCP tools
+              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/workflow-tools.md
+                title: Workflow tools
+          - group: Programmatic access
+            page: docs-content://explore-analyze/ai-features/agent-builder/programmatic-access.md
+            children:
+            - group: Kibana API
+              page: docs-content://explore-analyze/ai-features/agent-builder/kibana-api.md
+              children:
+              - page: docs-content://explore-analyze/ai-features/agent-builder/agent-builder-api-tutorial.md
+                title: Kibana API tutorial
+            - page: docs-content://explore-analyze/ai-features/agent-builder/a2a-server.md
+              title: A2A server
+            - page: docs-content://explore-analyze/ai-features/agent-builder/mcp-server.md
+              title: MCP server
+          - page: docs-content://explore-analyze/ai-features/agent-builder/monitor-usage.md
+            title: Monitor token usage
+          - page: docs-content://explore-analyze/ai-features/agent-builder/permissions.md
+            title: Permissions
+          - group: Troubleshooting
+            page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting/context-length-exceeded.md
+              title: Context length exceeded
+            - page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting/api-calls-return-403-forbidden.md
+              title: 403 Forbidden
+          - page: docs-content://explore-analyze/ai-features/agent-builder/limitations-known-issues.md
+            title: Limitations
+        - group: Elastic Inference Service
+          page: docs-content://explore-analyze/elastic-inference.md
+          children:
+          - group: Elastic Inference Service
+            page: docs-content://explore-analyze/elastic-inference/eis.md
+            children:
+            - page: docs-content://explore-analyze/elastic-inference/connect-self-managed-cluster-to-eis.md
+              title: EIS for self-managed clusters
+          - page: docs-content://explore-analyze/elastic-inference/inference-api.md
+            title: Inference integrations
+        - group: AI chat and LLM configuration
+          page: docs-content://explore-analyze/ai-features.md
+          children:
+          - group: AI chat experiences
+            page: docs-content://explore-analyze/ai-features/ai-chat-experiences.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/ai-chat-experiences/ai-agent-or-ai-assistant.md
+              title: Compare Agent Builder and AI Assistant
+            - page: docs-content://explore-analyze/ai-features/ai-chat-experiences/ai-assistant.md
+              title: AI assistants
+          - group: LLM providers
+            page: docs-content://explore-analyze/ai-features/llm-guides/llm-connectors.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-azure-openai.md
+              title: Connect to Azure OpenAI
+            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-amazon-bedrock.md
+              title: Connect to Amazon Bedrock
+            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-openai.md
+              title: Connect to OpenAI
+            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-google-vertex.md
+              title: Connect to Google Vertex
+            - group: Local LLMs
+              page: docs-content://explore-analyze/ai-features/llm-guides/local-llms-overview.md
+              children:
+              - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-lmstudio-observability.md
+                title: Connect to LM Studio for Observability
+              - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-lmstudio-security.md
+                title: Connect to LM Studio for Elastic Security
+              - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-vLLM.md
+                title: Connect to vLLM for Elastic Security
+          - page: docs-content://explore-analyze/ai-features/manage-access-to-ai-assistant.md
+            title: Manage access to AI features
+        - page: docs-content://explore-analyze/ai-features/agent-skills.md
+          title: AI agent skills for Elastic
+    - label: Solutions and project types
       children:
-      - group: "Ingest or migrate: bring your data into Elasticsearch"
+      - page: docs-content://solutions/index.md
+        title: Solutions overview
+      - group: Elasticsearch solution
+        page: docs-content://solutions/elasticsearch-solution-project.md
         children:
-        - page: docs-content://manage-data/ingest.md
-          title: Choose/Plan your ingest method
-        - page: docs-content://manage-data/ingest/ingest-reference-architectures.md
-          title: Ingest architectures
-        - group: Ingest by solution
-          children:
-          - page: docs-content://solutions/search/ingest-for-search.md
-            title: Ingesting data for search use cases
-          - title: Ingesting data for observability
-          - page: docs-content://solutions/security/get-started/ingest-data-to-elastic-security.md
-            title: Ingesting data for security (Move from Solutions)
-        - page: docs-content://manage-data/ingest/ingesting-timeseries-data.md
-          title: Ingesting time series data
-        - group: Ingest logs
+        - group: Get started
+          page: docs-content://solutions/elasticsearch-solution-project/get-started.md
+          children:
+          - page: docs-content://solutions/elasticsearch-solution-project/search-connection-details.md
+            title: Find connection details
+        - group: Playground
+          page: docs-content://solutions/elasticsearch-solution-project/playground.md
+          children:
+          - page: docs-content://solutions/elasticsearch-solution-project/playground-context.md
+            title: Optimize model context
+          - page: docs-content://solutions/elasticsearch-solution-project/playground-query.md
+            title: View and modify queries
+          - page: docs-content://solutions/elasticsearch-solution-project/playground-troubleshooting.md
+            title: Troubleshooting
+        - page: docs-content://solutions/elasticsearch-solution-project/ai-assistant.md
+          title: AI Assistant
+        - page: docs-content://solutions/elasticsearch-solution-project/query-rules-ui.md
+          title: Query rules UI
+        - group: Search Applications
+          page: docs-content://solutions/elasticsearch-solution-project/search-applications.md
+          children:
+          - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-api.md
+            title: Search API and templates
+          - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-security.md
+            title: Security
+          - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-client.md
+            title: Search Application client guide
+        - page: docs-content://solutions/elasticsearch-solution-project/es-serverless-add-ons.md
+          title: Add-ons
+      - group: Observability solution
+        page: docs-content://solutions/observability.md
+        children:
+        - group: Get started
+          page: docs-content://solutions/observability/get-started.md
+          children:
+          - group: Elastic Observability quickstarts
+            page: docs-content://solutions/observability/get-started/quickstarts.md
+            children:
+            - page: docs-content://solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md
+              title: "Quickstart: Monitor hosts with OpenTelemetry"
+            - page: docs-content://solutions/observability/get-started/quickstart-monitor-your-application-performance.md
+              title: "Quickstart: Monitor your application performance"
+            - page: docs-content://solutions/observability/get-started/quickstart-unified-kubernetes-observability-with-elastic-distributions-of-opentelemetry-edot.md
+              title: "Quickstart: Unified Kubernetes Observability with Elastic Distributions of OpenTelemetry (EDOT)"
+            - page: docs-content://solutions/observability/get-started/quickstart-elastic-cloud-otel-endpoint.md
+              title: "Quickstart: Send OTLP data to Elastic Serverless or Elastic Cloud Hosted"
+            - page: docs-content://solutions/observability/get-started/quickstart-create-synthetic-monitor.md
+              title: "Quickstart: Create a Synthetic Monitor"
+            - page: docs-content://solutions/observability/get-started/quickstart-monitor-hosts-with-elastic-agent.md
+              title: "Quickstart: Monitor hosts with Elastic Agent"
+            - page: docs-content://solutions/observability/get-started/quickstart-monitor-kubernetes-cluster-with-elastic-agent.md
+              title: "Quickstart: Monitor your Kubernetes cluster with Elastic Agent"
+            - page: docs-content://solutions/observability/get-started/quickstart-collect-data-with-aws-firehose.md
+              title: "Quickstart: Collect data with AWS Firehose"
+          - group: OpenTelemetry quickstarts
+            page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/index.md
+            children:
+            - page: docs-content://solutions/observability/get-started/opentelemetry/custom-metrics-quickstart.md
+              title: Ingest custom metrics with EDOT
+            - group: Self-managed
+              page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/index.md
+              children:
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/k8s.md
+                title: Kubernetes
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/hosts_vms.md
+                title: Hosts / VMs
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/docker.md
+                title: Docker
+            - group: Elastic Cloud Serverless
+              page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/index.md
+              children:
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/k8s.md
+                title: Kubernetes
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/hosts_vms.md
+                title: Hosts and VMs
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/docker.md
+                title: Docker
+            - group: Elastic Cloud Hosted
+              page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/index.md
+              children:
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/k8s.md
+                title: Kubernetes
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/hosts_vms.md
+                title: Hosts and VMs
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/docker.md
+                title: Docker
+          - group: OpenTelemetry use cases
+            page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/index.md
+            children:
+            - group: Kubernetes observability
+              page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/index.md
+              children:
+              - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/prerequisites-compatibility.md
+                title: Prerequisites and compatibility
+              - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/components.md
+                title: Components description
+              - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/deployment.md
+                title: Deployment
+              - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/instrumenting-applications.md
+                title: Instrumenting Applications
+              - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/upgrade.md
+                title: Upgrade
+              - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/customization.md
+                title: Customization
+          - group: Other Observability tutorials
+            page: docs-content://solutions/observability/get-started/other-tutorials/index.md
+            children:
+            - page: docs-content://solutions/observability/get-started/other-tutorials/tutorial-monitor-java-application.md
+              title: "Tutorial: Monitor a Java application"
+          - page: docs-content://solutions/observability/get-started/logs-essentials.md
+            title: Logs Essentials
+        - group: Applications and services
+          page: docs-content://solutions/observability/applications/index.md
+          children:
+          - group: Application performance monitoring (APM)
+            page: docs-content://solutions/observability/apm/index.md
+            children:
+            - page: docs-content://solutions/observability/apm/get-started.md
+              title: Get started with traces and APM
+            - group: Application data types
+              page: docs-content://solutions/observability/apm/data-types.md
+              children:
+              - page: docs-content://solutions/observability/apm/spans.md
+                title: Spans
+              - group: Transactions
+                page: docs-content://solutions/observability/apm/transactions.md
+                children:
+                - page: docs-content://solutions/observability/apm/transaction-sampling.md
+                  title: Transaction sampling
+              - page: docs-content://solutions/observability/apm/traces.md
+                title: Traces
+              - page: docs-content://solutions/observability/apm/errors.md
+                title: Errors
+              - page: docs-content://solutions/observability/apm/metrics.md
+                title: Metrics
+              - page: docs-content://solutions/observability/apm/metadata.md
+                title: Metadata
+            - group: Collect application data
+              page: docs-content://solutions/observability/apm/ingest/index.md
+              children:
+              - group: OpenTelemetry
+                page: docs-content://solutions/observability/apm/opentelemetry/index.md
+                children:
+                - page: docs-content://solutions/observability/apm/opentelemetry/upstream-opentelemetry-collectors-language-sdks.md
+                  title: Contrib OpenTelemetry Collectors and language SDKs
+                - page: docs-content://solutions/observability/apm/opentelemetry/collect-metrics.md
+                  title: Collect metrics
+                - page: docs-content://solutions/observability/apm/opentelemetry/create-apm-agent-key-for-edot-sdks.md
+                  title: Create APM agent key for EDOT SDKs
+                - page: docs-content://solutions/observability/apm/opentelemetry/edot-sdks-central-configuration.md
+                  title: Centrally configure EDOT SDKs
+                - page: docs-content://solutions/observability/apm/opentelemetry/limitations.md
+                  title: Limitations
+                - page: docs-content://solutions/observability/apm/opentelemetry/attributes.md
+                  title: Attributes and labels
+                - page: docs-content://solutions/observability/apm/opentelemetry/data-stream-routing.md
+                  title: Data stream routing
+              - group: APM agents
+                page: docs-content://solutions/observability/apm/apm-agents/index.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-agents/central-configuration.md
+                  title: Centrally configure APM agents
+                - page: docs-content://solutions/observability/apm/apm-agents/real-user-monitoring-rum.md
+                  title: Real User Monitoring (RUM)
+                - page: docs-content://solutions/observability/apm/apm-agents/create-upload-source-maps-rum.md
+                  title: Create and upload source maps (RUM)
+              - page: docs-content://solutions/observability/apm/ingest/apm-k8s-attacher.md
+                title: Kubernetes
+              - page: docs-content://solutions/observability/apm/ingest/monitor-aws-lambda-functions.md
+                title: AWS Lambda Functions
+              - page: docs-content://solutions/observability/apm/ingest/jaeger.md
+                title: Jaeger (deprecated)
+            - group: View and analyze data
+              page: docs-content://solutions/observability/apm/view-analyze-data.md
+              children:
+              - group: Overviews
+                page: docs-content://solutions/observability/apm/overviews.md
+                children:
+                - page: docs-content://solutions/observability/apm/services.md
+                  title: Services
+                - page: docs-content://solutions/observability/apm/traces-ui.md
+                  title: Traces UI
+                - page: docs-content://solutions/observability/apm/dependencies.md
+                  title: Dependencies
+                - page: docs-content://solutions/observability/apm/service-map.md
+                  title: Service Map
+                - page: docs-content://solutions/observability/apm/service-overview.md
+                  title: Service overview
+                - page: docs-content://solutions/observability/apm/mobile-service-overview.md
+                  title: Mobile service overview
+              - group: Drill down into data
+                page: docs-content://solutions/observability/apm/drill-down-into-data.md
+                children:
+                - page: docs-content://solutions/observability/apm/transactions-ui.md
+                  title: Transactions UI
+                - page: docs-content://solutions/observability/apm/trace-sample-timeline.md
+                  title: Trace sample timeline
+                - page: docs-content://solutions/observability/apm/errors-ui.md
+                  title: Errors UI
+                - page: docs-content://solutions/observability/apm/metrics-ui.md
+                  title: Metrics UI
+                - page: docs-content://solutions/observability/apm/infrastructure.md
+                  title: Infrastructure
+                - page: docs-content://solutions/observability/apm/logs.md
+                  title: Logs
+              - group: Filter and search data
+                page: docs-content://solutions/observability/apm/filter-search-data.md
+                children:
+                - page: docs-content://solutions/observability/apm/filter-data.md
+                  title: Filters
+                - page: docs-content://solutions/observability/apm/advanced-queries.md
+                  title: Advanced queries
+                - page: docs-content://solutions/observability/apm/cross-cluster-search.md
+                  title: Cross-cluster search
+              - group: Interpret data
+                page: docs-content://solutions/observability/apm/interpret-data.md
+                children:
+                - page: docs-content://solutions/observability/apm/find-transaction-latency-failure-correlations.md
+                  title: Find transaction latency and failure correlations
+                - page: docs-content://solutions/observability/apm/track-deployments-with-annotations.md
+                  title: Track deployments with annotations
+                - page: docs-content://solutions/observability/apm/explore-mobile-sessions.md
+                  title: Explore mobile sessions with Discover
+                - page: docs-content://solutions/observability/apm/observe-lambda-functions.md
+                  title: Observe Lambda functions
+              - page: docs-content://solutions/observability/apm/machine-learning.md
+                title: Integrate with machine learning
+              - page: docs-content://solutions/observability/apm/apm-agent-explorer.md
+                title: APM Agent explorer
+              - page: docs-content://solutions/observability/apm/applications-ui-settings.md
+                title: Settings
+            - group: Act on data
+              page: docs-content://solutions/observability/apm/act-on-data.md
+              children:
+              - page: docs-content://solutions/observability/apm/create-apm-rules-alerts.md
+                title: Create rules and alerts
+              - page: docs-content://solutions/observability/apm/create-custom-links.md
+                title: Create custom links
+            - group: Use APM securely
+              page: docs-content://solutions/observability/apm/use-apm-securely.md
+              children:
+              - group: Secure data
+                page: docs-content://solutions/observability/apm/secure-data.md
+                children:
+                - page: docs-content://solutions/observability/apm/control-access-to-apm-data.md
+                  title: Control access to APM data
+                - page: docs-content://solutions/observability/apm/built-in-data-filters.md
+                  title: Built-in data filters
+                - page: docs-content://solutions/observability/apm/custom-filters.md
+                  title: Custom filters
+                - page: docs-content://solutions/observability/apm/delete-sensitive-data.md
+                  title: Delete sensitive data
+              - group: Secure communication with APM agents
+                page: docs-content://solutions/observability/apm/secure-communication-with-apm-agents.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-agent-tls-communication.md
+                  title: APM agent TLS communication
+                - page: docs-content://solutions/observability/apm/api-keys.md
+                  title: API keys
+                - page: docs-content://solutions/observability/apm/secret-token.md
+                  title: Secret token
+                - page: docs-content://solutions/observability/apm/anonymous-authentication.md
+                  title: Anonymous authentication
+              - group: Secure communication with the Elastic Stack
+                page: docs-content://solutions/observability/apm/secure-communication-with-elastic-stack.md
+                children:
+                - page: docs-content://solutions/observability/apm/create-assign-feature-roles-to-apm-server-users.md
+                  title: Use feature roles
+                - page: docs-content://solutions/observability/apm/grant-access-using-api-keys.md
+                  title: Grant access using API keys
+              - group: Secure access to the Applications UI
+                page: docs-content://solutions/observability/apm/secure-access-to-applications-ui.md
+                children:
+                - page: docs-content://solutions/observability/apm/ui-user-reader.md
+                  title: Create an APM reader user
+                - page: docs-content://solutions/observability/apm/ui-user-annotation.md
+                  title: Create an annotation user
+                - page: docs-content://solutions/observability/apm/ui-user-api.md
+                  title: Create an API user
+                - page: docs-content://solutions/observability/apm/ui-user-central-config.md
+                  title: Create a central config user
+                - page: docs-content://solutions/observability/apm/ui-user-storage-explorer.md
+                  title: Create a storage explorer user
+            - group: Manage storage
+              page: docs-content://solutions/observability/apm/manage-storage.md
+              children:
+              - page: docs-content://solutions/observability/apm/storage-explorer.md
+                title: Storage Explorer
+              - page: docs-content://solutions/observability/apm/data-streams.md
+                title: Data streams
+              - page: docs-content://solutions/observability/apm/index-lifecycle-management.md
+                title: Index lifecycle management
+              - page: docs-content://solutions/observability/apm/view-elasticsearch-index-template.md
+                title: View the Elasticsearch index template
+              - page: docs-content://solutions/observability/apm/parse-data-using-ingest-pipelines.md
+                title: Parse data using ingest pipelines
+              - page: docs-content://solutions/observability/apm/storage-sizing-guide.md
+                title: Storage and sizing guide
+              - page: docs-content://solutions/observability/apm/reduce-storage.md
+                title: Reduce storage
+              - page: docs-content://solutions/observability/apm/explore-data-in-elasticsearch.md
+                title: Explore data in Elasticsearch
+            - group: "Work with {{apm-server}}"
+              page: docs-content://solutions/observability/apm/apm-server/index.md
+              children:
+              - group: Set up
+                page: docs-content://solutions/observability/apm/apm-server/setup.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-server/fleet-managed.md
+                  title: Fleet-managed APM Server
+                - page: docs-content://solutions/observability/apm/apm-server/binary.md
+                  title: APM Server binary
+              - group: Configure
+                page: docs-content://solutions/observability/apm/apm-server/configure.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-server/general-configuration-options.md
+                  title: General configuration options
+                - page: docs-content://solutions/observability/apm/apm-server/configure-anonymous-authentication.md
+                  title: Anonymous authentication
+                - page: docs-content://solutions/observability/apm/apm-server/apm-agent-authorization.md
+                  title: APM agent authorization
+                - page: docs-content://solutions/observability/apm/apm-server/apm-agent-central-configuration.md
+                  title: Configure APM Agent Central Configuration
+                - page: docs-content://solutions/observability/apm/apm-server/configure-apm-instrumentation.md
+                  title: Instrumentation
+                - page: docs-content://solutions/observability/apm/apm-server/configure-kibana-endpoint.md
+                  title: Kibana endpoint
+                - page: docs-content://solutions/observability/apm/apm-server/configure-logging.md
+                  title: Logging
+                - group: Output
+                  page: docs-content://solutions/observability/apm/apm-server/configure-output.md
+                  children:
+                  - page: docs-content://solutions/observability/apm/apm-server/configure-output-for-elasticsearch-service-on-elastic-cloud.md
+                    title: Elastic Cloud Hosted
+                  - page: docs-content://solutions/observability/apm/apm-server/configure-elasticsearch-output.md
+                    title: Elasticsearch
+                  - page: docs-content://solutions/observability/apm/apm-server/configure-logstash-output.md
+                    title: "{{ls}}"
+                  - page: docs-content://solutions/observability/apm/apm-server/configure-kafka-output.md
+                    title: Kafka
+                  - page: docs-content://solutions/observability/apm/apm-server/configure-redis-output.md
+                    title: Redis
+                  - page: docs-content://solutions/observability/apm/apm-server/configure-console-output.md
+                    title: Console
+                - page: docs-content://solutions/observability/apm/apm-server/configure-project-paths.md
+                  title: Project paths
+                - page: docs-content://solutions/observability/apm/apm-server/configure-real-user-monitoring-rum.md
+                  title: Real User Monitoring (RUM)
+                - group: SSL/TLS settings
+                  page: docs-content://solutions/observability/apm/apm-server/ssl-tls-settings.md
+                  children:
+                  - page: docs-content://solutions/observability/apm/apm-server/ssl-tls-output-settings.md
+                    title: SSL/TLS output settings
+                  - page: docs-content://solutions/observability/apm/apm-server/ssl-tls-input-settings.md
+                    title: SSL/TLS input settings
+                - page: docs-content://solutions/observability/apm/apm-server/tail-based-sampling.md
+                  title: Tail-based sampling
+                - page: docs-content://solutions/observability/apm/apm-server/use-environment-variables-in-configuration.md
+                  title: Use environment variables in the configuration
+                - group: Advanced setup
+                  page: docs-content://solutions/observability/apm/apm-server/advanced-setup.md
+                  children:
+                  - page: docs-content://solutions/observability/apm/apm-server/installation-layout.md
+                    title: Installation layout
+                  - page: docs-content://solutions/observability/apm/apm-server/secrets-keystore-for-secure-settings.md
+                    title: Secrets keystore
+                  - page: docs-content://solutions/observability/apm/apm-server/command-reference.md
+                    title: Command reference
+                  - page: docs-content://solutions/observability/apm/apm-server/tune-data-ingestion.md
+                    title: Tune data ingestion
+                  - page: docs-content://solutions/observability/apm/apm-server/high-availability.md
+                    title: High Availability
+                  - page: docs-content://solutions/observability/apm/apm-server/systemd.md
+                    title: APM Server and systemd
+              - group: Monitor
+                page: docs-content://solutions/observability/apm/apm-server/monitor.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-server/monitor-fleet-managed.md
+                  title: Fleet-managed
+                - group: APM Server binary
+                  page: docs-content://solutions/observability/apm/apm-server/monitor-binary.md
+                  children:
+                  - page: docs-content://solutions/observability/apm/apm-server/use-internal-collection-to-send-monitoring-data.md
+                    title: Use internal collection
+                  - page: docs-content://solutions/observability/apm/apm-server/use-metricbeat-to-send-monitoring-data.md
+                    title: "Use {{metricbeat}} collection"
+                  - page: docs-content://solutions/observability/apm/apm-server/use-select-metrics-emitted-directly-to-monitoring-cluster.md
+                    title: Use local collection
+            - group: APM APIs
+              page: docs-content://solutions/observability/apm/apis.md
+              children:
+              - page: docs-content://solutions/observability/apm/apm-ui-api.md
+                title: APM UI API
+              - group: "{{apm-server}} API"
+                page: docs-content://solutions/observability/apm/apm-server/api.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-server/information-api.md
+                  title: APM Server information API
+                - page: docs-content://solutions/observability/apm/elastic-apm-events-intake-api.md
+                  title: Elastic APM events intake API
+                - page: docs-content://solutions/observability/apm/elastic-apm-agent-configuration-api.md
+                  title: Elastic APM agent configuration API
+                - page: docs-content://solutions/observability/apm/opentelemetry-intake-api.md
+                  title: OpenTelemetry intake API
+                - page: docs-content://solutions/observability/apm/jaeger-event-intake.md
+                  title: Jaeger event intake
+              - page: docs-content://solutions/observability/apm/managed-intake-service-event-api.md
+                title: Managed intake service event API
+            - group: Upgrade
+              page: docs-content://solutions/observability/apm/upgrade.md
+              children:
+              - page: docs-content://solutions/observability/apm/apm-agent-compatibility.md
+                title: APM agent compatibility
+              - group: "Upgrade to version 9.0 [apm-upgrading-to-9.0]"
+                page: docs-content://solutions/observability/apm/upgrade-to-version-9.md
+                children:
+                - page: docs-content://solutions/observability/apm/upgrade-self-installation-of-apm-server-standalone-to-9.md
+                  title: Self-installation standalone
+                - page: docs-content://solutions/observability/apm/upgrade-self-installation-of-apm-integration-to-9.md
+                  title: Self-installation APM integration
+                - page: docs-content://solutions/observability/apm/upgrade-elastic-cloud-apm-server-standalone-to-9.md
+                  title: "{{ecloud}} standalone"
+                - page: docs-content://solutions/observability/apm/upgrade-elastic-cloud-with-apm-integration-to-9.md
+                  title: "{{ecloud}} APM integration"
+              - group: Switch to the Elastic APM integration
+                page: docs-content://solutions/observability/apm/switch-to-elastic-apm-integration.md
+                children:
+                - page: docs-content://solutions/observability/apm/switch-self-installation-to-apm-integration.md
+                  title: Switch a self-installation
+                - page: docs-content://solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md
+                  title: "Switch an {{ecloud}} cluster"
+          - group: Synthetic monitoring
+            page: docs-content://solutions/observability/synthetics/index.md
+            children:
+            - group: Get started
+              page: docs-content://solutions/observability/synthetics/get-started.md
+              children:
+              - page: docs-content://solutions/observability/synthetics/create-monitors-with-projects.md
+                title: Use a Synthetics project
+              - page: docs-content://solutions/observability/synthetics/create-monitors-ui.md
+                title: Use the Synthetics UI
+            - group: Scripting browser monitors
+              page: docs-content://solutions/observability/synthetics/scripting-browser-monitors.md
+              children:
+              - page: docs-content://solutions/observability/synthetics/write-synthetic-test.md
+                title: Write a synthetic test
+              - page: docs-content://solutions/observability/synthetics/configure-individual-browser-monitors.md
+                title: Configure individual monitors
+              - page: docs-content://solutions/observability/synthetics/use-synthetics-recorder.md
+                title: Use the Synthetics Recorder
+            - page: docs-content://solutions/observability/synthetics/configure-lightweight-monitors.md
+              title: Configure lightweight monitors
+            - page: docs-content://solutions/observability/synthetics/manage-monitors.md
+              title: Manage monitors
+            - page: docs-content://solutions/observability/synthetics/work-with-params-secrets.md
+              title: Work with params and secrets
+            - page: docs-content://solutions/observability/synthetics/analyze-data.md
+              title: Analyze monitor data
+            - page: docs-content://solutions/observability/synthetics/monitor-resources-on-private-networks.md
+              title: Monitor resources on private networks
+            - page: docs-content://solutions/observability/synthetics/cli.md
+              title: Use the CLI
+            - page: docs-content://solutions/observability/synthetics/configure-projects.md
+              title: Configure a Synthetics project
+            - page: docs-content://solutions/observability/synthetics/mfa-for-browser-monitors.md
+              title: Multi-factor Authentication
+            - page: docs-content://solutions/observability/synthetics/configure-settings.md
+              title: Configure Synthetics settings
+            - group: Grant users access to secured resources
+              page: docs-content://solutions/observability/synthetics/grant-access-to-secured-resources.md
+              children:
+              - page: docs-content://solutions/observability/synthetics/setup-role.md
+                title: Setup role
+              - page: docs-content://solutions/observability/synthetics/writer-role.md
+                title: Writer role
+              - page: docs-content://solutions/observability/synthetics/reader-role.md
+                title: Reader role
+            - page: docs-content://solutions/observability/synthetics/manage-data-retention.md
+              title: Manage data retention
+            - page: docs-content://solutions/observability/synthetics/network-security.md
+              title: Use Synthetics with network security
+            - page: docs-content://solutions/observability/synthetics/migrate-from-elastic-synthetics-integration.md
+              title: Migrate from the Elastic Synthetics integration
+            - page: docs-content://solutions/observability/synthetics/scale-architect-synthetics-deployment.md
+              title: Scale and architect a deployment
+            - page: docs-content://solutions/observability/synthetics/support-matrix.md
+              title: Synthetics support matrix
+            - page: docs-content://solutions/observability/synthetics/encryption-security.md
+              title: Synthetics Encryption and Security
+          - group: Real user monitoring
+            page: docs-content://solutions/observability/applications/user-experience.md
+            children:
+            - page: docs-content://solutions/observability/applications/otel-rum.md
+              title: OpenTelemetry for Real User Monitoring (RUM)
+          - page: docs-content://solutions/observability/applications/llm-observability.md
+            title: LLM and agentic AI observability
+          - group: Uptime monitoring (deprecated)
+            page: docs-content://solutions/observability/uptime/index.md
+            children:
+            - page: docs-content://solutions/observability/uptime/get-started.md
+              title: Get started
+            - group: Analyze
+              page: docs-content://solutions/observability/uptime/analyze.md
+              children:
+              - page: docs-content://solutions/observability/uptime/view-monitor-status.md
+                title: View monitor status
+              - page: docs-content://solutions/observability/uptime/analyze-monitors.md
+                title: Analyze monitors
+              - page: docs-content://solutions/observability/uptime/inspect-duration-anomalies.md
+                title: Inspect uptime duration anomalies
+            - page: docs-content://solutions/observability/uptime/configure-settings.md
+              title: Configure settings
+          - page: docs-content://solutions/observability/otlp-visualize.md
+            title: Visualize OpenTelemetry data
+        - page: docs-content://solutions/observability/cicd.md
+          title: CI/CD
+        - group: Cloud
+          page: docs-content://solutions/observability/cloud.md
+          children:
+          - group: AWS
+            page: docs-content://solutions/observability/cloud/amazon-web-services-aws-monitoring.md
+            children:
+            - page: docs-content://solutions/observability/cloud/ingestion-options.md
+              title: Ingestion options
+            - group: "Monitor {{aws}} with Elastic Agent"
+              page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-agent.md
+              children:
+              - page: docs-content://solutions/observability/cloud/monitor-amazon-cloud-compute-ec2.md
+                title: EC2
+              - page: docs-content://solutions/observability/cloud/monitor-amazon-kinesis-data-streams.md
+                title: Kinesis data streams
+              - page: docs-content://solutions/observability/cloud/monitor-amazon-simple-storage-service-s3.md
+                title: S3
+              - page: docs-content://solutions/observability/cloud/monitor-amazon-simple-queue-service-sqs.md
+                title: SQS
+            - page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md
+              title: "Monitor {{aws}} with {{beats}}"
+            - group: "Monitor {{aws}} with Amazon Data Firehose"
+              page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-amazon-data-firehose.md
+              children:
+              - page: docs-content://solutions/observability/cloud/monitor-virtual-private-cloud-vpc-flow-logs.md
+                title: VPC Flow Logs
+              - page: docs-content://solutions/observability/cloud/monitor-cloudtrail-logs.md
+                title: CloudTrail logs
+              - page: docs-content://solutions/observability/cloud/monitor-aws-network-firewall-logs.md
+                title: Network Firewall logs
+              - page: docs-content://solutions/observability/cloud/monitor-web-application-firewall-waf-logs.md
+                title: WAF logs
+              - page: docs-content://solutions/observability/cloud/monitor-cloudwatch-logs.md
+                title: CloudWatch logs
+            - page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-serverless-forwarder.md
+              title: "Monitor {{aws}} with Elastic Serverless Forwarder"
+          - group: Azure
+            page: docs-content://solutions/observability/cloud/azure-monitoring.md
+            children:
+            - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-elastic-agent.md
+              title: Monitor Microsoft Azure with Elastic Agent
+            - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-beats.md
+              title: Monitor Microsoft Azure with Beats
+            - page: docs-content://solutions/observability/cloud/multi-tenant-data-ingestion-with-beats.md
+              title: Ingest multi-tenant Azure Event Hub logs with Filebeat
+            - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-azure-native-isv-service.md
+              title: Monitor Microsoft Azure with the Azure Native ISV Service
+            - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-openai.md
+              title: Monitor Microsoft Azure OpenAI
+          - group: GCP
+            page: docs-content://solutions/observability/cloud/monitor-google-cloud-platform-gcp.md
+            children:
+            - page: docs-content://solutions/observability/cloud/gcp-dataflow-templates.md
+              title: GCP Dataflow templates
+        - group: Infrastructure and hosts
+          page: docs-content://solutions/observability/infra-and-hosts.md
+          children:
+          - group: Analyze infrastructure and host metrics
+            page: docs-content://solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md
+            children:
+            - page: docs-content://solutions/observability/infra-and-hosts/get-started-with-system-metrics.md
+              title: Get started with system metrics
+            - page: docs-content://solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
+              title: View infrastructure metrics by resource type
+            - page: docs-content://solutions/observability/infra-and-hosts/discover-metrics.md
+              title: Explore metrics data with Discover in Kibana
+            - page: docs-content://solutions/observability/infra-and-hosts/explore-infrastructure-metrics-over-time.md
+              title: Explore infrastructure metrics over time
+            - page: docs-content://solutions/observability/infra-and-hosts/analyze-compare-hosts.md
+              title: Analyze and compare hosts
+            - page: docs-content://solutions/observability/infra-and-hosts/detect-metric-anomalies.md
+              title: Detect metric anomalies
+            - page: docs-content://solutions/observability/infra-and-hosts/configure-settings.md
+              title: Configure settings
+          - group: Universal Profiling
+            page: docs-content://solutions/observability/infra-and-hosts/universal-profiling.md
+            children:
+            - page: docs-content://solutions/observability/infra-and-hosts/get-started-with-universal-profiling.md
+              title: Get started
+            - group: Manage data storage
+              page: docs-content://solutions/observability/infra-and-hosts/manage-data-storage.md
+              children:
+              - page: docs-content://solutions/observability/infra-and-hosts/universal-profiling-index-life-cycle-management.md
+                title: Index lifecycle management
+              - page: docs-content://solutions/observability/infra-and-hosts/configure-probabilistic-profiling.md
+                title: Configure probabilistic profiling
+            - group: Advanced configuration
+              page: docs-content://solutions/observability/infra-and-hosts/advanced-configuration.md
+              children:
+              - page: docs-content://solutions/observability/infra-and-hosts/tag-data-for-querying.md
+                title: Tag data for querying
+              - page: docs-content://solutions/observability/infra-and-hosts/add-symbols-for-native-frames.md
+                title: Add symbols for native frames
+              - page: docs-content://solutions/observability/infra-and-hosts/use-proxy-with-universal-profiling-agent.md
+                title: Use a proxy
+              - page: docs-content://solutions/observability/infra-and-hosts/override-kernel-version-check.md
+                title: Override kernel version check
+              - page: docs-content://solutions/observability/infra-and-hosts/environment-variables-to-configure-universal-profiling-agent.md
+                title: Environment variables to configure the Universal Profiling Agent
+              - page: docs-content://solutions/observability/infra-and-hosts/configuration-file-of-universal-profiling-agent.md
+                title: Configuration file of the Universal Profiling Agent
+            - page: docs-content://solutions/observability/infra-and-hosts/upgrade-universal-profiling.md
+              title: Upgrade
+            - page: docs-content://solutions/observability/infra-and-hosts/run-universal-profiling-on-self-hosted-elastic-stack.md
+              title: Self-hosted infrastructure
+            - group: Install the backend
+              page: docs-content://solutions/observability/infra-and-hosts/install-backend.md
+              children:
+              - page: docs-content://solutions/observability/infra-and-hosts/step-1-update-stack.md
+                title: "Step 1: Update the stack"
+              - page: docs-content://solutions/observability/infra-and-hosts/step-2-enable-universal-profiling-in-kibana.md
+                title: "Step 2: Enable Universal Profiling in Kibana"
+              - page: docs-content://solutions/observability/infra-and-hosts/step-3-set-up-universal-profiling-in-kibana.md
+                title: "Step 3: Set up Universal Profiling in Kibana"
+              - page: docs-content://solutions/observability/infra-and-hosts/step-4-run-backend-applications.md
+                title: "Step 4: Run the backend applications"
+              - page: docs-content://solutions/observability/infra-and-hosts/step-5-next-steps.md
+                title: "Step 5: Next steps"
+            - page: docs-content://solutions/observability/infra-and-hosts/operate-universal-profiling-backend.md
+              title: Operate the backend
+          - page: docs-content://solutions/observability/infra-and-hosts/tutorial-observe-kubernetes-deployments.md
+            title: "Tutorial: Observe your Kubernetes deployments"
+          - group: "Tutorial: Observe your nginx instances"
+            page: docs-content://solutions/observability/infra-and-hosts/tutorial-observe-nginx-instances.md
+            children:
+            - page: docs-content://solutions/observability/infra-and-hosts/understanding-no-results-found-message.md
+              title: Understanding "no results found" message
+          - page: docs-content://solutions/observability/infra-and-hosts/collect-nginx-data-otel-integration-fleet-managed.md
+            title: Collect NGINX data with OpenTelemetry integrations (Fleet-managed)
+          - page: docs-content://solutions/observability/infra-and-hosts/collect-nginx-data-otel-integration-standalone.md
+            title: Collect NGINX data with OpenTelemetry integrations (standalone)
+        - group: Logs
           page: docs-content://solutions/observability/logs.md
           children:
           - page: docs-content://solutions/observability/logs/get-started-with-system-logs.md
             title: Get started with system logs
           - page: docs-content://solutions/observability/logs/stream-any-log-file.md
-            title: Stream any log file
+            title: Send any log file using Elastic Agent
           - page: docs-content://solutions/observability/logs/stream-any-log-file-using-edot-collector.md
-            title: Stream any log file using EDOT Collector
-          - group: Stream application logs
+            title: Send any log file using OTel Collector
+          - group: Send application log data
             page: docs-content://solutions/observability/logs/stream-application-logs.md
             children:
             - page: docs-content://solutions/observability/logs/plaintext-application-logs.md
@@ -315,2535 +2078,786 @@ nav:
             - page: docs-content://solutions/observability/logs/apm-agent-log-sending.md
               title: APM agent log sending
           - page: docs-content://solutions/observability/logs/parse-route-logs.md
-            title: Parse and route logs
+            title: Parse and route logs using ingest pipelines
           - page: docs-content://solutions/observability/logs/filter-aggregate-logs.md
             title: Filter and aggregate logs
           - group: Explore logs
             page: docs-content://solutions/observability/logs/explore-logs.md
             children:
             - page: docs-content://solutions/observability/logs/discover-logs.md
-              title: Discover logs
+              title: Explore logs in Discover
             - page: docs-content://solutions/observability/logs/categorize-log-entries.md
               title: Categorize log entries
             - page: docs-content://solutions/observability/logs/inspect-log-anomalies.md
               title: Inspect log anomalies
           - page: docs-content://solutions/observability/logs/run-pattern-analysis-on-log-data.md
-            title: Run pattern analysis on log data
+            title: Run a pattern analysis on log data
           - page: docs-content://solutions/observability/logs/log-data-sources.md
-            title: Log data sources
+            title: Configure log data sources
           - page: docs-content://solutions/observability/logs/logs-data-retention.md
-            title: Logs data retention
+            title: Configure log data retention
           - page: docs-content://solutions/observability/logs/add-service-name-to-logs.md
-            title: Add service name to logs
+            title: Add a service name to logs
           - group: Logs index template reference
             page: docs-content://solutions/observability/logs/logs-index-template-reference.md
             children:
             - page: docs-content://solutions/observability/logs/logs-index-template-defaults.md
-              title: Logs index template defaults
-        - group: Ingest data with agentless integrations
-          page: docs-content://manage-data/ingest/agentless/agentless-integrations.md
-          children:
-          - page: docs-content://manage-data/ingest/agentless/cloud-connector-deployment.md
-            title: Cloud connector deployment
-          - page: docs-content://manage-data/ingest/agentless/agentless-integrations-faq.md
-            title: Agentless integrations FAQ
-          - page: integration-docs://reference/agentless_integrations.md
-            title: Agentless integrations reference
-        - group: Ingest data from applications
-          page: docs-content://manage-data/ingest/ingesting-data-from-applications.md
-          children:
-          - toc: docs-content://reference/apm-agents
-          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-with-nodejs-on-elasticsearch-service.md
-            title: Ingest data with Node.js
-          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-with-python-on-elasticsearch-service.md
-            title: Ingest data with Python
-          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-from-beats-to-elasticsearch-service-with-logstash-as-proxy.md
-            title: Ingest data from Beats with Logstash as a proxy
-          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-from-relational-database-into-elasticsearch-service.md
-            title: Ingest data from a relational database
-          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-python-application-using-filebeat.md
-            title: Ingest logs from a Python application using Filebeat
-          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-nodejs-web-application-using-filebeat.md
-            title: Ingest logs from a Node.js web application using Filebeat
-        - title: Ingest data using the API
-        - page: docs-content://manage-data/ingest/upload-data-files.md
-          title: Upload data files
-        - page: docs-content://manage-data/ingest/sample-data.md
-          title: Sample data
-        - group: Migrating your Elasticsearch data
-          page: docs-content://manage-data/migrate.md
-          children:
-          - page: docs-content://manage-data/migrate/migrate-from-a-self-managed-cluster-with-a-self-signed-certificate-using-remote-reindex.md
-            title: Reindex using a private CA
-          - page: docs-content://manage-data/migrate/migrate-with-logstash.md
-            title: Migrate Elastic Cloud Hosted data to Serverless with Logstash
-          - page: docs-content://manage-data/migrate/migrate-data-between-elasticsearch-clusters-with-minimal-downtime.md
-            title: Minimal-downtime migration using snapshots
-          - page: docs-content://manage-data/migrate/migrate-internal-indices.md
-            title: Migrate system indices
-      - group: Ingest tools
-        page: docs-content://reference/ingestion-tools/index.md
-        children:
-        - toc: opentelemetry://reference
-          children:
-          - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/index.md
-            title: Quickstarts
-          - page: opentelemetry://reference/architecture/index.md
-            title: Reference Architecture
-          - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/index.md
-            title: Use cases
-          - page: opentelemetry://reference/compatibility/index.md
-            title: Compatibility and support
-          - page: opentelemetry://reference/data-streams.md
-            title: Data streams
-          - page: opentelemetry://reference/central-configuration.md
-            title: Central configuration
-        - toc: opentelemetry://reference/motlp
-        - toc: opentelemetry://reference/edot-cloud-forwarder
-        - toc: elastic-agent://reference/edot-collector
-        - group: EDOT SDKs
-          page: opentelemetry://reference/edot-sdks/index.md
-          children:
-          - toc: apm-agent-android://reference/edot-android
-          - toc: elastic-otel-dotnet://reference/edot-dotnet
-          - toc: apm-agent-ios://reference/edot-ios
-          - toc: elastic-otel-java://reference/edot-java
-          - toc: elastic-otel-node://reference/edot-node
-          - toc: elastic-otel-php://reference/edot-php
-          - toc: elastic-otel-python://reference/edot-python
-          - toc: elastic-otel-rum-js://reference/edot-browser
-        - toc: docs-content://reference/fleet
-        - toc: integration-docs://reference
-        - toc: elasticsearch://reference/search-connectors
-        - toc: logstash://reference
-        - toc: docs-content://reference/apm
-        - toc: beats://reference
-        - group: Other ingest tools
-          children:
-          - toc: elasticsearch-hadoop://reference
-          - toc: elastic-serverless-forwarder://reference
-      - group: Data storage and lifecycle
-        children:
-        - group: The Elasticsearch data store
-          page: docs-content://manage-data/data-store.md
-          children:
-          - group: Index basics
-            page: docs-content://manage-data/data-store/index-basics.md
-            children:
-            - page: elasticsearch://reference/elasticsearch/index-settings/index.md
-              title: Index settings reference
-            - page: elasticsearch://reference/elasticsearch/index-lifecycle-actions/index.md
-              title: Index lifecycle management actions
-          - page: docs-content://manage-data/data-store/near-real-time-search.md
-            title: Near real-time search
-          - group: Data streams
-            page: docs-content://manage-data/data-store/data-streams.md
-            children:
-            - page: docs-content://manage-data/data-store/data-streams/set-up-data-stream.md
-              title: Set up a data stream
-            - page: docs-content://manage-data/data-store/data-streams/use-data-stream.md
-              title: Use a data stream
-            - page: docs-content://manage-data/data-store/data-streams/modify-data-stream.md
-              title: Modify a data stream
-            - page: docs-content://manage-data/data-store/data-streams/manage-data-stream.md
-              title: Manage a data stream
-            - group: Time series data stream (TSDS)
-              page: docs-content://manage-data/data-store/data-streams/time-series-data-stream-tsds.md
-              children:
-              - page: docs-content://manage-data/data-store/data-streams/quickstart-tsds.md
-                title: Quickstart
-              - page: docs-content://manage-data/data-store/data-streams/set-up-tsds.md
-                title: Set up TSDS
-              - group: Downsampling
-                page: docs-content://manage-data/data-store/data-streams/downsampling-time-series-data-stream.md
-                children:
-                - page: docs-content://manage-data/data-store/data-streams/downsampling-concepts.md
-                  title: Downsampling concepts
-                - page: docs-content://manage-data/data-store/data-streams/run-downsampling.md
-                  title: Run downsampling
-                - page: docs-content://manage-data/data-store/data-streams/query-downsampled-data.md
-                  title: Query downsampled data
-              - group: Advanced topics
-                page: docs-content://manage-data/data-store/data-streams/advanced-topics-tsds.md
-                children:
-                - page: docs-content://manage-data/data-store/data-streams/time-bound-tsds.md
-                  title: Time-bound TSDS
-                - page: docs-content://manage-data/data-store/data-streams/reindex-tsds.md
-                  title: Reindex TSDS
-                - page: docs-content://manage-data/data-store/data-streams/tsds-ingest-otlp.md
-                  title: TSDS ingest OTLP
-            - group: Logs data stream
-              page: docs-content://manage-data/data-store/data-streams/logs-data-stream.md
-              children:
-              - page: docs-content://manage-data/data-store/data-streams/logs-data-stream-configure.md
-                title: Configure
-              - page: docs-content://manage-data/data-store/data-streams/logs-data-stream-integrations.md
-                title: Integrations
-            - group: Failure store
-              page: docs-content://manage-data/data-store/data-streams/failure-store.md
-              children:
-              - page: docs-content://manage-data/data-store/data-streams/failure-store-recipes.md
-                title: Recipes
-          - group: Mapping
-            page: docs-content://manage-data/data-store/mapping.md
-            children:
-            - page: elasticsearch://reference/elasticsearch/mapping-reference/index.md
-              title: Mapping reference
-            - group: Dynamic mapping
-              page: docs-content://manage-data/data-store/mapping/dynamic-mapping.md
-              children:
-              - page: docs-content://manage-data/data-store/mapping/dynamic-field-mapping.md
-                title: Dynamic field mapping
-              - page: docs-content://manage-data/data-store/mapping/dynamic-templates.md
-                title: Dynamic templates
-            - page: docs-content://manage-data/data-store/mapping/explicit-mapping.md
-              title: Explicit mapping
-            - group: Runtime fields
-              page: docs-content://manage-data/data-store/mapping/runtime-fields.md
-              children:
-              - page: docs-content://manage-data/data-store/mapping/map-runtime-field.md
-                title: Map a runtime field
-              - page: docs-content://manage-data/data-store/mapping/define-runtime-fields-in-search-request.md
-                title: Define in search request
-              - page: docs-content://manage-data/data-store/mapping/override-field-values-at-query-time.md
-                title: Override values at query time
-              - page: docs-content://manage-data/data-store/mapping/retrieve-runtime-field.md
-                title: Retrieve a runtime field
-              - page: docs-content://manage-data/data-store/mapping/index-runtime-field.md
-                title: Index a runtime field
-              - page: docs-content://manage-data/data-store/mapping/explore-data-with-runtime-fields.md
-                title: Explore data with runtime fields
-            - page: docs-content://manage-data/data-store/mapping/removal-of-mapping-types.md
-              title: Removal of mapping types
-            - page: docs-content://manage-data/data-store/mapping/update-mappings-examples.md
-              title: Update mappings examples
-          - group: Text analysis
-            page: docs-content://manage-data/data-store/text-analysis.md
-            children:
-            - page: elasticsearch://reference/text-analysis/index.md
-              title: Text analysis components
-            - group: Concepts
-              page: docs-content://manage-data/data-store/text-analysis/concepts.md
-              children:
-              - page: docs-content://manage-data/data-store/text-analysis/anatomy-of-an-analyzer.md
-                title: Anatomy of an analyzer
-              - page: docs-content://manage-data/data-store/text-analysis/index-search-analysis.md
-                title: Index and search analysis
-              - page: docs-content://manage-data/data-store/text-analysis/stemming.md
-                title: Stemming
-              - page: docs-content://manage-data/data-store/text-analysis/token-graphs.md
-                title: Token graphs
-            - group: Configure text analysis
-              page: docs-content://manage-data/data-store/text-analysis/configure-text-analysis.md
-              children:
-              - page: docs-content://manage-data/data-store/text-analysis/test-an-analyzer.md
-                title: Test an analyzer
-              - page: docs-content://manage-data/data-store/text-analysis/configuring-built-in-analyzers.md
-                title: Configuring built-in analyzers
-              - page: docs-content://manage-data/data-store/text-analysis/create-custom-analyzer.md
-                title: Create custom analyzer
-              - page: docs-content://manage-data/data-store/text-analysis/specify-an-analyzer.md
-                title: Specify an analyzer
-          - group: Templates
-            page: docs-content://manage-data/data-store/templates.md
-            children:
-            - page: docs-content://manage-data/data-store/templates/simulate-multi-component-templates.md
-              title: Simulate multi-component templates
-            - page: docs-content://manage-data/data-store/templates/ignore-missing-component-templates.md
-              title: Ignore missing component templates
-          - page: docs-content://manage-data/data-store/aliases.md
-            title: Aliases
-          - group: Perform index operations
-            page: docs-content://manage-data/data-store/perform-index-operations.md
-            children:
-            - page: docs-content://manage-data/data-store/index-operations-reference.md
-              title: Index operations reference
-          - page: docs-content://manage-data/data-store/manage-data-from-the-command-line.md
-            title: Manage data from the command line
-        - group: Data lifecycle
-          page: docs-content://manage-data/lifecycle.md
-          children:
-          - page: docs-content://manage-data/lifecycle/data-tiers.md
-            title: "Data tiers: hot warm cold frozen"
-          - group: Index lifecycle management (ILM)
-            page: docs-content://manage-data/lifecycle/index-lifecycle-management.md
-            children:
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/index-lifecycle.md
-              title: Index lifecycle
-            - group: Rollover
-              page: docs-content://manage-data/lifecycle/index-lifecycle-management/rollover.md
-              children:
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/skip-rollover.md
-                title: Skip rollover
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/configure-lifecycle-policy.md
-              title: Configure lifecycle policy
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-apply.md
-              title: Apply policy
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-view-status.md
-              title: View policy status
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/manage-lifecycle-integrations-data.md
-              title: Manage integrations data
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-updates.md
-              title: Policy updates
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/start-stop-index-lifecycle-management.md
-              title: Start and stop ILM
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/restore-managed-data-stream-index.md
-              title: Restore managed index
-            - group: ILM tutorials
-              page: docs-content://manage-data/lifecycle/index-lifecycle-management/ilm-tutorials.md
-              children:
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-time-series-with-data-streams.md
-                title: Time series with data streams
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-time-series-without-data-streams.md
-                title: Time series without data streams
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-general-content-with-data-streams.md
-                title: General content with data streams
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-customize-built-in-policies.md
-                title: Customize built-in policies
-            - group: Migrate ILM
-              page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-ilm.md
-              children:
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-index-management.md
-                title: Migrate index management
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/manage-existing-indices.md
-                title: Manage existing indices
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md
-                title: Migrate allocation filters to node roles
-          - group: Data stream lifecycle
-            page: docs-content://manage-data/lifecycle/data-stream.md
-            children:
-            - page: docs-content://manage-data/lifecycle/data-stream/tutorial-create-data-stream-with-lifecycle.md
-              title: "Tutorial: Create with lifecycle"
-            - page: docs-content://manage-data/lifecycle/data-stream/tutorial-update-existing-data-stream.md
-              title: "Tutorial: Update existing"
-            - page: docs-content://manage-data/lifecycle/data-stream/tutorial-data-stream-retention.md
-              title: "Tutorial: Retention"
-            - page: docs-content://manage-data/lifecycle/data-stream/tutorial-migrate-ilm-managed-data-stream-to-data-stream-lifecycle.md
-              title: "Tutorial: Migrate from ILM"
-          - page: docs-content://manage-data/lifecycle/curator.md
-            title: Elasticsearch Curator
-          - group: Rollup
-            page: docs-content://manage-data/lifecycle/rollup.md
-            children:
-            - page: docs-content://manage-data/lifecycle/rollup/getting-started-api.md
-              title: Getting started (API)
-            - page: docs-content://manage-data/lifecycle/rollup/getting-started-kibana.md
-              title: Getting started (Kibana)
-            - page: docs-content://manage-data/lifecycle/rollup/understanding-groups.md
-              title: Understanding groups
-            - page: docs-content://manage-data/lifecycle/rollup/rollup-aggregation-limitations.md
-              title: Aggregation limitations
-            - page: docs-content://manage-data/lifecycle/rollup/rollup-search-limitations.md
-              title: Search limitations
-            - page: docs-content://manage-data/lifecycle/rollup/migrating-from-rollup-to-downsampling.md
-              title: Migrating to downsampling
-        - page: docs-content://manage-data/use-case-use-elasticsearch-to-manage-time-series-data.md
-          title: "Use case: time series data management"
-      - group: Transform and enrich data
-        page: docs-content://manage-data/ingest/transform-enrich.md
-        children:
-        - group: Data pipelines
-          children:
-          - page: opentelemetry://reference/motlp/index.md
-            title: Managed pipelines (mOTLP)
-          - group: Elasticsearch ingest pipelines
-            page: docs-content://manage-data/ingest/transform-enrich/ingest-pipelines.md
-            children:
-            - page: docs-content://manage-data/ingest/transform-enrich/example-parse-logs.md
-              title: "Example: Parse logs"
-            - page: docs-content://manage-data/ingest/transform-enrich/readable-maintainable-ingest-pipelines.md
-              title: Readable maintainable pipelines
-            - page: docs-content://manage-data/ingest/transform-enrich/error-handling.md
-              title: Error handling
-          - page: docs-content://manage-data/ingest/transform-enrich/logstash-pipelines.md
-            title: Logstash pipelines
-        - group: Data enrichment
-          page: docs-content://manage-data/ingest/transform-enrich/data-enrichment.md
-          children:
-          - page: docs-content://manage-data/ingest/transform-enrich/set-up-an-enrich-processor.md
-            title: Set up an enrich processor
-          - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-based-on-geolocation.md
-            title: "Example: Enrich by geolocation"
-          - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-based-on-exact-values.md
-            title: "Example: Enrich by exact values"
-          - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-by-matching-value-to-range.md
-            title: "Example: Enrich by matching value to range"
-        - page: docs-content://manage-data/ingest/transform-enrich/index-mapping-text-analysis.md
-          title: Index mapping and text analysis
-        - page: docs-content://manage-data/ingest/transform-enrich/ingest-lag.md
-          title: Calculate ingest lag metadata
-    - label: Search, visualize and analyze
-      children:
-      - group: Search and query
-        children:
-        - group: Get started with search
-          children:
-          - title: APIs and tools for search
-        - group: Search strategies
-          children:
-          - title: Full-text search
-          - title: AI-powered search
-          - title: Hybrid search
-          - title: Ranking and reranking
-        - group: Build search queries with APIs and query languages and search templates
-          children:
-          - title: ES|QL
-          - title: Query DSL
-          - title: "..."
-        - group: Cross-project search
-          children:
-          - title: Link projects for cross-project search
-          - title: Using project routing to limit search scope
-          - title: How search works in CPS
-          - title: Using tags to control search
-        - title: Cross-cluster search
-        - title: Add search to your site or app
-        - group: Querying and filtering in Kibana
-          children:
-          - title: Filtering in Kibana
-          - title: Query languages
-          - title: Query tools
-      - group: Explore and visualize
-        page: docs-content://explore-analyze/explore-and-visualize.md
-        children:
-        - page: docs-content://explore-analyze/kibana-data-exploration-learning-tutorial.md
-          title: Learn data exploration and visualization
-        - group: Discover
-          page: docs-content://explore-analyze/discover.md
-          children:
-          - page: docs-content://explore-analyze/discover/discover-get-started.md
-            title: Explore fields and data with Discover
-          - page: docs-content://explore-analyze/discover/document-explorer.md
-            title: Customize the Discover view
-          - page: docs-content://explore-analyze/discover/discover-search-for-relevance.md
-            title: Search for relevance
-          - page: docs-content://explore-analyze/discover/save-open-search.md
-            title: Save a search for reuse
-          - page: docs-content://explore-analyze/discover/show-field-statistics.md
-            title: View field statistics
-          - page: docs-content://explore-analyze/discover/run-pattern-analysis-discover.md
-            title: Run a pattern analysis on your log data
-          - page: docs-content://explore-analyze/discover/background-search.md
-            title: Run queries in the background
-          - page: docs-content://explore-analyze/discover/try-esql.md
-            title: "Using ES|QL"
-        - group: Dashboards
-          page: docs-content://explore-analyze/dashboards.md
-          children:
-          - page: docs-content://explore-analyze/dashboards/using.md
-            title: Exploring dashboards
-          - group: Building dashboards
-            page: docs-content://explore-analyze/dashboards/building.md
-            children:
-            - page: docs-content://explore-analyze/dashboards/create-dashboard.md
-              title: Create a dashboard
-            - page: docs-content://explore-analyze/dashboards/open-dashboard.md
-              title: Edit a dashboard
-            - page: docs-content://explore-analyze/dashboards/add-controls.md
-              title: Add filter controls
-            - page: docs-content://explore-analyze/dashboards/drilldowns.md
-              title: Add drilldowns
-            - page: docs-content://explore-analyze/dashboards/arrange-panels.md
-              title: Organize dashboard panels
-            - page: docs-content://explore-analyze/dashboards/duplicate-dashboards.md
-              title: Duplicate a dashboard
-            - page: docs-content://explore-analyze/dashboards/import-dashboards.md
-              title: Import a dashboard
-          - page: docs-content://explore-analyze/dashboards/managing.md
-            title: Managing dashboards
-          - page: docs-content://explore-analyze/dashboards/sharing.md
-            title: Sharing dashboards
-          - group: Tutorials
-            page: docs-content://explore-analyze/dashboards/tutorials.md
-            children:
-            - page: docs-content://explore-analyze/dashboards/create-dashboard-of-panels-with-web-server-data.md
-              title: Create a simple dashboard to monitor website logs
-            - page: docs-content://explore-analyze/dashboards/create-dashboard-of-panels-with-ecommerce-data.md
-              title: Create a dashboard with time series charts
-        - group: Panels and visualizations
-          page: docs-content://explore-analyze/visualize.md
-          children:
-          - page: docs-content://explore-analyze/visualize/visualize-library.md
-            title: Visualize Library
-          - page: docs-content://explore-analyze/visualize/manage-panels.md
-            title: Manage panels
-          - group: Lens
-            page: docs-content://explore-analyze/visualize/lens.md
-            children:
-            - page: docs-content://explore-analyze/visualize/charts/area-charts.md
-              title: Area charts
-            - page: docs-content://explore-analyze/visualize/charts/bar-charts.md
-              title: Bar charts
-            - page: docs-content://explore-analyze/visualize/charts/heat-map-charts.md
-              title: Heat map charts
-            - page: docs-content://explore-analyze/visualize/charts/gauge-charts.md
-              title: Gauge charts
-            - page: docs-content://explore-analyze/visualize/charts/line-charts.md
-              title: Line charts
-            - page: docs-content://explore-analyze/visualize/charts/metric-charts.md
-              title: Metric charts
-            - page: docs-content://explore-analyze/visualize/charts/mosaic-charts.md
-              title: Mosaic charts
-            - page: docs-content://explore-analyze/visualize/charts/pie-charts.md
-              title: Pie charts
-            - page: docs-content://explore-analyze/visualize/charts/region-map-charts.md
-              title: Region map charts
-            - page: docs-content://explore-analyze/visualize/charts/tables.md
-              title: Tables
-            - page: docs-content://explore-analyze/visualize/charts/waffle-charts.md
-              title: Waffle charts
-            - page: docs-content://explore-analyze/visualize/charts/tag-cloud-charts.md
-              title: Tag cloud charts
-            - page: docs-content://explore-analyze/visualize/charts/treemap-charts.md
-              title: Treemap charts
-          - page: docs-content://explore-analyze/visualize/esorql.md
-            title: "ES|QL"
-          - page: docs-content://explore-analyze/visualize/custom-visualizations-with-vega.md
-            title: Custom visualizations with Vega
-          - page: docs-content://explore-analyze/visualize/text-panels.md
-            title: Text panels
-          - page: docs-content://explore-analyze/visualize/image-panels.md
-            title: Image panels
-          - page: docs-content://explore-analyze/visualize/link-panels.md
-            title: Link panels
-          - page: docs-content://explore-analyze/visualize/alert-panels.md
-            title: Alert panels
-          - group: Canvas
-            page: docs-content://explore-analyze/visualize/canvas.md
-            children:
-            - page: docs-content://explore-analyze/visualize/canvas/edit-workpads.md
-              title: Edit workpads
-            - page: docs-content://explore-analyze/visualize/canvas/canvas-present-workpad.md
-              title: Present your workpad
-            - page: docs-content://explore-analyze/visualize/canvas/canvas-tutorial.md
-              title: "Tutorial: Create a workpad for monitoring sales"
-            - group: Canvas function reference
-              page: docs-content://explore-analyze/visualize/canvas/canvas-function-reference.md
-              children:
-              - page: docs-content://explore-analyze/visualize/canvas/canvas-tinymath-functions.md
-                title: TinyMath functions
-          - group: Maps
-            page: docs-content://explore-analyze/visualize/maps.md
-            children:
-            - page: docs-content://explore-analyze/visualize/maps/maps-getting-started.md
-              title: Build a map to compare metrics by country or region
-            - page: docs-content://explore-analyze/visualize/maps/asset-tracking-tutorial.md
-              title: Track, visualize, and alert on assets in real time
-            - page: docs-content://explore-analyze/visualize/maps/reverse-geocoding-tutorial.md
-              title: Map custom regions with reverse geocoding
-            - page: docs-content://explore-analyze/visualize/maps/heatmap-layer.md
-              title: Heat map layer
-            - page: docs-content://explore-analyze/visualize/maps/tile-layer.md
-              title: Tile layer
-            - group: Vector layer
-              page: docs-content://explore-analyze/visualize/maps/vector-layer.md
-              children:
-              - page: docs-content://explore-analyze/visualize/maps/vector-style.md
-                title: Vector styling
-              - page: docs-content://explore-analyze/visualize/maps/maps-vector-style-properties.md
-                title: Vector style properties
-              - page: docs-content://explore-analyze/visualize/maps/vector-tooltip.md
-                title: Vector tooltips
-            - group: Map aggregations
-              page: docs-content://explore-analyze/visualize/maps/maps-aggregations.md
-              children:
-              - page: docs-content://explore-analyze/visualize/maps/maps-grid-aggregation.md
-                title: Clusters
-              - page: docs-content://explore-analyze/visualize/maps/maps-top-hits-aggregation.md
-                title: Display the most relevant documents per entity
-              - page: docs-content://explore-analyze/visualize/maps/point-to-point.md
-                title: Point to point
-              - page: docs-content://explore-analyze/visualize/maps/terms-join.md
-                title: Term join
-            - group: Search and filter maps
-              page: docs-content://explore-analyze/visualize/maps/maps-search.md
-              children:
-              - page: docs-content://explore-analyze/visualize/maps/maps-create-filter-from-map.md
-                title: Create filters from a map
-              - page: docs-content://explore-analyze/visualize/maps/maps-layer-based-filtering.md
-                title: Filter a single layer
-              - page: docs-content://explore-analyze/visualize/maps/maps-search-across-multiple-indices.md
-                title: Search across multiple indices
-            - page: docs-content://explore-analyze/visualize/maps/maps-settings.md
-              title: Configure map settings
-            - page: docs-content://explore-analyze/visualize/maps/maps-connect-to-ems.md
-              title: Connect to Elastic Maps Service
-            - group: Import geospatial data
-              page: docs-content://explore-analyze/visualize/maps/import-geospatial-data.md
-              children:
-              - page: docs-content://explore-analyze/visualize/maps/maps-clean-data.md
-                title: Clean your data
-              - page: docs-content://explore-analyze/visualize/maps/indexing-geojson-data-tutorial.md
-                title: "Tutorial: Index GeoJSON data"
-            - page: docs-content://explore-analyze/visualize/maps/maps-troubleshooting.md
-              title: Troubleshoot
-          - group: Graph
-            page: docs-content://explore-analyze/visualize/graph.md
-            children:
-            - page: docs-content://explore-analyze/visualize/graph/graph-configuration.md
-              title: Configure Graph
-            - page: docs-content://explore-analyze/visualize/graph/graph-troubleshooting.md
-              title: Troubleshooting and limitations
-          - group: Legacy editors
-            page: docs-content://explore-analyze/visualize/legacy-editors.md
-            children:
-            - page: docs-content://explore-analyze/visualize/legacy-editors/aggregation-based.md
-              title: Aggregation-based
-            - page: docs-content://explore-analyze/visualize/legacy-editors/tsvb.md
-              title: TSVB
-            - page: docs-content://explore-analyze/visualize/legacy-editors/timelion.md
-              title: Timelion
-        - group: Find and organize content
-          page: docs-content://explore-analyze/find-and-organize.md
-          children:
-          - page: docs-content://explore-analyze/find-and-organize/data-views.md
-            title: Data views
-          - page: docs-content://explore-analyze/find-and-organize/saved-objects.md
-            title: Saved objects
-          - page: docs-content://explore-analyze/find-and-organize/files.md
-            title: Files
-          - page: docs-content://explore-analyze/find-and-organize/reports.md
-            title: Reports
-          - page: docs-content://explore-analyze/find-and-organize/tags.md
-            title: Tags
-          - page: docs-content://explore-analyze/find-and-organize/find-apps-and-objects.md
-            title: Find apps and objects
-      - group: Track and respond
-        page: docs-content://explore-analyze/track-and-respond.md
-        children:
-        - group: Reporting and sharing
-          page: docs-content://explore-analyze/report-and-share.md
-          children:
-          - page: docs-content://explore-analyze/report-and-share/automating-report-generation.md
-            title: Automatically generate reports
-          - group: Reporting troubleshooting
-            page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting.md
-            children:
-            - page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting-csv.md
-              title: CSV
-            - page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting-pdf.md
-              title: PDF/PNG
-        - group: Alerting
-          page: docs-content://explore-analyze/alerting.md
+              title: Default `logs` index template
+        - page: docs-content://solutions/observability/streams/streams.md
+          title: Streams
+        - page: docs-content://solutions/observability/streams/management/retention.md
+          title: Manage data retention
+        - group: Process documents
+          page: docs-content://solutions/observability/streams/management/extract.md
+          children:
+          - page: docs-content://solutions/observability/streams/management/extract/drop.md
+            title: Drop document processor
+          - page: docs-content://solutions/observability/streams/management/extract/remove.md
+            title: Remove processor
+          - page: docs-content://solutions/observability/streams/management/extract/date.md
+            title: Date processor
+          - page: docs-content://solutions/observability/streams/management/extract/convert.md
+            title: Convert processor
+          - page: docs-content://solutions/observability/streams/management/extract/replace.md
+            title: Replace processor
+          - page: docs-content://solutions/observability/streams/management/extract/dissect.md
+            title: Dissect processor
+          - page: docs-content://solutions/observability/streams/management/extract/grok.md
+            title: Grok processor
+          - page: docs-content://solutions/observability/streams/management/extract/set.md
+            title: Set processor
+          - page: docs-content://solutions/observability/streams/management/extract/math.md
+            title: Math processor
+          - page: docs-content://solutions/observability/streams/management/extract/rename.md
+            title: Rename processor
+          - page: docs-content://solutions/observability/streams/management/extract/append.md
+            title: Append processor
+          - page: docs-content://solutions/observability/streams/management/extract/manual-pipeline-configuration.md
+            title: Manual pipeline configuration
+        - page: docs-content://solutions/observability/streams/management/partitioning.md
+          title: Partition data into child streams
+        - page: docs-content://solutions/observability/streams/management/schema.md
+          title: Map fields
+        - page: docs-content://solutions/observability/streams/management/data-quality.md
+          title: Manage data quality
+        - page: docs-content://solutions/observability/streams/management/advanced.md
+          title: Configure advanced settings
+        - page: docs-content://solutions/observability/streams/wired-streams.md
+          title: Wired streams
+        - group: Incident management
+          page: docs-content://solutions/observability/incident-management.md
           children:
-          - group: Alerts
-            page: docs-content://explore-analyze/alerting/alerts.md
-            children:
-            - page: docs-content://explore-analyze/alerting/alerts/alerting-getting-started.md
-              title: Getting started with alerts
-            - page: docs-content://explore-analyze/alerting/alerts/alerting-setup.md
-              title: Set up
-            - page: docs-content://explore-analyze/alerting/alerts/create-manage-rules.md
-              title: Create and manage rules
-            - page: docs-content://explore-analyze/alerting/alerts/view-alerts.md
-              title: View and manage alerts
-            - page: docs-content://explore-analyze/alerting/alerts/query-alerts.md
-              title: Query alert indices
-            - group: Rule types
-              page: docs-content://explore-analyze/alerting/alerts/rule-types.md
+          - group: Alerting
+            page: docs-content://solutions/observability/incident-management/alerting.md
+            children:
+            - group: Create and manage rules
+              page: docs-content://solutions/observability/incident-management/create-manage-rules.md
               children:
-              - page: docs-content://explore-analyze/alerting/alerts/rule-type-index-threshold.md
-                title: Index threshold
-              - page: docs-content://explore-analyze/alerting/alerts/rule-type-es-query.md
+              - page: docs-content://solutions/observability/incident-management/create-an-anomaly-detection-rule.md
+                title: Anomaly detection
+              - page: docs-content://solutions/observability/incident-management/create-an-apm-anomaly-rule.md
+                title: APM anomaly
+              - page: docs-content://solutions/observability/incident-management/create-custom-threshold-rule.md
+                title: Custom threshold
+              - page: docs-content://solutions/observability/incident-management/create-a-degraded-docs-rule.md
+                title: Degraded docs
+              - page: docs-content://solutions/observability/incident-management/create-an-elasticsearch-query-rule.md
                 title: Elasticsearch query
-              - page: docs-content://explore-analyze/alerting/alerts/geo-alerting.md
-                title: Tracking containment
-            - page: docs-content://explore-analyze/alerting/alerts/rule-action-variables.md
-              title: Rule action variables
-            - page: docs-content://explore-analyze/alerting/alerts/notifications-domain-allowlist.md
-              title: Notifications domain allowlist
-            - group: Alerting troubleshooting
-              page: docs-content://explore-analyze/alerting/alerts/alerting-troubleshooting.md
-              children:
-              - page: docs-content://explore-analyze/alerting/alerts/alerting-common-issues.md
-                title: Common issues
-              - page: docs-content://explore-analyze/alerting/alerts/event-log-index.md
-                title: Event log index
-              - page: docs-content://explore-analyze/alerting/alerts/testing-connectors.md
-                title: Test connectors
-            - page: docs-content://explore-analyze/alerting/alerts/maintenance-windows.md
-              title: Maintenance windows
-          - group: Watcher
-            page: docs-content://explore-analyze/alerting/watcher.md
-            children:
-            - page: docs-content://explore-analyze/alerting/watcher/watcher-getting-started.md
-              title: Getting started with Watcher
-            - page: docs-content://explore-analyze/alerting/watcher/how-watcher-works.md
-              title: How Watcher works
-            - page: docs-content://explore-analyze/alerting/watcher/enable-watcher.md
-              title: Enable Watcher
-            - page: docs-content://explore-analyze/alerting/watcher/watcher-ui.md
-              title: Watcher UI
-            - page: docs-content://explore-analyze/alerting/watcher/encrypting-data.md
-              title: Encrypting sensitive data in Watcher
-            - group: Input
-              page: docs-content://explore-analyze/alerting/watcher/input.md
-              children:
-              - page: docs-content://explore-analyze/alerting/watcher/input-simple.md
-                title: Simple input
-              - page: docs-content://explore-analyze/alerting/watcher/input-search.md
-                title: Search input
-              - page: docs-content://explore-analyze/alerting/watcher/input-http.md
-                title: HTTP input
-              - page: docs-content://explore-analyze/alerting/watcher/input-chain.md
-                title: Chain input
-            - group: Trigger
-              page: docs-content://explore-analyze/alerting/watcher/trigger.md
-              children:
-              - page: docs-content://explore-analyze/alerting/watcher/trigger-schedule.md
-                title: Schedule trigger
-              - page: docs-content://explore-analyze/alerting/watcher/throttling.md
-                title: Throttling
-              - page: docs-content://explore-analyze/alerting/watcher/schedule-types.md
-                title: Schedule Types
-            - group: Condition
-              page: docs-content://explore-analyze/alerting/watcher/condition.md
-              children:
-              - page: docs-content://explore-analyze/alerting/watcher/condition-always.md
-                title: Always condition
-              - page: docs-content://explore-analyze/alerting/watcher/condition-never.md
-                title: Never condition
-              - page: docs-content://explore-analyze/alerting/watcher/condition-compare.md
-                title: Compare condition
-              - page: docs-content://explore-analyze/alerting/watcher/condition-array-compare.md
-                title: Array compare condition
-              - page: docs-content://explore-analyze/alerting/watcher/condition-script.md
-                title: Script condition
-            - group: Actions
-              page: docs-content://explore-analyze/alerting/watcher/actions.md
-              children:
-              - page: docs-content://explore-analyze/alerting/watcher/action-foreach.md
-                title: Running an action for each element in an array
-              - page: docs-content://explore-analyze/alerting/watcher/action-conditions.md
-                title: Adding conditions to actions
-              - page: docs-content://explore-analyze/alerting/watcher/actions-email.md
-                title: Email action
-              - page: docs-content://explore-analyze/alerting/watcher/actions-webhook.md
-                title: Webhook action
-              - page: docs-content://explore-analyze/alerting/watcher/actions-index.md
-                title: Index action
-              - page: docs-content://explore-analyze/alerting/watcher/actions-logging.md
-                title: Logging action
-              - page: docs-content://explore-analyze/alerting/watcher/actions-slack.md
-                title: Slack action
-              - page: docs-content://explore-analyze/alerting/watcher/actions-pagerduty.md
-                title: PagerDuty action
-              - page: docs-content://explore-analyze/alerting/watcher/actions-jira.md
-                title: Jira action
-            - group: Transform
-              page: docs-content://explore-analyze/alerting/watcher/transform.md
-              children:
-              - page: docs-content://explore-analyze/alerting/watcher/transform-search.md
-                title: Search payload transform
-              - page: docs-content://explore-analyze/alerting/watcher/transform-script.md
-                title: Script payload transform
-              - page: docs-content://explore-analyze/alerting/watcher/transform-chain.md
-                title: Chain payload transform
-            - page: docs-content://explore-analyze/alerting/watcher/managing-watches.md
-              title: Managing watches
-            - group: Example watches
-              page: docs-content://explore-analyze/alerting/watcher/example-watches.md
-              children:
-              - page: docs-content://explore-analyze/alerting/watcher/watch-cluster-status.md
-                title: Watching the status of an Elasticsearch cluster
-              - page: docs-content://explore-analyze/alerting/watcher/execute-watch.md
-                title: Execute a watch
-            - page: docs-content://explore-analyze/alerting/watcher/watcher-limitations.md
-              title: Limitations
-        - group: Cases
-          page: docs-content://explore-analyze/cases.md
-          children:
-          - page: docs-content://explore-analyze/cases/control-case-access.md
-            title: Control access
-          - page: docs-content://explore-analyze/cases/create-cases.md
-            title: Create cases
-          - page: docs-content://explore-analyze/cases/manage-cases.md
-            title: Manage cases
-          - page: docs-content://explore-analyze/cases/attach-objects-to-cases.md
-            title: Attach objects
-          - page: docs-content://explore-analyze/cases/search-share-cases.md
-            title: Search and share
-          - page: docs-content://explore-analyze/cases/configure-case-settings.md
-            title: Configure settings
-          - page: docs-content://explore-analyze/cases/cases-as-data.md
-            title: Cases as data
-    - label: Automate
-      children:
-      - group: Workflows
-        page: docs-content://explore-analyze/workflows.md
-        children:
-        - page: docs-content://explore-analyze/workflows/setup.md
-          title: Set up workflows
-        - page: docs-content://explore-analyze/workflows/get-started.md
-          title: Get started with workflows
-        - group: Core components
-          page: docs-content://explore-analyze/workflows/core-components.md
-          children:
-          - group: Triggers
-            page: docs-content://explore-analyze/workflows/triggers.md
-            children:
-            - page: docs-content://explore-analyze/workflows/triggers/manual-triggers.md
-              title: Manual triggers
-            - page: docs-content://explore-analyze/workflows/triggers/scheduled-triggers.md
-              title: Scheduled triggers
-            - page: docs-content://explore-analyze/workflows/triggers/alert-triggers.md
-              title: Alert triggers
-          - group: Steps
-            page: docs-content://explore-analyze/workflows/steps.md
-            children:
-            - group: Action steps
-              page: docs-content://explore-analyze/workflows/steps/action-steps.md
-              children:
-              - page: docs-content://explore-analyze/workflows/steps/elasticsearch.md
-                title: Elasticsearch
-              - page: docs-content://explore-analyze/workflows/steps/kibana.md
-                title: Kibana
-              - page: docs-content://explore-analyze/workflows/steps/external-systems-apps.md
-                title: External systems and apps
-            - group: Flow control steps
-              page: docs-content://explore-analyze/workflows/steps/flow-control-steps.md
-              children:
-              - page: docs-content://explore-analyze/workflows/steps/if.md
-                title: If
-              - page: docs-content://explore-analyze/workflows/steps/foreach.md
-                title: Foreach
-              - page: docs-content://explore-analyze/workflows/steps/wait.md
-                title: Wait
-            - page: docs-content://explore-analyze/workflows/steps/ai-steps.md
-              title: AI steps
-        - group: Data and error handling
-          page: docs-content://explore-analyze/workflows/data.md
-          children:
-          - page: docs-content://explore-analyze/workflows/data/templating.md
-            title: Templating engine
-        - page: docs-content://explore-analyze/workflows/author-workflows.md
-          title: Author workflows
-        - page: docs-content://explore-analyze/workflows/monitor-troubleshoot.md
-          title: Monitor and troubleshoot workflows
-        - page: docs-content://explore-analyze/workflows/manage-workflows.md
-          title: Manage workflows
-        - page: docs-content://explore-analyze/workflows/templates.md
-          title: Workflow templates
-    - label: AI and machine learning
-      children:
-      - group: Machine Learning and NLP
-        page: docs-content://explore-analyze/machine-learning.md
-        children:
-        - page: docs-content://explore-analyze/machine-learning/setting-up-machine-learning.md
-          title: Setup and security
-        - group: Anomaly detection
-          page: docs-content://explore-analyze/machine-learning/anomaly-detection.md
-          children:
-          - group: Finding anomalies
-            page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-finding-anomalies.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-plan.md
-              title: Plan your analysis
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-run-jobs.md
-              title: Run a job
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-view-results.md
-              title: View the results
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-forecast.md
-              title: Forecast future behavior
-          - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-getting-started.md
-            title: Tutorial
-          - group: Concepts
-            page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-concepts.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-algorithms.md
-              title: Anomaly detection algorithms
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-explain.md
-              title: Anomaly score explanation
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-anomaly-detection-job-types.md
-              title: Job types
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/anomaly-detection-scale.md
-              title: Working with anomaly detection at scale
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-delayed-data-detection.md
-              title: Handling delayed data
-          - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-api-quickref.md
-            title: API quick reference
-          - group: How-tos
-            page: docs-content://explore-analyze/machine-learning/anomaly-detection/anomaly-how-tos.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-alerts.md
-              title: Generating alerts for anomaly detection jobs
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-aggregation.md
-              title: Aggregating data for faster performance
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-transform.md
-              title: Altering data in your datafeed with runtime fields
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-detector-custom-rules.md
-              title: Customizing detectors with custom rules
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-categories.md
-              title: Detecting anomalous categories of data
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-populations.md
-              title: Performing population analysis
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-reverting-model-snapshot.md
-              title: Reverting to a model snapshot
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/geographic-anomalies.md
-              title: Detecting anomalous locations in geographic data
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/mapping-anomalies.md
-              title: Mapping anomalies by location
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-url.md
-              title: Adding custom URLs to machine learning results
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-jobs-from-lens.md
-              title: Anomaly detection jobs from visualizations
-          - group: Resources
-            page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-resources.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-limitations.md
-              title: Limitations
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-functions.md
-              title: Analysis function reference
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ootb-ml-jobs.md
-              title: Supplied configurations
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-troubleshooting.md
-              title: Troubleshooting and FAQ
-        - group: Data frame analytics
-          page: docs-content://explore-analyze/machine-learning/data-frame-analytics.md
-          children:
-          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-overview.md
-            title: Overview
-          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-finding-outliers.md
-            title: Finding outliers
-          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-regression.md
-            title: Predicting numerical values with regression
-          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-classification.md
-            title: Predicting classes with classification
-          - group: Concepts
-            page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-concepts.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-phases.md
-              title: How data frame analytics jobs work
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-scale.md
-              title: Working with data frame analytics at scale
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-custom-urls.md
-              title: Adding custom URLs to data frame analytics jobs
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-encoding.md
-              title: Feature encoding
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-processors.md
-              title: Feature processors
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-importance.md
-              title: Feature importance
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/dfa-regression-lossfunction.md
-              title: Loss functions for regression analyses
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/hyperparameters.md
-              title: Hyperparameter optimization
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-trained-models.md
-              title: Trained models
-          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfanalytics-apis.md
-            title: API quick reference
-          - group: Resources
-            page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-resources.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-limitations.md
-              title: Limitations
-        - group: NLP
-          page: docs-content://explore-analyze/machine-learning/nlp.md
-          children:
-          - group: Overview
-            page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-overview.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-extract-info.md
-              title: Extract information
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-classify-text.md
-              title: Classify text
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-search-compare.md
-              title: Search and compare text
-          - group: Deploy models
-            page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-deploy-models.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-select-model.md
-              title: Select a trained model
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-import-model.md
-              title: Import the trained model and vocabulary
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-deploy-model.md
-              title: Deploy the model in your cluster
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-test-inference.md
-              title: Try it out
-          - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-inference.md
-            title: Add NLP inference to ingest pipelines
-          - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-apis.md
-            title: API quick reference
-          - group: Built-in models
-            page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-built-in-models.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-elser.md
-              title: ELSER
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-jina.md
-              title: Jina
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-rerank.md
-              title: Elastic Rerank
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-e5.md
-              title: E5
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-lang-ident.md
-              title: Language identification
-          - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-model-ref.md
-            title: Compatible third party models
-          - group: Examples
-            page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-examples.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/nlp/nlp-end-to-end-tutorial.md
-              title: End-to-end tutorial
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-ner-example.md
-              title: Named entity recognition
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-text-emb-vector-search-example.md
-              title: Text embedding and semantic search
-          - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-limitations.md
-            title: Limitations
-        - group: Machine learning in Kibana
-          page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana.md
-          children:
-          - page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-aiops.md
-            title: AIOps Labs
-          - page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana/inference-processing.md
-            title: Inference processing
-      - group: Agent builder
-        page: docs-content://explore-analyze/ai-features/elastic-agent-builder.md
-        children:
-        - page: docs-content://explore-analyze/ai-features/agent-builder/get-started.md
-          title: Get started
-        - page: docs-content://explore-analyze/ai-features/agent-builder/models.md
-          title: Models
-        - group: Chat
-          page: docs-content://explore-analyze/ai-features/agent-builder/chat.md
-          children:
-          - page: docs-content://explore-analyze/ai-features/agent-builder/standalone-and-flyout-modes.md
-            title: Chat UI modes
-        - group: Agents
-          page: docs-content://explore-analyze/ai-features/agent-builder/agent-builder-agents.md
-          children:
-          - page: docs-content://explore-analyze/ai-features/agent-builder/custom-agents.md
-            title: Custom agents
-          - page: docs-content://explore-analyze/ai-features/agent-builder/builtin-agents-reference.md
-            title: Built-in agents
-          - page: docs-content://explore-analyze/ai-features/agent-builder/prompt-engineering.md
-            title: Prompting best practices
-          - page: docs-content://explore-analyze/ai-features/agent-builder/agents-and-workflows.md
-            title: Call agents from workflows
-        - group: Tools
-          page: docs-content://explore-analyze/ai-features/agent-builder/tools.md
-          children:
-          - page: docs-content://explore-analyze/ai-features/agent-builder/tools/builtin-tools-reference.md
-            title: Built-in tools
-          - group: Custom tools
-            page: docs-content://explore-analyze/ai-features/agent-builder/tools/custom-tools.md
-            children:
-            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/esql-tools.md
-              title: "ES|QL tools"
-            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/index-search-tools.md
-              title: Index search tools
-            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/mcp-tools.md
-              title: MCP tools
-            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/workflow-tools.md
-              title: Workflow tools
-        - group: Programmatic access
-          page: docs-content://explore-analyze/ai-features/agent-builder/programmatic-access.md
-          children:
-          - group: Kibana API
-            page: docs-content://explore-analyze/ai-features/agent-builder/kibana-api.md
-            children:
-            - page: docs-content://explore-analyze/ai-features/agent-builder/agent-builder-api-tutorial.md
-              title: Kibana API tutorial
-          - page: docs-content://explore-analyze/ai-features/agent-builder/a2a-server.md
-            title: A2A server
-          - page: docs-content://explore-analyze/ai-features/agent-builder/mcp-server.md
-            title: MCP server
-        - page: docs-content://explore-analyze/ai-features/agent-builder/monitor-usage.md
-          title: Monitor token usage
-        - page: docs-content://explore-analyze/ai-features/agent-builder/permissions.md
-          title: Permissions
-        - group: Troubleshooting
-          page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting.md
-          children:
-          - page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting/context-length-exceeded.md
-            title: Context length exceeded
-          - page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting/api-calls-return-403-forbidden.md
-            title: 403 Forbidden
-        - page: docs-content://explore-analyze/ai-features/agent-builder/limitations-known-issues.md
-          title: Limitations
-      - group: Elastic Inference Service
-        page: docs-content://explore-analyze/elastic-inference.md
-        children:
-        - group: Elastic Inference Service
-          page: docs-content://explore-analyze/elastic-inference/eis.md
-          children:
-          - page: docs-content://explore-analyze/elastic-inference/connect-self-managed-cluster-to-eis.md
-            title: EIS for self-managed clusters
-        - page: docs-content://explore-analyze/elastic-inference/inference-api.md
-          title: Inference integrations
-      - group: AI chat and LLM configuration
-        page: docs-content://explore-analyze/ai-features.md
-        children:
-        - group: AI chat experiences
-          page: docs-content://explore-analyze/ai-features/ai-chat-experiences.md
-          children:
-          - page: docs-content://explore-analyze/ai-features/ai-chat-experiences/ai-agent-or-ai-assistant.md
-            title: Compare Agent Builder and AI Assistant
-          - page: docs-content://explore-analyze/ai-features/ai-chat-experiences/ai-assistant.md
-            title: AI assistants
-        - group: LLM providers
-          page: docs-content://explore-analyze/ai-features/llm-guides/llm-connectors.md
-          children:
-          - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-azure-openai.md
-            title: Connect to Azure OpenAI
-          - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-amazon-bedrock.md
-            title: Connect to Amazon Bedrock
-          - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-openai.md
-            title: Connect to OpenAI
-          - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-google-vertex.md
-            title: Connect to Google Vertex
-          - group: Local LLMs
-            page: docs-content://explore-analyze/ai-features/llm-guides/local-llms-overview.md
-            children:
-            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-lmstudio-observability.md
-              title: Connect to LM Studio for Observability
-            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-lmstudio-security.md
-              title: Connect to LM Studio for Elastic Security
-            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-vLLM.md
-              title: Connect to vLLM for Elastic Security
-        - page: docs-content://explore-analyze/ai-features/manage-access-to-ai-assistant.md
-          title: Manage access to AI features
-      - page: docs-content://explore-analyze/ai-features/agent-skills.md
-        title: AI agent skills for Elastic
-  - section: Solutions and project types
-    url: /solutions/
-    children:
-    - page: docs-content://solutions/index.md
-      title: Solutions overview
-    - group: Elasticsearch solution
-      page: docs-content://solutions/elasticsearch-solution-project.md
-      children:
-      - group: Get started
-        page: docs-content://solutions/elasticsearch-solution-project/get-started.md
-        children:
-        - page: docs-content://solutions/elasticsearch-solution-project/search-connection-details.md
-          title: Find connection details
-      - group: Playground
-        page: docs-content://solutions/elasticsearch-solution-project/playground.md
-        children:
-        - page: docs-content://solutions/elasticsearch-solution-project/playground-context.md
-          title: Optimize model context
-        - page: docs-content://solutions/elasticsearch-solution-project/playground-query.md
-          title: View and modify queries
-        - page: docs-content://solutions/elasticsearch-solution-project/playground-troubleshooting.md
-          title: Troubleshooting
-      - page: docs-content://solutions/elasticsearch-solution-project/ai-assistant.md
-        title: AI Assistant
-      - page: docs-content://solutions/elasticsearch-solution-project/query-rules-ui.md
-        title: Query rules UI
-      - group: Search Applications
-        page: docs-content://solutions/elasticsearch-solution-project/search-applications.md
-        children:
-        - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-api.md
-          title: Search API and templates
-        - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-security.md
-          title: Security
-        - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-client.md
-          title: Search Application client guide
-      - page: docs-content://solutions/elasticsearch-solution-project/es-serverless-add-ons.md
-        title: Add-ons
-    - group: Observability solution
-      page: docs-content://solutions/observability.md
-      children:
-      - group: Get started
-        page: docs-content://solutions/observability/get-started.md
-        children:
-        - group: Elastic Observability quickstarts
-          page: docs-content://solutions/observability/get-started/quickstarts.md
-          children:
-          - page: docs-content://solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md
-            title: "Quickstart: Monitor hosts with OpenTelemetry"
-          - page: docs-content://solutions/observability/get-started/quickstart-monitor-your-application-performance.md
-            title: "Quickstart: Monitor your application performance"
-          - page: docs-content://solutions/observability/get-started/quickstart-unified-kubernetes-observability-with-elastic-distributions-of-opentelemetry-edot.md
-            title: "Quickstart: Unified Kubernetes Observability with Elastic Distributions of OpenTelemetry (EDOT)"
-          - page: docs-content://solutions/observability/get-started/quickstart-elastic-cloud-otel-endpoint.md
-            title: "Quickstart: Send OTLP data to Elastic Serverless or Elastic Cloud Hosted"
-          - page: docs-content://solutions/observability/get-started/quickstart-create-synthetic-monitor.md
-            title: "Quickstart: Create a Synthetic Monitor"
-          - page: docs-content://solutions/observability/get-started/quickstart-monitor-hosts-with-elastic-agent.md
-            title: "Quickstart: Monitor hosts with Elastic Agent"
-          - page: docs-content://solutions/observability/get-started/quickstart-monitor-kubernetes-cluster-with-elastic-agent.md
-            title: "Quickstart: Monitor your Kubernetes cluster with Elastic Agent"
-          - page: docs-content://solutions/observability/get-started/quickstart-collect-data-with-aws-firehose.md
-            title: "Quickstart: Collect data with AWS Firehose"
-        - group: OpenTelemetry quickstarts
-          page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/index.md
-          children:
-          - page: docs-content://solutions/observability/get-started/opentelemetry/custom-metrics-quickstart.md
-            title: Ingest custom metrics with EDOT
-          - group: Self-managed
-            page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/index.md
-            children:
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/k8s.md
-              title: Kubernetes
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/hosts_vms.md
-              title: Hosts / VMs
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/docker.md
-              title: Docker
-          - group: Elastic Cloud Serverless
-            page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/index.md
-            children:
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/k8s.md
-              title: Kubernetes
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/hosts_vms.md
-              title: Hosts and VMs
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/docker.md
-              title: Docker
-          - group: Elastic Cloud Hosted
-            page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/index.md
-            children:
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/k8s.md
-              title: Kubernetes
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/hosts_vms.md
-              title: Hosts and VMs
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/docker.md
-              title: Docker
-        - group: OpenTelemetry use cases
-          page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/index.md
-          children:
-          - group: Kubernetes observability
-            page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/index.md
-            children:
-            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/prerequisites-compatibility.md
-              title: Prerequisites and compatibility
-            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/components.md
-              title: Components description
-            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/deployment.md
-              title: Deployment
-            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/instrumenting-applications.md
-              title: Instrumenting Applications
-            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/upgrade.md
-              title: Upgrade
-            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/customization.md
-              title: Customization
-        - group: Other Observability tutorials
-          page: docs-content://solutions/observability/get-started/other-tutorials/index.md
-          children:
-          - page: docs-content://solutions/observability/get-started/other-tutorials/tutorial-monitor-java-application.md
-            title: "Tutorial: Monitor a Java application"
-        - page: docs-content://solutions/observability/get-started/logs-essentials.md
-          title: Logs Essentials
-      - group: Applications and services
-        page: docs-content://solutions/observability/applications/index.md
-        children:
-        - group: Application performance monitoring (APM)
-          page: docs-content://solutions/observability/apm/index.md
-          children:
-          - page: docs-content://solutions/observability/apm/get-started.md
-            title: Get started with traces and APM
-          - group: Application data types
-            page: docs-content://solutions/observability/apm/data-types.md
-            children:
-            - page: docs-content://solutions/observability/apm/spans.md
-              title: Spans
-            - group: Transactions
-              page: docs-content://solutions/observability/apm/transactions.md
-              children:
-              - page: docs-content://solutions/observability/apm/transaction-sampling.md
-                title: Transaction sampling
-            - page: docs-content://solutions/observability/apm/traces.md
-              title: Traces
-            - page: docs-content://solutions/observability/apm/errors.md
-              title: Errors
-            - page: docs-content://solutions/observability/apm/metrics.md
-              title: Metrics
-            - page: docs-content://solutions/observability/apm/metadata.md
-              title: Metadata
-          - group: Collect application data
-            page: docs-content://solutions/observability/apm/ingest/index.md
-            children:
-            - group: OpenTelemetry
-              page: docs-content://solutions/observability/apm/opentelemetry/index.md
-              children:
-              - page: docs-content://solutions/observability/apm/opentelemetry/upstream-opentelemetry-collectors-language-sdks.md
-                title: Contrib OpenTelemetry Collectors and language SDKs
-              - page: docs-content://solutions/observability/apm/opentelemetry/collect-metrics.md
-                title: Collect metrics
-              - page: docs-content://solutions/observability/apm/opentelemetry/create-apm-agent-key-for-edot-sdks.md
-                title: Create APM agent key for EDOT SDKs
-              - page: docs-content://solutions/observability/apm/opentelemetry/edot-sdks-central-configuration.md
-                title: Centrally configure EDOT SDKs
-              - page: docs-content://solutions/observability/apm/opentelemetry/limitations.md
-                title: Limitations
-              - page: docs-content://solutions/observability/apm/opentelemetry/attributes.md
-                title: Attributes and labels
-              - page: docs-content://solutions/observability/apm/opentelemetry/data-stream-routing.md
-                title: Data stream routing
-            - group: APM agents
-              page: docs-content://solutions/observability/apm/apm-agents/index.md
-              children:
-              - page: docs-content://solutions/observability/apm/apm-agents/central-configuration.md
-                title: Centrally configure APM agents
-              - page: docs-content://solutions/observability/apm/apm-agents/real-user-monitoring-rum.md
-                title: Real User Monitoring (RUM)
-              - page: docs-content://solutions/observability/apm/apm-agents/create-upload-source-maps-rum.md
-                title: Create and upload source maps (RUM)
-            - page: docs-content://solutions/observability/apm/ingest/apm-k8s-attacher.md
-              title: Kubernetes
-            - page: docs-content://solutions/observability/apm/ingest/monitor-aws-lambda-functions.md
-              title: AWS Lambda Functions
-            - page: docs-content://solutions/observability/apm/ingest/jaeger.md
-              title: Jaeger (deprecated)
-          - group: View and analyze data
-            page: docs-content://solutions/observability/apm/view-analyze-data.md
-            children:
-            - group: Overviews
-              page: docs-content://solutions/observability/apm/overviews.md
-              children:
-              - page: docs-content://solutions/observability/apm/services.md
-                title: Services
-              - page: docs-content://solutions/observability/apm/traces-ui.md
-                title: Traces UI
-              - page: docs-content://solutions/observability/apm/dependencies.md
-                title: Dependencies
-              - page: docs-content://solutions/observability/apm/service-map.md
-                title: Service Map
-              - page: docs-content://solutions/observability/apm/service-overview.md
-                title: Service overview
-              - page: docs-content://solutions/observability/apm/mobile-service-overview.md
-                title: Mobile service overview
-            - group: Drill down into data
-              page: docs-content://solutions/observability/apm/drill-down-into-data.md
-              children:
-              - page: docs-content://solutions/observability/apm/transactions-ui.md
-                title: Transactions UI
-              - page: docs-content://solutions/observability/apm/trace-sample-timeline.md
-                title: Trace sample timeline
-              - page: docs-content://solutions/observability/apm/errors-ui.md
-                title: Errors UI
-              - page: docs-content://solutions/observability/apm/metrics-ui.md
-                title: Metrics UI
-              - page: docs-content://solutions/observability/apm/infrastructure.md
-                title: Infrastructure
-              - page: docs-content://solutions/observability/apm/logs.md
-                title: Logs
-            - group: Filter and search data
-              page: docs-content://solutions/observability/apm/filter-search-data.md
-              children:
-              - page: docs-content://solutions/observability/apm/filter-data.md
-                title: Filters
-              - page: docs-content://solutions/observability/apm/advanced-queries.md
-                title: Advanced queries
-              - page: docs-content://solutions/observability/apm/cross-cluster-search.md
-                title: Cross-cluster search
-            - group: Interpret data
-              page: docs-content://solutions/observability/apm/interpret-data.md
-              children:
-              - page: docs-content://solutions/observability/apm/find-transaction-latency-failure-correlations.md
-                title: Find transaction latency and failure correlations
-              - page: docs-content://solutions/observability/apm/track-deployments-with-annotations.md
-                title: Track deployments with annotations
-              - page: docs-content://solutions/observability/apm/explore-mobile-sessions.md
-                title: Explore mobile sessions with Discover
-              - page: docs-content://solutions/observability/apm/observe-lambda-functions.md
-                title: Observe Lambda functions
-            - page: docs-content://solutions/observability/apm/machine-learning.md
-              title: Integrate with machine learning
-            - page: docs-content://solutions/observability/apm/apm-agent-explorer.md
-              title: APM Agent explorer
-            - page: docs-content://solutions/observability/apm/applications-ui-settings.md
-              title: Settings
-          - group: Act on data
-            page: docs-content://solutions/observability/apm/act-on-data.md
-            children:
-            - page: docs-content://solutions/observability/apm/create-apm-rules-alerts.md
-              title: Create rules and alerts
-            - page: docs-content://solutions/observability/apm/create-custom-links.md
-              title: Create custom links
-          - group: Use APM securely
-            page: docs-content://solutions/observability/apm/use-apm-securely.md
-            children:
-            - group: Secure data
-              page: docs-content://solutions/observability/apm/secure-data.md
-              children:
-              - page: docs-content://solutions/observability/apm/control-access-to-apm-data.md
-                title: Control access to APM data
-              - page: docs-content://solutions/observability/apm/built-in-data-filters.md
-                title: Built-in data filters
-              - page: docs-content://solutions/observability/apm/custom-filters.md
-                title: Custom filters
-              - page: docs-content://solutions/observability/apm/delete-sensitive-data.md
-                title: Delete sensitive data
-            - group: Secure communication with APM agents
-              page: docs-content://solutions/observability/apm/secure-communication-with-apm-agents.md
-              children:
-              - page: docs-content://solutions/observability/apm/apm-agent-tls-communication.md
-                title: APM agent TLS communication
-              - page: docs-content://solutions/observability/apm/api-keys.md
-                title: API keys
-              - page: docs-content://solutions/observability/apm/secret-token.md
-                title: Secret token
-              - page: docs-content://solutions/observability/apm/anonymous-authentication.md
-                title: Anonymous authentication
-            - group: Secure communication with the Elastic Stack
-              page: docs-content://solutions/observability/apm/secure-communication-with-elastic-stack.md
-              children:
-              - page: docs-content://solutions/observability/apm/create-assign-feature-roles-to-apm-server-users.md
-                title: Use feature roles
-              - page: docs-content://solutions/observability/apm/grant-access-using-api-keys.md
-                title: Grant access using API keys
-            - group: Secure access to the Applications UI
-              page: docs-content://solutions/observability/apm/secure-access-to-applications-ui.md
-              children:
-              - page: docs-content://solutions/observability/apm/ui-user-reader.md
-                title: Create an APM reader user
-              - page: docs-content://solutions/observability/apm/ui-user-annotation.md
-                title: Create an annotation user
-              - page: docs-content://solutions/observability/apm/ui-user-api.md
-                title: Create an API user
-              - page: docs-content://solutions/observability/apm/ui-user-central-config.md
-                title: Create a central config user
-              - page: docs-content://solutions/observability/apm/ui-user-storage-explorer.md
-                title: Create a storage explorer user
-          - group: Manage storage
-            page: docs-content://solutions/observability/apm/manage-storage.md
-            children:
-            - page: docs-content://solutions/observability/apm/storage-explorer.md
-              title: Storage Explorer
-            - page: docs-content://solutions/observability/apm/data-streams.md
-              title: Data streams
-            - page: docs-content://solutions/observability/apm/index-lifecycle-management.md
-              title: Index lifecycle management
-            - page: docs-content://solutions/observability/apm/view-elasticsearch-index-template.md
-              title: View the Elasticsearch index template
-            - page: docs-content://solutions/observability/apm/parse-data-using-ingest-pipelines.md
-              title: Parse data using ingest pipelines
-            - page: docs-content://solutions/observability/apm/storage-sizing-guide.md
-              title: Storage and sizing guide
-            - page: docs-content://solutions/observability/apm/reduce-storage.md
-              title: Reduce storage
-            - page: docs-content://solutions/observability/apm/explore-data-in-elasticsearch.md
-              title: Explore data in Elasticsearch
-          - group: "Work with {{apm-server}}"
-            page: docs-content://solutions/observability/apm/apm-server/index.md
-            children:
-            - group: Set up
-              page: docs-content://solutions/observability/apm/apm-server/setup.md
-              children:
-              - page: docs-content://solutions/observability/apm/apm-server/fleet-managed.md
-                title: Fleet-managed APM Server
-              - page: docs-content://solutions/observability/apm/apm-server/binary.md
-                title: APM Server binary
-            - group: Configure
-              page: docs-content://solutions/observability/apm/apm-server/configure.md
-              children:
-              - page: docs-content://solutions/observability/apm/apm-server/general-configuration-options.md
-                title: General configuration options
-              - page: docs-content://solutions/observability/apm/apm-server/configure-anonymous-authentication.md
-                title: Anonymous authentication
-              - page: docs-content://solutions/observability/apm/apm-server/apm-agent-authorization.md
-                title: APM agent authorization
-              - page: docs-content://solutions/observability/apm/apm-server/apm-agent-central-configuration.md
-                title: Configure APM Agent Central Configuration
-              - page: docs-content://solutions/observability/apm/apm-server/configure-apm-instrumentation.md
-                title: Instrumentation
-              - page: docs-content://solutions/observability/apm/apm-server/configure-kibana-endpoint.md
-                title: Kibana endpoint
-              - page: docs-content://solutions/observability/apm/apm-server/configure-logging.md
-                title: Logging
-              - group: Output
-                page: docs-content://solutions/observability/apm/apm-server/configure-output.md
-                children:
-                - page: docs-content://solutions/observability/apm/apm-server/configure-output-for-elasticsearch-service-on-elastic-cloud.md
-                  title: Elastic Cloud Hosted
-                - page: docs-content://solutions/observability/apm/apm-server/configure-elasticsearch-output.md
-                  title: Elasticsearch
-                - page: docs-content://solutions/observability/apm/apm-server/configure-logstash-output.md
-                  title: "{{ls}}"
-                - page: docs-content://solutions/observability/apm/apm-server/configure-kafka-output.md
-                  title: Kafka
-                - page: docs-content://solutions/observability/apm/apm-server/configure-redis-output.md
-                  title: Redis
-                - page: docs-content://solutions/observability/apm/apm-server/configure-console-output.md
-                  title: Console
-              - page: docs-content://solutions/observability/apm/apm-server/configure-project-paths.md
-                title: Project paths
-              - page: docs-content://solutions/observability/apm/apm-server/configure-real-user-monitoring-rum.md
-                title: Real User Monitoring (RUM)
-              - group: SSL/TLS settings
-                page: docs-content://solutions/observability/apm/apm-server/ssl-tls-settings.md
-                children:
-                - page: docs-content://solutions/observability/apm/apm-server/ssl-tls-output-settings.md
-                  title: SSL/TLS output settings
-                - page: docs-content://solutions/observability/apm/apm-server/ssl-tls-input-settings.md
-                  title: SSL/TLS input settings
-              - page: docs-content://solutions/observability/apm/apm-server/tail-based-sampling.md
-                title: Tail-based sampling
-              - page: docs-content://solutions/observability/apm/apm-server/use-environment-variables-in-configuration.md
-                title: Use environment variables in the configuration
-              - group: Advanced setup
-                page: docs-content://solutions/observability/apm/apm-server/advanced-setup.md
-                children:
-                - page: docs-content://solutions/observability/apm/apm-server/installation-layout.md
-                  title: Installation layout
-                - page: docs-content://solutions/observability/apm/apm-server/secrets-keystore-for-secure-settings.md
-                  title: Secrets keystore
-                - page: docs-content://solutions/observability/apm/apm-server/command-reference.md
-                  title: Command reference
-                - page: docs-content://solutions/observability/apm/apm-server/tune-data-ingestion.md
-                  title: Tune data ingestion
-                - page: docs-content://solutions/observability/apm/apm-server/high-availability.md
-                  title: High Availability
-                - page: docs-content://solutions/observability/apm/apm-server/systemd.md
-                  title: APM Server and systemd
-            - group: Monitor
-              page: docs-content://solutions/observability/apm/apm-server/monitor.md
-              children:
-              - page: docs-content://solutions/observability/apm/apm-server/monitor-fleet-managed.md
-                title: Fleet-managed
-              - group: APM Server binary
-                page: docs-content://solutions/observability/apm/apm-server/monitor-binary.md
-                children:
-                - page: docs-content://solutions/observability/apm/apm-server/use-internal-collection-to-send-monitoring-data.md
-                  title: Use internal collection
-                - page: docs-content://solutions/observability/apm/apm-server/use-metricbeat-to-send-monitoring-data.md
-                  title: "Use {{metricbeat}} collection"
-                - page: docs-content://solutions/observability/apm/apm-server/use-select-metrics-emitted-directly-to-monitoring-cluster.md
-                  title: Use local collection
-          - group: APM APIs
-            page: docs-content://solutions/observability/apm/apis.md
-            children:
-            - page: docs-content://solutions/observability/apm/apm-ui-api.md
-              title: APM UI API
-            - group: "{{apm-server}} API"
-              page: docs-content://solutions/observability/apm/apm-server/api.md
-              children:
-              - page: docs-content://solutions/observability/apm/apm-server/information-api.md
-                title: APM Server information API
-              - page: docs-content://solutions/observability/apm/elastic-apm-events-intake-api.md
-                title: Elastic APM events intake API
-              - page: docs-content://solutions/observability/apm/elastic-apm-agent-configuration-api.md
-                title: Elastic APM agent configuration API
-              - page: docs-content://solutions/observability/apm/opentelemetry-intake-api.md
-                title: OpenTelemetry intake API
-              - page: docs-content://solutions/observability/apm/jaeger-event-intake.md
-                title: Jaeger event intake
-            - page: docs-content://solutions/observability/apm/managed-intake-service-event-api.md
-              title: Managed intake service event API
-          - group: Upgrade
-            page: docs-content://solutions/observability/apm/upgrade.md
-            children:
-            - page: docs-content://solutions/observability/apm/apm-agent-compatibility.md
-              title: APM agent compatibility
-            - group: "Upgrade to version 9.0 [apm-upgrading-to-9.0]"
-              page: docs-content://solutions/observability/apm/upgrade-to-version-9.md
-              children:
-              - page: docs-content://solutions/observability/apm/upgrade-self-installation-of-apm-server-standalone-to-9.md
-                title: Self-installation standalone
-              - page: docs-content://solutions/observability/apm/upgrade-self-installation-of-apm-integration-to-9.md
-                title: Self-installation APM integration
-              - page: docs-content://solutions/observability/apm/upgrade-elastic-cloud-apm-server-standalone-to-9.md
-                title: "{{ecloud}} standalone"
-              - page: docs-content://solutions/observability/apm/upgrade-elastic-cloud-with-apm-integration-to-9.md
-                title: "{{ecloud}} APM integration"
-            - group: Switch to the Elastic APM integration
-              page: docs-content://solutions/observability/apm/switch-to-elastic-apm-integration.md
-              children:
-              - page: docs-content://solutions/observability/apm/switch-self-installation-to-apm-integration.md
-                title: Switch a self-installation
-              - page: docs-content://solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md
-                title: "Switch an {{ecloud}} cluster"
-        - group: Synthetic monitoring
-          page: docs-content://solutions/observability/synthetics/index.md
-          children:
-          - group: Get started
-            page: docs-content://solutions/observability/synthetics/get-started.md
-            children:
-            - page: docs-content://solutions/observability/synthetics/create-monitors-with-projects.md
-              title: Use a Synthetics project
-            - page: docs-content://solutions/observability/synthetics/create-monitors-ui.md
-              title: Use the Synthetics UI
-          - group: Scripting browser monitors
-            page: docs-content://solutions/observability/synthetics/scripting-browser-monitors.md
-            children:
-            - page: docs-content://solutions/observability/synthetics/write-synthetic-test.md
-              title: Write a synthetic test
-            - page: docs-content://solutions/observability/synthetics/configure-individual-browser-monitors.md
-              title: Configure individual monitors
-            - page: docs-content://solutions/observability/synthetics/use-synthetics-recorder.md
-              title: Use the Synthetics Recorder
-          - page: docs-content://solutions/observability/synthetics/configure-lightweight-monitors.md
-            title: Configure lightweight monitors
-          - page: docs-content://solutions/observability/synthetics/manage-monitors.md
-            title: Manage monitors
-          - page: docs-content://solutions/observability/synthetics/work-with-params-secrets.md
-            title: Work with params and secrets
-          - page: docs-content://solutions/observability/synthetics/analyze-data.md
-            title: Analyze monitor data
-          - page: docs-content://solutions/observability/synthetics/monitor-resources-on-private-networks.md
-            title: Monitor resources on private networks
-          - page: docs-content://solutions/observability/synthetics/cli.md
-            title: Use the CLI
-          - page: docs-content://solutions/observability/synthetics/configure-projects.md
-            title: Configure a Synthetics project
-          - page: docs-content://solutions/observability/synthetics/mfa-for-browser-monitors.md
-            title: Multi-factor Authentication
-          - page: docs-content://solutions/observability/synthetics/configure-settings.md
-            title: Configure Synthetics settings
-          - group: Grant users access to secured resources
-            page: docs-content://solutions/observability/synthetics/grant-access-to-secured-resources.md
-            children:
-            - page: docs-content://solutions/observability/synthetics/setup-role.md
-              title: Setup role
-            - page: docs-content://solutions/observability/synthetics/writer-role.md
-              title: Writer role
-            - page: docs-content://solutions/observability/synthetics/reader-role.md
-              title: Reader role
-          - page: docs-content://solutions/observability/synthetics/manage-data-retention.md
-            title: Manage data retention
-          - page: docs-content://solutions/observability/synthetics/network-security.md
-            title: Use Synthetics with network security
-          - page: docs-content://solutions/observability/synthetics/migrate-from-elastic-synthetics-integration.md
-            title: Migrate from the Elastic Synthetics integration
-          - page: docs-content://solutions/observability/synthetics/scale-architect-synthetics-deployment.md
-            title: Scale and architect a deployment
-          - page: docs-content://solutions/observability/synthetics/support-matrix.md
-            title: Synthetics support matrix
-          - page: docs-content://solutions/observability/synthetics/encryption-security.md
-            title: Synthetics Encryption and Security
-        - group: Real user monitoring
-          page: docs-content://solutions/observability/applications/user-experience.md
-          children:
-          - page: docs-content://solutions/observability/applications/otel-rum.md
-            title: OpenTelemetry for Real User Monitoring (RUM)
-        - page: docs-content://solutions/observability/applications/llm-observability.md
-          title: LLM and agentic AI observability
-        - group: Uptime monitoring (deprecated)
-          page: docs-content://solutions/observability/uptime/index.md
-          children:
-          - page: docs-content://solutions/observability/uptime/get-started.md
-            title: Get started
-          - group: Analyze
-            page: docs-content://solutions/observability/uptime/analyze.md
-            children:
-            - page: docs-content://solutions/observability/uptime/view-monitor-status.md
-              title: View monitor status
-            - page: docs-content://solutions/observability/uptime/analyze-monitors.md
-              title: Analyze monitors
-            - page: docs-content://solutions/observability/uptime/inspect-duration-anomalies.md
-              title: Inspect uptime duration anomalies
-          - page: docs-content://solutions/observability/uptime/configure-settings.md
-            title: Configure settings
-        - page: docs-content://solutions/observability/otlp-visualize.md
-          title: Visualize OpenTelemetry data
-      - page: docs-content://solutions/observability/cicd.md
-        title: CI/CD
-      - group: Cloud
-        page: docs-content://solutions/observability/cloud.md
-        children:
-        - group: AWS
-          page: docs-content://solutions/observability/cloud/amazon-web-services-aws-monitoring.md
-          children:
-          - page: docs-content://solutions/observability/cloud/ingestion-options.md
-            title: Ingestion options
-          - group: "Monitor {{aws}} with Elastic Agent"
-            page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-agent.md
-            children:
-            - page: docs-content://solutions/observability/cloud/monitor-amazon-cloud-compute-ec2.md
-              title: EC2
-            - page: docs-content://solutions/observability/cloud/monitor-amazon-kinesis-data-streams.md
-              title: Kinesis data streams
-            - page: docs-content://solutions/observability/cloud/monitor-amazon-simple-storage-service-s3.md
-              title: S3
-            - page: docs-content://solutions/observability/cloud/monitor-amazon-simple-queue-service-sqs.md
-              title: SQS
-          - page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md
-            title: "Monitor {{aws}} with {{beats}}"
-          - group: "Monitor {{aws}} with Amazon Data Firehose"
-            page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-amazon-data-firehose.md
-            children:
-            - page: docs-content://solutions/observability/cloud/monitor-virtual-private-cloud-vpc-flow-logs.md
-              title: VPC Flow Logs
-            - page: docs-content://solutions/observability/cloud/monitor-cloudtrail-logs.md
-              title: CloudTrail logs
-            - page: docs-content://solutions/observability/cloud/monitor-aws-network-firewall-logs.md
-              title: Network Firewall logs
-            - page: docs-content://solutions/observability/cloud/monitor-web-application-firewall-waf-logs.md
-              title: WAF logs
-            - page: docs-content://solutions/observability/cloud/monitor-cloudwatch-logs.md
-              title: CloudWatch logs
-          - page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-serverless-forwarder.md
-            title: "Monitor {{aws}} with Elastic Serverless Forwarder"
-        - group: Azure
-          page: docs-content://solutions/observability/cloud/azure-monitoring.md
-          children:
-          - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-elastic-agent.md
-            title: Monitor Microsoft Azure with Elastic Agent
-          - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-beats.md
-            title: Monitor Microsoft Azure with Beats
-          - page: docs-content://solutions/observability/cloud/multi-tenant-data-ingestion-with-beats.md
-            title: Ingest multi-tenant Azure Event Hub logs with Filebeat
-          - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-azure-native-isv-service.md
-            title: Monitor Microsoft Azure with the Azure Native ISV Service
-          - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-openai.md
-            title: Monitor Microsoft Azure OpenAI
-        - group: GCP
-          page: docs-content://solutions/observability/cloud/monitor-google-cloud-platform-gcp.md
-          children:
-          - page: docs-content://solutions/observability/cloud/gcp-dataflow-templates.md
-            title: GCP Dataflow templates
-      - group: Infrastructure and hosts
-        page: docs-content://solutions/observability/infra-and-hosts.md
-        children:
-        - group: Analyze infrastructure and host metrics
-          page: docs-content://solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md
-          children:
-          - page: docs-content://solutions/observability/infra-and-hosts/get-started-with-system-metrics.md
-            title: Get started with system metrics
-          - page: docs-content://solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
-            title: View infrastructure metrics by resource type
-          - page: docs-content://solutions/observability/infra-and-hosts/discover-metrics.md
-            title: Explore metrics data with Discover in Kibana
-          - page: docs-content://solutions/observability/infra-and-hosts/explore-infrastructure-metrics-over-time.md
-            title: Explore infrastructure metrics over time
-          - page: docs-content://solutions/observability/infra-and-hosts/analyze-compare-hosts.md
-            title: Analyze and compare hosts
-          - page: docs-content://solutions/observability/infra-and-hosts/detect-metric-anomalies.md
-            title: Detect metric anomalies
-          - page: docs-content://solutions/observability/infra-and-hosts/configure-settings.md
-            title: Configure settings
-        - group: Universal Profiling
-          page: docs-content://solutions/observability/infra-and-hosts/universal-profiling.md
-          children:
-          - page: docs-content://solutions/observability/infra-and-hosts/get-started-with-universal-profiling.md
-            title: Get started
-          - group: Manage data storage
-            page: docs-content://solutions/observability/infra-and-hosts/manage-data-storage.md
-            children:
-            - page: docs-content://solutions/observability/infra-and-hosts/universal-profiling-index-life-cycle-management.md
-              title: Index lifecycle management
-            - page: docs-content://solutions/observability/infra-and-hosts/configure-probabilistic-profiling.md
-              title: Configure probabilistic profiling
-          - group: Advanced configuration
-            page: docs-content://solutions/observability/infra-and-hosts/advanced-configuration.md
-            children:
-            - page: docs-content://solutions/observability/infra-and-hosts/tag-data-for-querying.md
-              title: Tag data for querying
-            - page: docs-content://solutions/observability/infra-and-hosts/add-symbols-for-native-frames.md
-              title: Add symbols for native frames
-            - page: docs-content://solutions/observability/infra-and-hosts/use-proxy-with-universal-profiling-agent.md
-              title: Use a proxy
-            - page: docs-content://solutions/observability/infra-and-hosts/override-kernel-version-check.md
-              title: Override kernel version check
-            - page: docs-content://solutions/observability/infra-and-hosts/environment-variables-to-configure-universal-profiling-agent.md
-              title: Environment variables to configure the Universal Profiling Agent
-            - page: docs-content://solutions/observability/infra-and-hosts/configuration-file-of-universal-profiling-agent.md
-              title: Configuration file of the Universal Profiling Agent
-          - page: docs-content://solutions/observability/infra-and-hosts/upgrade-universal-profiling.md
-            title: Upgrade
-          - page: docs-content://solutions/observability/infra-and-hosts/run-universal-profiling-on-self-hosted-elastic-stack.md
-            title: Self-hosted infrastructure
-          - group: Install the backend
-            page: docs-content://solutions/observability/infra-and-hosts/install-backend.md
-            children:
-            - page: docs-content://solutions/observability/infra-and-hosts/step-1-update-stack.md
-              title: "Step 1: Update the stack"
-            - page: docs-content://solutions/observability/infra-and-hosts/step-2-enable-universal-profiling-in-kibana.md
-              title: "Step 2: Enable Universal Profiling in Kibana"
-            - page: docs-content://solutions/observability/infra-and-hosts/step-3-set-up-universal-profiling-in-kibana.md
-              title: "Step 3: Set up Universal Profiling in Kibana"
-            - page: docs-content://solutions/observability/infra-and-hosts/step-4-run-backend-applications.md
-              title: "Step 4: Run the backend applications"
-            - page: docs-content://solutions/observability/infra-and-hosts/step-5-next-steps.md
-              title: "Step 5: Next steps"
-          - page: docs-content://solutions/observability/infra-and-hosts/operate-universal-profiling-backend.md
-            title: Operate the backend
-        - page: docs-content://solutions/observability/infra-and-hosts/tutorial-observe-kubernetes-deployments.md
-          title: "Tutorial: Observe your Kubernetes deployments"
-        - group: "Tutorial: Observe your nginx instances"
-          page: docs-content://solutions/observability/infra-and-hosts/tutorial-observe-nginx-instances.md
-          children:
-          - page: docs-content://solutions/observability/infra-and-hosts/understanding-no-results-found-message.md
-            title: Understanding "no results found" message
-        - page: docs-content://solutions/observability/infra-and-hosts/collect-nginx-data-otel-integration-fleet-managed.md
-          title: Collect NGINX data with OpenTelemetry integrations (Fleet-managed)
-        - page: docs-content://solutions/observability/infra-and-hosts/collect-nginx-data-otel-integration-standalone.md
-          title: Collect NGINX data with OpenTelemetry integrations (standalone)
-      - group: Logs
-        page: docs-content://solutions/observability/logs.md
-        children:
-        - page: docs-content://solutions/observability/logs/get-started-with-system-logs.md
-          title: Get started with system logs
-        - page: docs-content://solutions/observability/logs/stream-any-log-file.md
-          title: Send any log file using Elastic Agent
-        - page: docs-content://solutions/observability/logs/stream-any-log-file-using-edot-collector.md
-          title: Send any log file using OTel Collector
-        - group: Send application log data
-          page: docs-content://solutions/observability/logs/stream-application-logs.md
-          children:
-          - page: docs-content://solutions/observability/logs/plaintext-application-logs.md
-            title: Plaintext application logs
-          - page: docs-content://solutions/observability/logs/ecs-formatted-application-logs.md
-            title: ECS formatted application logs
-          - page: docs-content://solutions/observability/logs/apm-agent-log-sending.md
-            title: APM agent log sending
-        - page: docs-content://solutions/observability/logs/parse-route-logs.md
-          title: Parse and route logs using ingest pipelines
-        - page: docs-content://solutions/observability/logs/filter-aggregate-logs.md
-          title: Filter and aggregate logs
-        - group: Explore logs
-          page: docs-content://solutions/observability/logs/explore-logs.md
-          children:
-          - page: docs-content://solutions/observability/logs/discover-logs.md
-            title: Explore logs in Discover
-          - page: docs-content://solutions/observability/logs/categorize-log-entries.md
-            title: Categorize log entries
-          - page: docs-content://solutions/observability/logs/inspect-log-anomalies.md
-            title: Inspect log anomalies
-        - page: docs-content://solutions/observability/logs/run-pattern-analysis-on-log-data.md
-          title: Run a pattern analysis on log data
-        - page: docs-content://solutions/observability/logs/log-data-sources.md
-          title: Configure log data sources
-        - page: docs-content://solutions/observability/logs/logs-data-retention.md
-          title: Configure log data retention
-        - page: docs-content://solutions/observability/logs/add-service-name-to-logs.md
-          title: Add a service name to logs
-        - group: Logs index template reference
-          page: docs-content://solutions/observability/logs/logs-index-template-reference.md
-          children:
-          - page: docs-content://solutions/observability/logs/logs-index-template-defaults.md
-            title: Default `logs` index template
-      - page: docs-content://solutions/observability/streams/streams.md
-        title: Streams
-      - page: docs-content://solutions/observability/streams/management/retention.md
-        title: Manage data retention
-      - group: Process documents
-        page: docs-content://solutions/observability/streams/management/extract.md
-        children:
-        - page: docs-content://solutions/observability/streams/management/extract/drop.md
-          title: Drop document processor
-        - page: docs-content://solutions/observability/streams/management/extract/remove.md
-          title: Remove processor
-        - page: docs-content://solutions/observability/streams/management/extract/date.md
-          title: Date processor
-        - page: docs-content://solutions/observability/streams/management/extract/convert.md
-          title: Convert processor
-        - page: docs-content://solutions/observability/streams/management/extract/replace.md
-          title: Replace processor
-        - page: docs-content://solutions/observability/streams/management/extract/dissect.md
-          title: Dissect processor
-        - page: docs-content://solutions/observability/streams/management/extract/grok.md
-          title: Grok processor
-        - page: docs-content://solutions/observability/streams/management/extract/set.md
-          title: Set processor
-        - page: docs-content://solutions/observability/streams/management/extract/math.md
-          title: Math processor
-        - page: docs-content://solutions/observability/streams/management/extract/rename.md
-          title: Rename processor
-        - page: docs-content://solutions/observability/streams/management/extract/append.md
-          title: Append processor
-        - page: docs-content://solutions/observability/streams/management/extract/manual-pipeline-configuration.md
-          title: Manual pipeline configuration
-      - page: docs-content://solutions/observability/streams/management/partitioning.md
-        title: Partition data into child streams
-      - page: docs-content://solutions/observability/streams/management/schema.md
-        title: Map fields
-      - page: docs-content://solutions/observability/streams/management/data-quality.md
-        title: Manage data quality
-      - page: docs-content://solutions/observability/streams/management/advanced.md
-        title: Configure advanced settings
-      - page: docs-content://solutions/observability/streams/wired-streams.md
-        title: Wired streams
-      - group: Incident management
-        page: docs-content://solutions/observability/incident-management.md
-        children:
-        - group: Alerting
-          page: docs-content://solutions/observability/incident-management/alerting.md
-          children:
-          - group: Create and manage rules
-            page: docs-content://solutions/observability/incident-management/create-manage-rules.md
-            children:
-            - page: docs-content://solutions/observability/incident-management/create-an-anomaly-detection-rule.md
-              title: Anomaly detection
-            - page: docs-content://solutions/observability/incident-management/create-an-apm-anomaly-rule.md
-              title: APM anomaly
-            - page: docs-content://solutions/observability/incident-management/create-custom-threshold-rule.md
-              title: Custom threshold
-            - page: docs-content://solutions/observability/incident-management/create-a-degraded-docs-rule.md
-              title: Degraded docs
-            - page: docs-content://solutions/observability/incident-management/create-an-elasticsearch-query-rule.md
-              title: Elasticsearch query
-            - page: docs-content://solutions/observability/incident-management/create-an-error-count-threshold-rule.md
-              title: Error count threshold
-            - page: docs-content://solutions/observability/incident-management/create-failed-transaction-rate-threshold-rule.md
-              title: Failed transaction rate threshold
-            - page: docs-content://solutions/observability/incident-management/create-a-failed-docs-rule.md
-              title: Failed docs
-            - page: docs-content://solutions/observability/incident-management/create-an-inventory-rule.md
-              title: Inventory
-            - page: docs-content://solutions/observability/incident-management/create-latency-threshold-rule.md
-              title: Latency threshold
-            - page: docs-content://solutions/observability/incident-management/create-log-threshold-rule.md
-              title: Log threshold
-            - page: docs-content://solutions/observability/incident-management/create-metric-threshold-rule.md
-              title: Metric threshold
-            - page: docs-content://solutions/observability/incident-management/create-monitor-status-rule.md
-              title: Monitor Status
-            - page: docs-content://solutions/observability/incident-management/create-tls-certificate-rule.md
-              title: TLS certificate
-            - page: docs-content://solutions/observability/incident-management/create-an-uptime-duration-anomaly-rule.md
-              title: Uptime duration anomaly
-            - page: docs-content://solutions/observability/incident-management/create-an-slo-burn-rate-rule.md
-              title: SLO burn rate
-          - group: Aggregation options
-            page: docs-content://solutions/observability/incident-management/aggregation-options.md
-            children:
-            - page: docs-content://solutions/observability/incident-management/rate-aggregation.md
-              title: Rate aggregation
-          - group: View and manage alerts
-            page: docs-content://solutions/observability/incident-management/view-alerts.md
-            children:
-            - page: docs-content://solutions/observability/incident-management/triage-slo-burn-rate-breaches.md
-              title: SLO burn rate breaches
-            - page: docs-content://solutions/observability/incident-management/triage-threshold-breaches.md
-              title: Threshold breaches
-        - page: docs-content://solutions/observability/incident-management/observability-cases.md
-          title: Cases
-        - group: Service-level objectives (SLOs)
-          page: docs-content://solutions/observability/incident-management/service-level-objectives-slos.md
-          children:
-          - page: docs-content://solutions/observability/incident-management/configure-service-level-objective-slo-access.md
-            title: Configure SLO access
-          - page: docs-content://solutions/observability/incident-management/create-an-slo.md
-            title: Create an SLO
-          - page: docs-content://solutions/observability/incident-management/slo-management.md
-            title: View and manage SLOs
-          - page: docs-content://solutions/observability/incident-management/configure-slo-settings.md
-            title: Configure SLOs settings
-      - page: docs-content://solutions/observability/data-set-quality-monitoring.md
-        title: Data set quality
-      - group: AI for Observability
-        page: docs-content://solutions/observability/ai/observability-ai.md
-        children:
-        - page: docs-content://solutions/observability/ai/observability-ai-assistant.md
-          title: AI Assistant
-        - page: docs-content://solutions/observability/ai/agent-builder-observability.md
-          title: Agent Builder for Observability
-        - page: docs-content://solutions/observability/ai/llm-performance-matrix.md
-          title: Large language model performance matrix
-      - page: docs-content://solutions/observability/observability-serverless-feature-tiers.md
-        title: Serverless feature tiers
-      - page: docs-content://solutions/observability/apis.md
-        title: APIs
-    - group: Security solution
-      page: docs-content://solutions/security.md
-      children:
-      - group: Get started
-        page: docs-content://solutions/security/get-started.md
-        children:
-        - group: Elastic Security quickstarts
-          page: docs-content://solutions/security/get-started/quickstarts.md
-          children:
-          - page: docs-content://solutions/security/get-started/get-started-detect-with-siem.md
-            title: Detect and respond to threats with SIEM
-          - page: docs-content://solutions/security/get-started/get-started-endpoint-security.md
-            title: Protect your hosts with endpoint security
-          - page: docs-content://solutions/security/get-started/get-started-cloud-security.md
-            title: Secure your cloud assets with cloud security posture management
-        - page: docs-content://solutions/security/get-started/elastic-security-requirements.md
-          title: Elastic Security requirements
-        - page: docs-content://solutions/security/get-started/elastic-security-ui.md
-          title: Elastic Security UI
-        - group: Ingest data to Elastic Security
-          page: docs-content://solutions/security/get-started/ingest-data-to-elastic-security.md
-          children:
-          - page: docs-content://solutions/security/get-started/enable-threat-intelligence-integrations.md
-            title: Enable threat intelligence integrations
-          - page: docs-content://solutions/security/get-started/automatic-migration.md
-            title: Automatic migration
-          - page: docs-content://solutions/security/get-started/automatic-import.md
-            title: Automatic import
-          - page: docs-content://solutions/security/get-started/content-connectors.md
-            title: Content connectors
-        - group: Spaces and Elastic Security
-          page: docs-content://solutions/security/get-started/spaces-elastic-security.md
-          children:
-          - page: docs-content://solutions/security/get-started/spaces-defend-faq.md
-            title: "Spaces and {{elastic-defend}} FAQ"
-        - page: docs-content://solutions/security/get-started/data-views-elastic-security.md
-          title: "{{data-sources-cap}} and Elastic Security"
-        - page: docs-content://solutions/security/get-started/create-runtime-fields-in-elastic-security.md
-          title: Create runtime fields in Elastic Security
-        - page: docs-content://solutions/security/get-started/configure-advanced-settings.md
-          title: Configure advanced settings
-      - group: "ES|QL for security"
-        page: docs-content://solutions/security/esql-for-security.md
-        children:
-        - page: docs-content://solutions/security/esql-for-security/esql-threat-hunting-tutorial.md
-          title: "Tutorial: Threat hunting with ES|QL"
-      - group: AI for security
-        page: docs-content://solutions/security/ai.md
-        children:
-        - group: Elastic AI SOC Engine
-          page: docs-content://solutions/security/ai/ease/ease-intro.md
-          children:
-          - page: docs-content://solutions/security/ai/ease/ease-alerts.md
-            title: Triage alerts
-          - page: docs-content://solutions/security/ai/ease/ease-upgrade.md
-            title: Upgrade from EASE to Elastic Security
-        - group: AI Assistant for Security
-          page: docs-content://solutions/security/ai/ai-assistant.md
-          children:
-          - page: docs-content://solutions/security/ai/ai-assistant-knowledge-base.md
-            title: AI Assistant Knowledge Base
-          - page: docs-content://solutions/security/ai/usecase-knowledge-base-walkthrough.md
-            title: Use AI Assistant's Knowledge Base to improve response quality
-        - page: docs-content://solutions/security/ai/agent-builder/agent-builder.md
-          title: Agent Builder for Elastic Security
-        - page: docs-content://solutions/security/ai/attack-discovery.md
-          title: Attack Discovery
-        - page: docs-content://solutions/security/ai/large-language-model-performance-matrix.md
-          title: Large language model performance matrix
-        - group: AI use cases
-          page: docs-content://solutions/security/ai/use-cases.md
-          children:
-          - page: docs-content://solutions/security/ai/triage-alerts.md
-            title: Triage alerts
-          - page: docs-content://solutions/security/ai/identify-investigate-document-threats.md
-            title: Identify, investigate, and document threats
-          - page: docs-content://solutions/security/ai/generate-customize-learn-about-esorql-queries.md
-            title: "Generate, customize, and learn about ES|QL queries"
-        - page: docs-content://solutions/security/ai/ease/ease-value-report.md
-          title: Value report
-      - group: Detections and alerts
-        page: docs-content://solutions/security/detect-and-alert.md
-        children:
-        - group: Before you begin
-          page: docs-content://solutions/security/detect-and-alert/before-you-begin.md
-          children:
-          - page: docs-content://solutions/security/detect-and-alert/turn-on-detections.md
-            title: Turn on detections
-          - page: docs-content://solutions/security/detect-and-alert/detections-privileges.md
-            title: Detections privileges
-          - page: docs-content://solutions/security/detect-and-alert/detection-rule-concepts.md
-            title: Detection rule concepts
-          - group: Advanced data source configuration
-            page: docs-content://solutions/security/detect-and-alert/advanced-data-source-configuration.md
-            children:
-            - page: docs-content://solutions/security/detect-and-alert/cross-cluster-search-detection-rules.md
-              title: Cross-cluster search and detection rules
-            - page: docs-content://solutions/security/detect-and-alert/using-logsdb-index-mode-with-elastic-security.md
-              title: Using logsdb index mode with Elastic Security
-        - page: docs-content://solutions/security/detect-and-alert/mitre-attack-coverage.md
-          title: "MITRE ATT&CK coverage"
-        - group: Prebuilt rules
-          page: docs-content://solutions/security/detect-and-alert/prebuilt-rules.md
-          children:
-          - page: docs-content://solutions/security/detect-and-alert/prebuilt-rule-components.md
-            title: Prebuilt rule components
-          - page: docs-content://solutions/security/detect-and-alert/install-prebuilt-rules.md
-            title: Install prebuilt rules
-          - page: docs-content://solutions/security/detect-and-alert/update-prebuilt-rules.md
-            title: Update prebuilt rules
-          - page: docs-content://solutions/security/detect-and-alert/prebuilt-rules-airgapped.md
-            title: Prebuilt rules in air-gapped environments
-          - page: docs-content://solutions/security/detect-and-alert/customize-prebuilt-rules.md
-            title: Customize prebuilt rules
-        - group: Author rules
-          page: docs-content://solutions/security/detect-and-alert/author-rules.md
-          children:
-          - group: Choose the right rule type
-            page: docs-content://solutions/security/detect-and-alert/choose-the-right-rule-type.md
-            children:
-            - page: docs-content://solutions/security/detect-and-alert/about-building-block-rules.md
-              title: About building block rules
-          - group: Rule type guides
-            page: docs-content://solutions/security/detect-and-alert/rule-types.md
-            children:
-            - page: docs-content://solutions/security/detect-and-alert/esql.md
-              title: "ES|QL rules"
-            - page: docs-content://solutions/security/detect-and-alert/custom-query.md
-              title: Custom query rules
-            - page: docs-content://solutions/security/detect-and-alert/eql.md
-              title: Event correlation (EQL) rules
-            - page: docs-content://solutions/security/detect-and-alert/indicator-match.md
-              title: Indicator match rules
-            - page: docs-content://solutions/security/detect-and-alert/threshold.md
-              title: Threshold rules
-            - page: docs-content://solutions/security/detect-and-alert/machine-learning.md
-              title: "{{ml-cap}} rules"
-            - page: docs-content://solutions/security/detect-and-alert/new-terms.md
-              title: New terms rules
-          - page: docs-content://solutions/security/detect-and-alert/using-the-rule-ui.md
-            title: Using the UI
-          - page: docs-content://solutions/security/detect-and-alert/using-the-api.md
-            title: Using the API
-          - page: docs-content://solutions/security/detect-and-alert/common-rule-settings.md
-            title: Common rule settings
-          - page: docs-content://solutions/security/detect-and-alert/set-rule-data-sources.md
-            title: Set rule data sources
-          - page: docs-content://solutions/security/detect-and-alert/write-investigation-guides.md
-            title: Write investigation guides
-          - page: docs-content://solutions/security/detect-and-alert/validate-and-test-rules.md
-            title: Validate and test rules
-        - page: docs-content://solutions/security/detect-and-alert/manage-detection-rules.md
-          title: Manage detection rules
-        - group: Monitor rule executions
-          page: docs-content://solutions/security/detect-and-alert/monitor-rule-executions.md
-          children:
-          - page: docs-content://solutions/security/detect-and-alert/fill-rule-gaps.md
-            title: Fill rule execution gaps
-        - group: Reduce noise and false positives
-          page: docs-content://solutions/security/detect-and-alert/reduce-noise-and-false-positives.md
-          children:
-          - page: docs-content://solutions/security/detect-and-alert/tune-detection-rules.md
-            title: Tune detection rules
-          - group: Rule exceptions
-            page: docs-content://solutions/security/detect-and-alert/rule-exceptions.md
-            children:
-            - page: docs-content://solutions/security/detect-and-alert/create-manage-value-lists.md
-              title: Create and manage value lists
-            - page: docs-content://solutions/security/detect-and-alert/add-manage-exceptions.md
-              title: Add and manage exceptions
-            - page: docs-content://solutions/security/detect-and-alert/create-manage-shared-exception-lists.md
-              title: Create and manage shared exception lists
-          - page: docs-content://solutions/security/detect-and-alert/alert-suppression.md
-            title: Suppress detection alerts
-        - group: Manage detection alerts
-          page: docs-content://solutions/security/detect-and-alert/manage-detection-alerts.md
-          children:
-          - page: docs-content://solutions/security/detect-and-alert/visualize-detection-alerts.md
-            title: Visualize detection alerts
-          - page: docs-content://solutions/security/detect-and-alert/view-detection-alert-details.md
-            title: View detection alert details
-          - page: docs-content://solutions/security/detect-and-alert/query-alert-indices.md
-            title: Query alert indices
-      - group: "Configure endpoint protection with {{elastic-defend}}"
-        page: docs-content://solutions/security/configure-elastic-defend.md
-        children:
-        - page: docs-content://solutions/security/configure-elastic-defend/elastic-defend-requirements.md
-          title: "{{elastic-defend}} requirements"
-        - group: "Install {{elastic-defend}}"
-          page: docs-content://solutions/security/configure-elastic-defend/install-elastic-defend.md
-          children:
-          - page: docs-content://solutions/security/configure-elastic-defend/enable-access-for-macos.md
-            title: Enable access on macOS
-          - page: docs-content://solutions/security/configure-elastic-defend/deploy-on-macos-with-mdm.md
-            title: Deploy on macOS with MDM
-          - page: docs-content://solutions/security/configure-elastic-defend/prevent-elastic-agent-uninstallation.md
-            title: Prevent Elastic Agent uninstallation
-        - page: docs-content://solutions/security/configure-elastic-defend/elastic-defend-feature-privileges.md
-          title: "{{elastic-defend}} feature privileges"
-        - group: "Configure an integration policy for {{elastic-defend}}"
-          page: docs-content://solutions/security/configure-elastic-defend/configure-an-integration-policy-for-elastic-defend.md
-          children:
-          - page: docs-content://solutions/security/configure-elastic-defend/configure-updates-for-protection-artifacts.md
-            title: Configure updates for protection artifacts
-          - page: docs-content://solutions/security/configure-elastic-defend/turn-off-diagnostic-data-for-elastic-defend.md
-            title: "Turn off diagnostic data for {{elastic-defend}}"
-          - page: docs-content://solutions/security/configure-elastic-defend/configure-self-healing-rollback-for-windows-endpoints.md
-            title: Configure self-healing rollback for Windows endpoints
-          - page: docs-content://solutions/security/configure-elastic-defend/configure-linux-file-system-monitoring.md
-            title: Configure Linux file system monitoring
-          - page: docs-content://solutions/security/configure-elastic-defend/configure-data-volume-for-elastic-endpoint.md
-            title: Configure data volume
-          - page: docs-content://solutions/security/configure-elastic-defend/create-an-elastic-defend-policy-using-api.md
-            title: Create an Elastic Defend policy using API
-        - page: docs-content://solutions/security/configure-elastic-defend/configure-offline-endpoints-air-gapped-environments.md
-          title: Configure offline endpoints and air-gapped environments
-        - page: docs-content://solutions/security/configure-elastic-defend/uninstall-elastic-agent.md
-          title: Uninstall Elastic Agent
-      - group: "Manage {{elastic-defend}}"
-        page: docs-content://solutions/security/manage-elastic-defend.md
-        children:
-        - page: docs-content://solutions/security/manage-elastic-defend/endpoints.md
-          title: Endpoints
-        - page: docs-content://solutions/security/manage-elastic-defend/policies.md
-          title: Policies
-        - page: docs-content://solutions/security/manage-elastic-defend/trusted-applications.md
-          title: Trusted applications
-        - page: docs-content://solutions/security/manage-elastic-defend/trusted-devices.md
-          title: Trusted devices
-        - page: docs-content://solutions/security/manage-elastic-defend/event-filters.md
-          title: Event filters
-        - page: docs-content://solutions/security/manage-elastic-defend/host-isolation-exceptions.md
-          title: Host isolation exceptions
-        - page: docs-content://solutions/security/manage-elastic-defend/blocklist.md
-          title: Blocklist
-        - page: docs-content://solutions/security/manage-elastic-defend/optimize-elastic-defend.md
-          title: "Optimize {{elastic-defend}}"
-        - page: docs-content://solutions/security/manage-elastic-defend/event-capture-elastic-defend.md
-          title: "Event capture and {{elastic-defend}}"
-        - page: docs-content://solutions/security/manage-elastic-defend/endpoint-protection-rules.md
-          title: Endpoint protection rules
-        - page: docs-content://solutions/security/manage-elastic-defend/automatic-troubleshooting.md
-          title: Automatic troubleshooting
-        - page: docs-content://solutions/security/manage-elastic-defend/allowlist-elastic-endpoint-in-third-party-antivirus-apps.md
-          title: "Allowlist {{elastic-endpoint}} in third-party antivirus apps"
-        - page: docs-content://solutions/security/manage-elastic-defend/elastic-endpoint-self-protection-features.md
-          title: "{{elastic-endpoint}} self-protection features"
-      - group: Endpoint response actions
-        page: docs-content://solutions/security/endpoint-response-actions.md
-        children:
-        - page: docs-content://solutions/security/endpoint-response-actions/automated-response-actions.md
-          title: Automated response actions
-        - page: docs-content://solutions/security/endpoint-response-actions/isolate-host.md
-          title: Isolate a host
-        - page: docs-content://solutions/security/endpoint-response-actions/response-actions-history.md
-          title: Response actions history
-        - page: docs-content://solutions/security/endpoint-response-actions/third-party-response-actions.md
-          title: Third-party response actions
-        - page: docs-content://solutions/security/endpoint-response-actions/configure-third-party-response-actions.md
-          title: Configure third-party response actions
-      - group: Cloud Security
-        page: docs-content://solutions/security/cloud.md
+              - page: docs-content://solutions/observability/incident-management/create-an-error-count-threshold-rule.md
+                title: Error count threshold
+              - page: docs-content://solutions/observability/incident-management/create-failed-transaction-rate-threshold-rule.md
+                title: Failed transaction rate threshold
+              - page: docs-content://solutions/observability/incident-management/create-a-failed-docs-rule.md
+                title: Failed docs
+              - page: docs-content://solutions/observability/incident-management/create-an-inventory-rule.md
+                title: Inventory
+              - page: docs-content://solutions/observability/incident-management/create-latency-threshold-rule.md
+                title: Latency threshold
+              - page: docs-content://solutions/observability/incident-management/create-log-threshold-rule.md
+                title: Log threshold
+              - page: docs-content://solutions/observability/incident-management/create-metric-threshold-rule.md
+                title: Metric threshold
+              - page: docs-content://solutions/observability/incident-management/create-monitor-status-rule.md
+                title: Monitor Status
+              - page: docs-content://solutions/observability/incident-management/create-tls-certificate-rule.md
+                title: TLS certificate
+              - page: docs-content://solutions/observability/incident-management/create-an-uptime-duration-anomaly-rule.md
+                title: Uptime duration anomaly
+              - page: docs-content://solutions/observability/incident-management/create-an-slo-burn-rate-rule.md
+                title: SLO burn rate
+            - group: Aggregation options
+              page: docs-content://solutions/observability/incident-management/aggregation-options.md
+              children:
+              - page: docs-content://solutions/observability/incident-management/rate-aggregation.md
+                title: Rate aggregation
+            - group: View and manage alerts
+              page: docs-content://solutions/observability/incident-management/view-alerts.md
+              children:
+              - page: docs-content://solutions/observability/incident-management/triage-slo-burn-rate-breaches.md
+                title: SLO burn rate breaches
+              - page: docs-content://solutions/observability/incident-management/triage-threshold-breaches.md
+                title: Threshold breaches
+          - page: docs-content://solutions/observability/incident-management/observability-cases.md
+            title: Cases
+          - group: Service-level objectives (SLOs)
+            page: docs-content://solutions/observability/incident-management/service-level-objectives-slos.md
+            children:
+            - page: docs-content://solutions/observability/incident-management/configure-service-level-objective-slo-access.md
+              title: Configure SLO access
+            - page: docs-content://solutions/observability/incident-management/create-an-slo.md
+              title: Create an SLO
+            - page: docs-content://solutions/observability/incident-management/slo-management.md
+              title: View and manage SLOs
+            - page: docs-content://solutions/observability/incident-management/configure-slo-settings.md
+              title: Configure SLOs settings
+        - page: docs-content://solutions/observability/data-set-quality-monitoring.md
+          title: Data set quality
+        - group: AI for Observability
+          page: docs-content://solutions/observability/ai/observability-ai.md
+          children:
+          - page: docs-content://solutions/observability/ai/observability-ai-assistant.md
+            title: AI Assistant
+          - page: docs-content://solutions/observability/ai/agent-builder-observability.md
+            title: Agent Builder for Observability
+          - page: docs-content://solutions/observability/ai/llm-performance-matrix.md
+            title: Large language model performance matrix
+        - page: docs-content://solutions/observability/observability-serverless-feature-tiers.md
+          title: Serverless feature tiers
+        - page: docs-content://solutions/observability/apis.md
+          title: APIs
+      - group: Security solution
+        page: docs-content://solutions/security.md
         children:
-        - page: docs-content://solutions/security/cloud/security-posture-management-overview.md
-          title: Security posture management overview
-        - page: docs-content://solutions/security/cloud/enable-cloud-security-features.md
-          title: "Enable cloud security features in {{serverless-short}}"
-        - group: Cloud security posture management
-          page: docs-content://solutions/security/cloud/cloud-security-posture-management.md
-          children:
-          - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-aws.md
-            title: Get started with CSPM for AWS
-          - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-gcp.md
-            title: Get started with CSPM for GCP
-          - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-azure.md
-            title: Get started with CSPM for Azure
-          - page: docs-content://solutions/security/cloud/cspm-privilege-requirements.md
-            title: CSPM privilege requirements
-          - page: docs-content://solutions/security/cloud/findings-page.md
-            title: CSPM Findings
-          - page: docs-content://solutions/security/cloud/benchmarks.md
-            title: CSPM benchmarks
-          - page: docs-content://solutions/security/cloud/cspm-dashboard.md
-            title: Cloud Security Posture dashboard
-          - page: docs-content://solutions/security/cloud/cspm-frequently-asked-questions-faq.md
-            title: Frequently asked questions (FAQ)
-        - group: Kubernetes security posture management
-          page: docs-content://solutions/security/cloud/kubernetes-security-posture-management.md
+        - group: Get started
+          page: docs-content://solutions/security/get-started.md
+          children:
+          - group: Elastic Security quickstarts
+            page: docs-content://solutions/security/get-started/quickstarts.md
+            children:
+            - page: docs-content://solutions/security/get-started/get-started-detect-with-siem.md
+              title: Detect and respond to threats with SIEM
+            - page: docs-content://solutions/security/get-started/get-started-endpoint-security.md
+              title: Protect your hosts with endpoint security
+            - page: docs-content://solutions/security/get-started/get-started-cloud-security.md
+              title: Secure your cloud assets with cloud security posture management
+          - page: docs-content://solutions/security/get-started/elastic-security-requirements.md
+            title: Elastic Security requirements
+          - page: docs-content://solutions/security/get-started/elastic-security-ui.md
+            title: Elastic Security UI
+          - group: Ingest data to Elastic Security
+            page: docs-content://solutions/security/get-started/ingest-data-to-elastic-security.md
+            children:
+            - page: docs-content://solutions/security/get-started/enable-threat-intelligence-integrations.md
+              title: Enable threat intelligence integrations
+            - page: docs-content://solutions/security/get-started/automatic-migration.md
+              title: Automatic migration
+            - page: docs-content://solutions/security/get-started/automatic-import.md
+              title: Automatic import
+            - page: docs-content://solutions/security/get-started/content-connectors.md
+              title: Content connectors
+          - group: Spaces and Elastic Security
+            page: docs-content://solutions/security/get-started/spaces-elastic-security.md
+            children:
+            - page: docs-content://solutions/security/get-started/spaces-defend-faq.md
+              title: "Spaces and {{elastic-defend}} FAQ"
+          - page: docs-content://solutions/security/get-started/data-views-elastic-security.md
+            title: "{{data-sources-cap}} and Elastic Security"
+          - page: docs-content://solutions/security/get-started/create-runtime-fields-in-elastic-security.md
+            title: Create runtime fields in Elastic Security
+          - page: docs-content://solutions/security/get-started/configure-advanced-settings.md
+            title: Configure advanced settings
+        - group: "ES|QL for security"
+          page: docs-content://solutions/security/esql-for-security.md
+          children:
+          - page: docs-content://solutions/security/esql-for-security/esql-threat-hunting-tutorial.md
+            title: "Tutorial: Threat hunting with ES|QL"
+        - group: AI for security
+          page: docs-content://solutions/security/ai.md
+          children:
+          - group: Elastic AI SOC Engine
+            page: docs-content://solutions/security/ai/ease/ease-intro.md
+            children:
+            - page: docs-content://solutions/security/ai/ease/ease-alerts.md
+              title: Triage alerts
+            - page: docs-content://solutions/security/ai/ease/ease-upgrade.md
+              title: Upgrade from EASE to Elastic Security
+          - group: AI Assistant for Security
+            page: docs-content://solutions/security/ai/ai-assistant.md
+            children:
+            - page: docs-content://solutions/security/ai/ai-assistant-knowledge-base.md
+              title: AI Assistant Knowledge Base
+            - page: docs-content://solutions/security/ai/usecase-knowledge-base-walkthrough.md
+              title: Use AI Assistant's Knowledge Base to improve response quality
+          - page: docs-content://solutions/security/ai/agent-builder/agent-builder.md
+            title: Agent Builder for Elastic Security
+          - page: docs-content://solutions/security/ai/attack-discovery.md
+            title: Attack Discovery
+          - page: docs-content://solutions/security/ai/large-language-model-performance-matrix.md
+            title: Large language model performance matrix
+          - group: AI use cases
+            page: docs-content://solutions/security/ai/use-cases.md
+            children:
+            - page: docs-content://solutions/security/ai/triage-alerts.md
+              title: Triage alerts
+            - page: docs-content://solutions/security/ai/identify-investigate-document-threats.md
+              title: Identify, investigate, and document threats
+            - page: docs-content://solutions/security/ai/generate-customize-learn-about-esorql-queries.md
+              title: "Generate, customize, and learn about ES|QL queries"
+          - page: docs-content://solutions/security/ai/ease/ease-value-report.md
+            title: Value report
+        - group: Detections and alerts
+          page: docs-content://solutions/security/detect-and-alert.md
+          children:
+          - group: Before you begin
+            page: docs-content://solutions/security/detect-and-alert/before-you-begin.md
+            children:
+            - page: docs-content://solutions/security/detect-and-alert/turn-on-detections.md
+              title: Turn on detections
+            - page: docs-content://solutions/security/detect-and-alert/detections-privileges.md
+              title: Detections privileges
+            - page: docs-content://solutions/security/detect-and-alert/detection-rule-concepts.md
+              title: Detection rule concepts
+            - group: Advanced data source configuration
+              page: docs-content://solutions/security/detect-and-alert/advanced-data-source-configuration.md
+              children:
+              - page: docs-content://solutions/security/detect-and-alert/cross-cluster-search-detection-rules.md
+                title: Cross-cluster search and detection rules
+              - page: docs-content://solutions/security/detect-and-alert/using-logsdb-index-mode-with-elastic-security.md
+                title: Using logsdb index mode with Elastic Security
+          - page: docs-content://solutions/security/detect-and-alert/mitre-attack-coverage.md
+            title: "MITRE ATT&CK coverage"
+          - group: Prebuilt rules
+            page: docs-content://solutions/security/detect-and-alert/prebuilt-rules.md
+            children:
+            - page: docs-content://solutions/security/detect-and-alert/prebuilt-rule-components.md
+              title: Prebuilt rule components
+            - page: docs-content://solutions/security/detect-and-alert/install-prebuilt-rules.md
+              title: Install prebuilt rules
+            - page: docs-content://solutions/security/detect-and-alert/update-prebuilt-rules.md
+              title: Update prebuilt rules
+            - page: docs-content://solutions/security/detect-and-alert/prebuilt-rules-airgapped.md
+              title: Prebuilt rules in air-gapped environments
+            - page: docs-content://solutions/security/detect-and-alert/customize-prebuilt-rules.md
+              title: Customize prebuilt rules
+          - group: Author rules
+            page: docs-content://solutions/security/detect-and-alert/author-rules.md
+            children:
+            - group: Choose the right rule type
+              page: docs-content://solutions/security/detect-and-alert/choose-the-right-rule-type.md
+              children:
+              - page: docs-content://solutions/security/detect-and-alert/about-building-block-rules.md
+                title: About building block rules
+            - group: Rule type guides
+              page: docs-content://solutions/security/detect-and-alert/rule-types.md
+              children:
+              - page: docs-content://solutions/security/detect-and-alert/esql.md
+                title: "ES|QL rules"
+              - page: docs-content://solutions/security/detect-and-alert/custom-query.md
+                title: Custom query rules
+              - page: docs-content://solutions/security/detect-and-alert/eql.md
+                title: Event correlation (EQL) rules
+              - page: docs-content://solutions/security/detect-and-alert/indicator-match.md
+                title: Indicator match rules
+              - page: docs-content://solutions/security/detect-and-alert/threshold.md
+                title: Threshold rules
+              - page: docs-content://solutions/security/detect-and-alert/machine-learning.md
+                title: "{{ml-cap}} rules"
+              - page: docs-content://solutions/security/detect-and-alert/new-terms.md
+                title: New terms rules
+            - page: docs-content://solutions/security/detect-and-alert/using-the-rule-ui.md
+              title: Using the UI
+            - page: docs-content://solutions/security/detect-and-alert/using-the-api.md
+              title: Using the API
+            - page: docs-content://solutions/security/detect-and-alert/common-rule-settings.md
+              title: Common rule settings
+            - page: docs-content://solutions/security/detect-and-alert/set-rule-data-sources.md
+              title: Set rule data sources
+            - page: docs-content://solutions/security/detect-and-alert/write-investigation-guides.md
+              title: Write investigation guides
+            - page: docs-content://solutions/security/detect-and-alert/validate-and-test-rules.md
+              title: Validate and test rules
+          - page: docs-content://solutions/security/detect-and-alert/manage-detection-rules.md
+            title: Manage detection rules
+          - group: Monitor rule executions
+            page: docs-content://solutions/security/detect-and-alert/monitor-rule-executions.md
+            children:
+            - page: docs-content://solutions/security/detect-and-alert/fill-rule-gaps.md
+              title: Fill rule execution gaps
+          - group: Reduce noise and false positives
+            page: docs-content://solutions/security/detect-and-alert/reduce-noise-and-false-positives.md
+            children:
+            - page: docs-content://solutions/security/detect-and-alert/tune-detection-rules.md
+              title: Tune detection rules
+            - group: Rule exceptions
+              page: docs-content://solutions/security/detect-and-alert/rule-exceptions.md
+              children:
+              - page: docs-content://solutions/security/detect-and-alert/create-manage-value-lists.md
+                title: Create and manage value lists
+              - page: docs-content://solutions/security/detect-and-alert/add-manage-exceptions.md
+                title: Add and manage exceptions
+              - page: docs-content://solutions/security/detect-and-alert/create-manage-shared-exception-lists.md
+                title: Create and manage shared exception lists
+            - page: docs-content://solutions/security/detect-and-alert/alert-suppression.md
+              title: Suppress detection alerts
+          - group: Manage detection alerts
+            page: docs-content://solutions/security/detect-and-alert/manage-detection-alerts.md
+            children:
+            - page: docs-content://solutions/security/detect-and-alert/visualize-detection-alerts.md
+              title: Visualize detection alerts
+            - page: docs-content://solutions/security/detect-and-alert/view-detection-alert-details.md
+              title: View detection alert details
+            - page: docs-content://solutions/security/detect-and-alert/query-alert-indices.md
+              title: Query alert indices
+        - group: "Configure endpoint protection with {{elastic-defend}}"
+          page: docs-content://solutions/security/configure-elastic-defend.md
+          children:
+          - page: docs-content://solutions/security/configure-elastic-defend/elastic-defend-requirements.md
+            title: "{{elastic-defend}} requirements"
+          - group: "Install {{elastic-defend}}"
+            page: docs-content://solutions/security/configure-elastic-defend/install-elastic-defend.md
+            children:
+            - page: docs-content://solutions/security/configure-elastic-defend/enable-access-for-macos.md
+              title: Enable access on macOS
+            - page: docs-content://solutions/security/configure-elastic-defend/deploy-on-macos-with-mdm.md
+              title: Deploy on macOS with MDM
+            - page: docs-content://solutions/security/configure-elastic-defend/prevent-elastic-agent-uninstallation.md
+              title: Prevent Elastic Agent uninstallation
+          - page: docs-content://solutions/security/configure-elastic-defend/elastic-defend-feature-privileges.md
+            title: "{{elastic-defend}} feature privileges"
+          - group: "Configure an integration policy for {{elastic-defend}}"
+            page: docs-content://solutions/security/configure-elastic-defend/configure-an-integration-policy-for-elastic-defend.md
+            children:
+            - page: docs-content://solutions/security/configure-elastic-defend/configure-updates-for-protection-artifacts.md
+              title: Configure updates for protection artifacts
+            - page: docs-content://solutions/security/configure-elastic-defend/turn-off-diagnostic-data-for-elastic-defend.md
+              title: "Turn off diagnostic data for {{elastic-defend}}"
+            - page: docs-content://solutions/security/configure-elastic-defend/configure-self-healing-rollback-for-windows-endpoints.md
+              title: Configure self-healing rollback for Windows endpoints
+            - page: docs-content://solutions/security/configure-elastic-defend/configure-linux-file-system-monitoring.md
+              title: Configure Linux file system monitoring
+            - page: docs-content://solutions/security/configure-elastic-defend/configure-data-volume-for-elastic-endpoint.md
+              title: Configure data volume
+            - page: docs-content://solutions/security/configure-elastic-defend/create-an-elastic-defend-policy-using-api.md
+              title: Create an Elastic Defend policy using API
+          - page: docs-content://solutions/security/configure-elastic-defend/configure-offline-endpoints-air-gapped-environments.md
+            title: Configure offline endpoints and air-gapped environments
+          - page: docs-content://solutions/security/configure-elastic-defend/uninstall-elastic-agent.md
+            title: Uninstall Elastic Agent
+        - group: "Manage {{elastic-defend}}"
+          page: docs-content://solutions/security/manage-elastic-defend.md
+          children:
+          - page: docs-content://solutions/security/manage-elastic-defend/endpoints.md
+            title: Endpoints
+          - page: docs-content://solutions/security/manage-elastic-defend/policies.md
+            title: Policies
+          - page: docs-content://solutions/security/manage-elastic-defend/trusted-applications.md
+            title: Trusted applications
+          - page: docs-content://solutions/security/manage-elastic-defend/trusted-devices.md
+            title: Trusted devices
+          - page: docs-content://solutions/security/manage-elastic-defend/event-filters.md
+            title: Event filters
+          - page: docs-content://solutions/security/manage-elastic-defend/host-isolation-exceptions.md
+            title: Host isolation exceptions
+          - page: docs-content://solutions/security/manage-elastic-defend/blocklist.md
+            title: Blocklist
+          - page: docs-content://solutions/security/manage-elastic-defend/optimize-elastic-defend.md
+            title: "Optimize {{elastic-defend}}"
+          - page: docs-content://solutions/security/manage-elastic-defend/event-capture-elastic-defend.md
+            title: "Event capture and {{elastic-defend}}"
+          - page: docs-content://solutions/security/manage-elastic-defend/endpoint-protection-rules.md
+            title: Endpoint protection rules
+          - page: docs-content://solutions/security/manage-elastic-defend/automatic-troubleshooting.md
+            title: Automatic troubleshooting
+          - page: docs-content://solutions/security/manage-elastic-defend/allowlist-elastic-endpoint-in-third-party-antivirus-apps.md
+            title: "Allowlist {{elastic-endpoint}} in third-party antivirus apps"
+          - page: docs-content://solutions/security/manage-elastic-defend/elastic-endpoint-self-protection-features.md
+            title: "{{elastic-endpoint}} self-protection features"
+        - group: Endpoint response actions
+          page: docs-content://solutions/security/endpoint-response-actions.md
+          children:
+          - page: docs-content://solutions/security/endpoint-response-actions/automated-response-actions.md
+            title: Automated response actions
+          - page: docs-content://solutions/security/endpoint-response-actions/isolate-host.md
+            title: Isolate a host
+          - page: docs-content://solutions/security/endpoint-response-actions/response-actions-history.md
+            title: Response actions history
+          - page: docs-content://solutions/security/endpoint-response-actions/third-party-response-actions.md
+            title: Third-party response actions
+          - page: docs-content://solutions/security/endpoint-response-actions/configure-third-party-response-actions.md
+            title: Configure third-party response actions
+        - group: Cloud Security
+          page: docs-content://solutions/security/cloud.md
+          children:
+          - page: docs-content://solutions/security/cloud/security-posture-management-overview.md
+            title: Security posture management overview
+          - page: docs-content://solutions/security/cloud/enable-cloud-security-features.md
+            title: "Enable cloud security features in {{serverless-short}}"
+          - group: Cloud security posture management
+            page: docs-content://solutions/security/cloud/cloud-security-posture-management.md
+            children:
+            - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-aws.md
+              title: Get started with CSPM for AWS
+            - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-gcp.md
+              title: Get started with CSPM for GCP
+            - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-azure.md
+              title: Get started with CSPM for Azure
+            - page: docs-content://solutions/security/cloud/cspm-privilege-requirements.md
+              title: CSPM privilege requirements
+            - page: docs-content://solutions/security/cloud/findings-page.md
+              title: CSPM Findings
+            - page: docs-content://solutions/security/cloud/benchmarks.md
+              title: CSPM benchmarks
+            - page: docs-content://solutions/security/cloud/cspm-dashboard.md
+              title: Cloud Security Posture dashboard
+            - page: docs-content://solutions/security/cloud/cspm-frequently-asked-questions-faq.md
+              title: Frequently asked questions (FAQ)
+          - group: Kubernetes security posture management
+            page: docs-content://solutions/security/cloud/kubernetes-security-posture-management.md
+            children:
+            - page: docs-content://solutions/security/cloud/get-started-with-kspm.md
+              title: Get started with KSPM
+            - page: docs-content://solutions/security/cloud/findings-page-2.md
+              title: KSPM Findings
+            - page: docs-content://solutions/security/cloud/kspm-benchmarks.md
+              title: KSPM benchmarks
+            - page: docs-content://solutions/security/cloud/kspm-dashboard.md
+              title: Cloud Security Posture dashboard
+            - page: docs-content://solutions/security/cloud/kspm-frequently-asked-questions.md
+              title: Frequently asked questions (FAQ)
+          - group: Cloud Asset Discovery
+            page: docs-content://solutions/security/cloud/asset-disc.md
+            children:
+            - page: docs-content://solutions/security/cloud/asset-disc-aws.md
+              title: Set up Cloud Asset Discovery for AWS
+            - page: docs-content://solutions/security/cloud/asset-disc-gcp.md
+              title: Set up Cloud Asset Discovery for GCP
+            - page: docs-content://solutions/security/cloud/asset-disc-azure.md
+              title: Set up Cloud Asset Discovery for Azure
+          - group: Cloud native vulnerability management
+            page: docs-content://solutions/security/cloud/cloud-native-vulnerability-management.md
+            children:
+            - page: docs-content://solutions/security/cloud/get-started-with-cnvm.md
+              title: Get started with CNVM
+            - page: docs-content://solutions/security/cloud/cnvm-privilege-requirements.md
+              title: CNVM privilege requirements
+            - page: docs-content://solutions/security/cloud/findings-page-3.md
+              title: CNVM Findings
+            - page: docs-content://solutions/security/cloud/cnvm-dashboard.md
+              title: CNVM dashboard
+            - page: docs-content://solutions/security/cloud/cnvm-frequently-asked-questions-faq.md
+              title: Frequently asked questions (FAQ)
+          - group: Cloud workload protection for VMs
+            page: docs-content://solutions/security/cloud/cloud-workload-protection-for-vms.md
+            children:
+            - page: docs-content://solutions/security/cloud/capture-environment-variables.md
+              title: Capture environment variables
+          - group: Cloud workload protection for Kubernetes
+            page: docs-content://solutions/security/cloud/d4c/d4c-overview.md
+            children:
+            - page: docs-content://solutions/security/cloud/d4c/get-started-with-d4c.md
+              title: Get started with Defend for Containers for Kubernetes
+            - page: docs-content://solutions/security/cloud/d4c/d4c-policies.md
+              title: Container workload protection policies
+            - page: docs-content://solutions/security/cloud/d4c/kubernetes-dashboard.md
+              title: Kubernetes dashboard
+        - group: Ingest third-party security data
+          page: docs-content://solutions/security/integrations/ingest-third-party-security-data.md
+          children:
+          - page: docs-content://solutions/security/integrations/aws-config.md
+            title: AWS Config
+          - page: docs-content://solutions/security/integrations/aws-inspector.md
+            title: AWS Inspector
+          - page: docs-content://solutions/security/integrations/aws-sec-hub.md
+            title: AWS Security Hub
+          - page: docs-content://solutions/security/integrations/aws-security-hub-cspm.md
+            title: AWS Security Hub CSPM
+          - page: docs-content://solutions/security/integrations/cncf-falco.md
+            title: CNCF Falco
+          - page: docs-content://solutions/security/integrations/google-security-command-center.md
+            title: Google Security Command Center
+          - page: docs-content://solutions/security/integrations/microsoft-defender-for-cloud.md
+            title: Microsoft Defender for Cloud
+          - page: docs-content://solutions/security/integrations/microsoft-defender-for-endpoint.md
+            title: Microsoft Defender for Endpoint
+          - page: docs-content://solutions/security/integrations/microsoft-defender-xdr.md
+            title: Microsoft Defender XDR
+          - page: docs-content://solutions/security/integrations/prisma-cloud.md
+            title: Prisma Cloud
+          - page: docs-content://solutions/security/integrations/qualys.md
+            title: Qualys VMDR
+          - page: docs-content://solutions/security/integrations/rapid7.md
+            title: Rapid7 InsightVM
+          - page: docs-content://solutions/security/integrations/tenablevm.md
+            title: Tenable VM
+          - page: docs-content://solutions/security/integrations/wiz.md
+            title: Wiz
+        - group: Investigation tools
+          page: docs-content://solutions/security/investigate.md
+          children:
+          - group: Timeline
+            page: docs-content://solutions/security/investigate/timeline.md
+            children:
+            - page: docs-content://solutions/security/investigate/timeline-templates.md
+              title: Timeline templates
+          - page: docs-content://solutions/security/investigate/visual-event-analyzer.md
+            title: Visual event analyzer
+          - page: docs-content://solutions/security/investigate/session-view.md
+            title: Session View
+          - group: Osquery
+            page: docs-content://solutions/security/investigate/osquery.md
+            children:
+            - page: docs-content://solutions/security/investigate/manage-integration.md
+              title: Osquery manager integration
+            - page: docs-content://solutions/security/investigate/osquery-faq.md
+              title: Osquery FAQ
+            - page: docs-content://solutions/security/investigate/add-osquery-response-actions.md
+              title: Add Osquery Response Actions
+            - page: docs-content://solutions/security/investigate/run-osquery-from-investigation-guides.md
+              title: Run Osquery from investigation guides
+            - page: docs-content://solutions/security/investigate/run-osquery-from-alerts.md
+              title: Run Osquery from alerts
+            - page: docs-content://solutions/security/investigate/examine-osquery-results.md
+              title: Examine Osquery results
+            - page: docs-content://solutions/security/investigate/use-placeholder-fields-in-osquery-queries.md
+              title: Use placeholder fields in Osquery queries
+          - page: docs-content://solutions/security/investigate/notes.md
+            title: Notes
+          - page: docs-content://solutions/security/investigate/indicators-of-compromise.md
+            title: Indicators of compromise
+          - page: docs-content://solutions/security/investigate/security-cases.md
+            title: Cases
+        - group: Dashboards
+          page: docs-content://solutions/security/dashboards.md
           children:
-          - page: docs-content://solutions/security/cloud/get-started-with-kspm.md
-            title: Get started with KSPM
-          - page: docs-content://solutions/security/cloud/findings-page-2.md
-            title: KSPM Findings
-          - page: docs-content://solutions/security/cloud/kspm-benchmarks.md
-            title: KSPM benchmarks
-          - page: docs-content://solutions/security/cloud/kspm-dashboard.md
+          - page: docs-content://solutions/security/dashboards/overview-dashboard.md
+            title: Overview dashboard
+          - page: docs-content://solutions/security/dashboards/detection-response-dashboard.md
+            title: "Detection & Response dashboard"
+          - page: docs-content://solutions/security/dashboards/cloud-security-posture-dashboard.md
             title: Cloud Security Posture dashboard
-          - page: docs-content://solutions/security/cloud/kspm-frequently-asked-questions.md
-            title: Frequently asked questions (FAQ)
-        - group: Cloud Asset Discovery
-          page: docs-content://solutions/security/cloud/asset-disc.md
-          children:
-          - page: docs-content://solutions/security/cloud/asset-disc-aws.md
-            title: Set up Cloud Asset Discovery for AWS
-          - page: docs-content://solutions/security/cloud/asset-disc-gcp.md
-            title: Set up Cloud Asset Discovery for GCP
-          - page: docs-content://solutions/security/cloud/asset-disc-azure.md
-            title: Set up Cloud Asset Discovery for Azure
-        - group: Cloud native vulnerability management
-          page: docs-content://solutions/security/cloud/cloud-native-vulnerability-management.md
-          children:
-          - page: docs-content://solutions/security/cloud/get-started-with-cnvm.md
-            title: Get started with CNVM
-          - page: docs-content://solutions/security/cloud/cnvm-privilege-requirements.md
-            title: CNVM privilege requirements
-          - page: docs-content://solutions/security/cloud/findings-page-3.md
-            title: CNVM Findings
-          - page: docs-content://solutions/security/cloud/cnvm-dashboard.md
-            title: CNVM dashboard
-          - page: docs-content://solutions/security/cloud/cnvm-frequently-asked-questions-faq.md
-            title: Frequently asked questions (FAQ)
-        - group: Cloud workload protection for VMs
-          page: docs-content://solutions/security/cloud/cloud-workload-protection-for-vms.md
-          children:
-          - page: docs-content://solutions/security/cloud/capture-environment-variables.md
-            title: Capture environment variables
-        - group: Cloud workload protection for Kubernetes
-          page: docs-content://solutions/security/cloud/d4c/d4c-overview.md
-          children:
-          - page: docs-content://solutions/security/cloud/d4c/get-started-with-d4c.md
-            title: Get started with Defend for Containers for Kubernetes
-          - page: docs-content://solutions/security/cloud/d4c/d4c-policies.md
-            title: Container workload protection policies
-          - page: docs-content://solutions/security/cloud/d4c/kubernetes-dashboard.md
+          - page: docs-content://solutions/security/dashboards/kubernetes-dashboard.md
             title: Kubernetes dashboard
-      - group: Ingest third-party security data
-        page: docs-content://solutions/security/integrations/ingest-third-party-security-data.md
-        children:
-        - page: docs-content://solutions/security/integrations/aws-config.md
-          title: AWS Config
-        - page: docs-content://solutions/security/integrations/aws-inspector.md
-          title: AWS Inspector
-        - page: docs-content://solutions/security/integrations/aws-sec-hub.md
-          title: AWS Security Hub
-        - page: docs-content://solutions/security/integrations/aws-security-hub-cspm.md
-          title: AWS Security Hub CSPM
-        - page: docs-content://solutions/security/integrations/cncf-falco.md
-          title: CNCF Falco
-        - page: docs-content://solutions/security/integrations/google-security-command-center.md
-          title: Google Security Command Center
-        - page: docs-content://solutions/security/integrations/microsoft-defender-for-cloud.md
-          title: Microsoft Defender for Cloud
-        - page: docs-content://solutions/security/integrations/microsoft-defender-for-endpoint.md
-          title: Microsoft Defender for Endpoint
-        - page: docs-content://solutions/security/integrations/microsoft-defender-xdr.md
-          title: Microsoft Defender XDR
-        - page: docs-content://solutions/security/integrations/prisma-cloud.md
-          title: Prisma Cloud
-        - page: docs-content://solutions/security/integrations/qualys.md
-          title: Qualys VMDR
-        - page: docs-content://solutions/security/integrations/rapid7.md
-          title: Rapid7 InsightVM
-        - page: docs-content://solutions/security/integrations/tenablevm.md
-          title: Tenable VM
-        - page: docs-content://solutions/security/integrations/wiz.md
-          title: Wiz
-      - group: Investigation tools
-        page: docs-content://solutions/security/investigate.md
-        children:
-        - group: Timeline
-          page: docs-content://solutions/security/investigate/timeline.md
-          children:
-          - page: docs-content://solutions/security/investigate/timeline-templates.md
-            title: Timeline templates
-        - page: docs-content://solutions/security/investigate/visual-event-analyzer.md
-          title: Visual event analyzer
-        - page: docs-content://solutions/security/investigate/session-view.md
-          title: Session View
-        - group: Osquery
-          page: docs-content://solutions/security/investigate/osquery.md
-          children:
-          - page: docs-content://solutions/security/investigate/manage-integration.md
-            title: Osquery manager integration
-          - page: docs-content://solutions/security/investigate/osquery-faq.md
-            title: Osquery FAQ
-          - page: docs-content://solutions/security/investigate/add-osquery-response-actions.md
-            title: Add Osquery Response Actions
-          - page: docs-content://solutions/security/investigate/run-osquery-from-investigation-guides.md
-            title: Run Osquery from investigation guides
-          - page: docs-content://solutions/security/investigate/run-osquery-from-alerts.md
-            title: Run Osquery from alerts
-          - page: docs-content://solutions/security/investigate/examine-osquery-results.md
-            title: Examine Osquery results
-          - page: docs-content://solutions/security/investigate/use-placeholder-fields-in-osquery-queries.md
-            title: Use placeholder fields in Osquery queries
-        - page: docs-content://solutions/security/investigate/notes.md
-          title: Notes
-        - page: docs-content://solutions/security/investigate/indicators-of-compromise.md
-          title: Indicators of compromise
-        - page: docs-content://solutions/security/investigate/security-cases.md
-          title: Cases
-      - group: Dashboards
-        page: docs-content://solutions/security/dashboards.md
-        children:
-        - page: docs-content://solutions/security/dashboards/overview-dashboard.md
-          title: Overview dashboard
-        - page: docs-content://solutions/security/dashboards/detection-response-dashboard.md
-          title: "Detection & Response dashboard"
-        - page: docs-content://solutions/security/dashboards/cloud-security-posture-dashboard.md
-          title: Cloud Security Posture dashboard
-        - page: docs-content://solutions/security/dashboards/kubernetes-dashboard.md
-          title: Kubernetes dashboard
-        - page: docs-content://solutions/security/dashboards/entity-analytics-dashboard.md
-          title: Entity Analytics dashboard
-        - page: docs-content://solutions/security/dashboards/data-quality-dashboard.md
-          title: Data Quality dashboard
-        - page: docs-content://solutions/security/dashboards/cloud-native-vulnerability-management-dashboard.md
-          title: Cloud Native Vulnerability Management Dashboard
-        - page: docs-content://solutions/security/dashboards/detection-rule-monitoring-dashboard.md
-          title: Detection rule monitoring dashboard
-        - page: docs-content://solutions/security/dashboards/endpoint-detection-response-dashboard.md
-          title: Endpoint Detection and Response dashboard
-      - group: Entity analytics
-        page: docs-content://solutions/security/advanced-entity-analytics.md
-        children:
-        - page: docs-content://solutions/security/advanced-entity-analytics/overview.md
-          title: Entity analytics overview
-        - group: Entity risk scoring
-          page: docs-content://solutions/security/advanced-entity-analytics/entity-risk-scoring.md
-          children:
-          - page: docs-content://solutions/security/advanced-entity-analytics/entity-risk-scoring-requirements.md
-            title: Entity risk scoring requirements
-          - page: docs-content://solutions/security/advanced-entity-analytics/turn-on-risk-scoring-engine.md
-            title: Turn on the risk scoring engine
-          - page: docs-content://solutions/security/advanced-entity-analytics/view-entity-details.md
-            title: View entity details
-          - page: docs-content://solutions/security/advanced-entity-analytics/asset-criticality.md
-            title: Asset criticality
-          - page: docs-content://solutions/security/advanced-entity-analytics/entity-store.md
-            title: Entity store
-          - page: docs-content://solutions/security/advanced-entity-analytics/view-analyze-risk-score-data.md
-            title: View and analyze risk score data
-        - group: Advanced behavioral detections
-          page: docs-content://solutions/security/advanced-entity-analytics/advanced-behavioral-detections.md
-          children:
-          - page: docs-content://solutions/security/advanced-entity-analytics/machine-learning-job-rule-requirements.md
-            title: Machine learning job and rule requirements
-          - page: docs-content://solutions/security/advanced-entity-analytics/anomaly-detection.md
-            title: Anomaly detection
-          - page: docs-content://solutions/security/advanced-entity-analytics/optimizing-anomaly-results.md
-            title: Optimizing anomaly results
-          - page: docs-content://solutions/security/advanced-entity-analytics/behavioral-detection-use-cases.md
-            title: Behavioral detection use cases
-        - group: Privileged user monitoring
-          page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring.md
-          children:
-          - page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring-requirements.md
-            title: Privileged user monitoring requirements
-          - page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring-setup.md
-            title: Set up privileged user monitoring
-          - page: docs-content://solutions/security/advanced-entity-analytics/monitor-privileged-user-activitites.md
-            title: Monitor privileged user activities
-        - group: Explore
-          page: docs-content://solutions/security/advanced-entity-analytics/explore.md
-          children:
-          - page: docs-content://solutions/security/advanced-entity-analytics/hosts-page.md
-            title: Hosts page
-          - group: Network page
-            page: docs-content://solutions/security/advanced-entity-analytics/network-page.md
-            children:
-            - page: docs-content://solutions/security/advanced-entity-analytics/configure-network-map-data.md
-              title: Configure network map data
-            - page: docs-content://solutions/security/advanced-entity-analytics/configure-dns-histogram.md
-              title: Configure the DNS histogram
-          - page: docs-content://solutions/security/advanced-entity-analytics/users-page.md
-            title: Users page
-      - page: docs-content://solutions/security/security-serverless-feature-tiers.md
-        title: Serverless feature tiers
-      - page: docs-content://solutions/security/apis.md
-        title: APIs
-#  - label: Reference
-#    children:
-#    - toc: elasticsearch://reference/elasticsearch
-#    - toc: kibana://reference
-#    - group: Cloud
-#      children:
-#      - toc: cloud://reference
-#      - toc: cloud-on-k8s://reference
-#    - toc: docs-content://reference/security
-#    - toc: docs-content://reference/observability
-#    - toc: ecs://reference
-#    - toc: docs-content://reference/machine-learning
-#    - toc: search-ui://reference
-#    - toc: elasticsearch://reference/aggregations
-#    - toc: ecctl://reference
-#    - toc: docs-content://reference/elasticsearch-clients
-#    - toc: elasticsearch://reference/enrich-processor
-#    - toc: elasticsearch://reference/query-languages
-#    - toc: elasticsearch://reference/scripting-languages
-#    - page: docs-content://explore-analyze/numeral-formatting.md
-#      title: Numeral formatting
-#    - toc: elasticsearch://reference/text-analysis
-#    - toc: docs-content://reference/glossary
-#  - label: Troubleshooting
-#    children:
-#    - group: Troubleshoot Elasticsearch
-#      children:
-#      - page: docs-content://troubleshoot/elasticsearch/add-repository.md
-#        title: Troubleshoot broken repositories
-#      - page: docs-content://troubleshoot/elasticsearch/add-tier.md
-#        title: Add a preferred data tier
-#      - page: docs-content://troubleshoot/elasticsearch/allow-all-cluster-allocation.md
-#        title: Allow cluster-wide shard allocation
-#      - page: docs-content://troubleshoot/elasticsearch/allow-all-index-allocation.md
-#        title: Allow index shard allocation
-#      - page: docs-content://troubleshoot/elasticsearch/cluster-allocation-api-examples.md
-#        title: Using the cluster allocation API
-#      - page: docs-content://troubleshoot/elasticsearch/corruption-troubleshooting.md
-#        title: Troubleshoot data corruption
-#      - page: docs-content://troubleshoot/elasticsearch/discovery-troubleshooting.md
-#        title: Troubleshoot discovery
-#      - page: docs-content://troubleshoot/elasticsearch/file-based-recovery.md
-#        title: File-based access recovery
-#      - page: docs-content://troubleshoot/elasticsearch/fix-common-cluster-issues.md
-#        title: Fix common cluster issues
-#      - page: docs-content://troubleshoot/elasticsearch/fix-data-node-out-of-disk.md
-#        title: Fix data nodes out of disk
-#      - page: docs-content://troubleshoot/elasticsearch/fix-master-node-out-of-disk.md
-#        title: Fix master nodes out of disk
-#      - page: docs-content://troubleshoot/elasticsearch/fix-other-node-out-of-disk.md
-#        title: Fix other role nodes out of disk
-#      - page: docs-content://troubleshoot/elasticsearch/fix-watermark-errors.md
-#        title: Watermark errors
-#      - page: docs-content://troubleshoot/elasticsearch/increase-cluster-shard-limit.md
-#        title: Total shards per node has been reached
-#      - page: docs-content://troubleshoot/elasticsearch/increase-shard-limit.md
-#        title: Total shards for an index exceeded
-#      - page: docs-content://troubleshoot/elasticsearch/diagnose-unassigned-shards.md
-#        title: Not enough nodes to allocate shard replicas
-#      - page: docs-content://troubleshoot/elasticsearch/index-lifecycle-management-errors.md
-#        title: Fix index lifecycle management errors
-#      - page: docs-content://troubleshoot/elasticsearch/monitoring-troubleshooting.md
-#        title: Troubleshoot monitoring
-#      - page: docs-content://troubleshoot/elasticsearch/remote-clusters.md
-#        title: Troubleshoot remote clusters
-#      - page: docs-content://troubleshoot/elasticsearch/repeated-snapshot-failures.md
-#        title: Fix repeated snapshot policy failures
-#      - page: docs-content://troubleshoot/elasticsearch/restore-from-snapshot.md
-#        title: Restore from snapshot
-#      - page: docs-content://troubleshoot/elasticsearch/start-ilm.md
-#        title: Troubleshoot snapshot and ILM
-#      - page: docs-content://troubleshoot/elasticsearch/transform-troubleshooting.md
-#        title: Troubleshoot transforms
-#      - page: docs-content://troubleshoot/elasticsearch/troubleshoot-ingest-pipelines.md
-#        title: Troubleshoot ingest pipelines
-#      - page: docs-content://troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
-#        title: Troubleshoot incomplete migration to data tiers
-#      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-searches.md
-#        title: Troubleshoot searches
-#      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md
-#        title: Troubleshoot shard capacity health issues
-#      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-unbalanced-cluster.md
-#        title: Troubleshoot an unbalanced cluster
-#      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-unstable-cluster.md
-#        title: Troubleshoot an unstable cluster
-#      - page: docs-content://troubleshoot/elasticsearch/watcher-troubleshooting.md
-#        title: Troubleshoot Watcher
-#    - group: Troubleshoot Kibana
-#      children:
-#      - page: docs-content://troubleshoot/kibana/access.md
-#        title: Check Kibana server status
-#      - page: docs-content://troubleshoot/kibana/alerts.md
-#        title: Troubleshoot Kibana alerts
-#      - page: docs-content://troubleshoot/kibana/capturing-diagnostics.md
-#        title: Capture Kibana diagnostics
-#      - page: docs-content://troubleshoot/kibana/error-server-not-ready.md
-#        title: "Error: Kibana server is not ready yet"
-#      - page: docs-content://troubleshoot/kibana/graph.md
-#        title: Troubleshoot graph analytics
-#      - page: docs-content://troubleshoot/kibana/maps.md
-#        title: Troubleshoot Kibana Maps
-#      - page: docs-content://troubleshoot/kibana/migration-failures.md
-#        title: Troubleshoot Kibana migration and upgrades
-#      - page: docs-content://troubleshoot/kibana/monitoring.md
-#        title: Troubleshoot Kibana monitoring
-#      - page: docs-content://troubleshoot/kibana/reporting.md
-#        title: Troubleshoot Kibana reporting
-#      - page: docs-content://troubleshoot/kibana/task-manager.md
-#        title: Troubleshoot Kibana Task Manager
-#      - page: docs-content://troubleshoot/kibana/trace-elasticsearch-query-to-the-origin-in-kibana.md
-#        title: Trace an Elasticsearch query in Kibana
-#      - page: docs-content://troubleshoot/kibana/using-kibana-server-logs.md
-#        title: Using Kibana server logs
-#    - group: Troubleshoot Observability
-#      children:
-#      - page: docs-content://troubleshoot/observability/explore-data.md
-#        title: Explore data
-#      - page: docs-content://troubleshoot/observability/inspect.md
-#        title: Inspect
-#    - group: Troubleshoot Security
-#      children:
-#      - page: docs-content://troubleshoot/security/agentless-integrations.md
-#        title: Troubleshoot agentless integrations
-#      - page: docs-content://troubleshoot/security/detection-rules.md
-#        title: Troubleshoot detection rules
-#      - page: docs-content://troubleshoot/security/elastic-defend.md
-#        title: Troubleshoot Elastic Defend
-#      - page: docs-content://troubleshoot/security/indicators-of-compromise.md
-#        title: Troubleshoot indicators of compromise
-#    - group: Troubleshoot ingestion tools
-#      children:
-#      - page: docs-content://troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md
-#        title: Beats logging plugin
-#      - page: docs-content://troubleshoot/ingest/elastic-serverless-forwarder.md
-#        title: Troubleshoot Elastic Serverless Forwarder
-#      - page: docs-content://troubleshoot/ingest/fleet/fleet-elastic-agent.md
-#        title: Troubleshoot Fleet
-#      - page: docs-content://troubleshoot/ingest/logstash.md
-#        title: Troubleshoot Logstash
-#      - page: docs-content://troubleshoot/ingest/opentelemetry/index.md
-#        title: Troubleshoot EDOT
+          - page: docs-content://solutions/security/dashboards/entity-analytics-dashboard.md
+            title: Entity Analytics dashboard
+          - page: docs-content://solutions/security/dashboards/data-quality-dashboard.md
+            title: Data Quality dashboard
+          - page: docs-content://solutions/security/dashboards/cloud-native-vulnerability-management-dashboard.md
+            title: Cloud Native Vulnerability Management Dashboard
+          - page: docs-content://solutions/security/dashboards/detection-rule-monitoring-dashboard.md
+            title: Detection rule monitoring dashboard
+          - page: docs-content://solutions/security/dashboards/endpoint-detection-response-dashboard.md
+            title: Endpoint Detection and Response dashboard
+        - group: Entity analytics
+          page: docs-content://solutions/security/advanced-entity-analytics.md
+          children:
+          - page: docs-content://solutions/security/advanced-entity-analytics/overview.md
+            title: Entity analytics overview
+          - group: Entity risk scoring
+            page: docs-content://solutions/security/advanced-entity-analytics/entity-risk-scoring.md
+            children:
+            - page: docs-content://solutions/security/advanced-entity-analytics/entity-risk-scoring-requirements.md
+              title: Entity risk scoring requirements
+            - page: docs-content://solutions/security/advanced-entity-analytics/turn-on-risk-scoring-engine.md
+              title: Turn on the risk scoring engine
+            - page: docs-content://solutions/security/advanced-entity-analytics/view-entity-details.md
+              title: View entity details
+            - page: docs-content://solutions/security/advanced-entity-analytics/asset-criticality.md
+              title: Asset criticality
+            - page: docs-content://solutions/security/advanced-entity-analytics/entity-store.md
+              title: Entity store
+            - page: docs-content://solutions/security/advanced-entity-analytics/view-analyze-risk-score-data.md
+              title: View and analyze risk score data
+          - group: Advanced behavioral detections
+            page: docs-content://solutions/security/advanced-entity-analytics/advanced-behavioral-detections.md
+            children:
+            - page: docs-content://solutions/security/advanced-entity-analytics/machine-learning-job-rule-requirements.md
+              title: Machine learning job and rule requirements
+            - page: docs-content://solutions/security/advanced-entity-analytics/anomaly-detection.md
+              title: Anomaly detection
+            - page: docs-content://solutions/security/advanced-entity-analytics/optimizing-anomaly-results.md
+              title: Optimizing anomaly results
+            - page: docs-content://solutions/security/advanced-entity-analytics/behavioral-detection-use-cases.md
+              title: Behavioral detection use cases
+          - group: Privileged user monitoring
+            page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring.md
+            children:
+            - page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring-requirements.md
+              title: Privileged user monitoring requirements
+            - page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring-setup.md
+              title: Set up privileged user monitoring
+            - page: docs-content://solutions/security/advanced-entity-analytics/monitor-privileged-user-activitites.md
+              title: Monitor privileged user activities
+          - group: Explore
+            page: docs-content://solutions/security/advanced-entity-analytics/explore.md
+            children:
+            - page: docs-content://solutions/security/advanced-entity-analytics/hosts-page.md
+              title: Hosts page
+            - group: Network page
+              page: docs-content://solutions/security/advanced-entity-analytics/network-page.md
+              children:
+              - page: docs-content://solutions/security/advanced-entity-analytics/configure-network-map-data.md
+                title: Configure network map data
+              - page: docs-content://solutions/security/advanced-entity-analytics/configure-dns-histogram.md
+                title: Configure the DNS histogram
+            - page: docs-content://solutions/security/advanced-entity-analytics/users-page.md
+              title: Users page
+        - page: docs-content://solutions/security/security-serverless-feature-tiers.md
+          title: Serverless feature tiers
+        - page: docs-content://solutions/security/apis.md
+          title: APIs
+  #  - label: Reference
+  #    children:
+  #    - toc: elasticsearch://reference/elasticsearch
+  #    - toc: kibana://reference
+  #    - group: Cloud
+  #      children:
+  #      - toc: cloud://reference
+  #      - toc: cloud-on-k8s://reference
+  #    - toc: docs-content://reference/security
+  #    - toc: docs-content://reference/observability
+  #    - toc: ecs://reference
+  #    - toc: docs-content://reference/machine-learning
+  #    - toc: search-ui://reference
+  #    - toc: elasticsearch://reference/aggregations
+  #    - toc: ecctl://reference
+  #    - toc: docs-content://reference/elasticsearch-clients
+  #    - toc: elasticsearch://reference/enrich-processor
+  #    - toc: elasticsearch://reference/query-languages
+  #    - toc: elasticsearch://reference/scripting-languages
+  #    - page: docs-content://explore-analyze/numeral-formatting.md
+  #      title: Numeral formatting
+  #    - toc: elasticsearch://reference/text-analysis
+  #    - toc: docs-content://reference/glossary
+  #  - label: Troubleshooting
+  #    children:
+  #    - group: Troubleshoot Elasticsearch
+  #      children:
+  #      - page: docs-content://troubleshoot/elasticsearch/add-repository.md
+  #        title: Troubleshoot broken repositories
+  #      - page: docs-content://troubleshoot/elasticsearch/add-tier.md
+  #        title: Add a preferred data tier
+  #      - page: docs-content://troubleshoot/elasticsearch/allow-all-cluster-allocation.md
+  #        title: Allow cluster-wide shard allocation
+  #      - page: docs-content://troubleshoot/elasticsearch/allow-all-index-allocation.md
+  #        title: Allow index shard allocation
+  #      - page: docs-content://troubleshoot/elasticsearch/cluster-allocation-api-examples.md
+  #        title: Using the cluster allocation API
+  #      - page: docs-content://troubleshoot/elasticsearch/corruption-troubleshooting.md
+  #        title: Troubleshoot data corruption
+  #      - page: docs-content://troubleshoot/elasticsearch/discovery-troubleshooting.md
+  #        title: Troubleshoot discovery
+  #      - page: docs-content://troubleshoot/elasticsearch/file-based-recovery.md
+  #        title: File-based access recovery
+  #      - page: docs-content://troubleshoot/elasticsearch/fix-common-cluster-issues.md
+  #        title: Fix common cluster issues
+  #      - page: docs-content://troubleshoot/elasticsearch/fix-data-node-out-of-disk.md
+  #        title: Fix data nodes out of disk
+  #      - page: docs-content://troubleshoot/elasticsearch/fix-master-node-out-of-disk.md
+  #        title: Fix master nodes out of disk
+  #      - page: docs-content://troubleshoot/elasticsearch/fix-other-node-out-of-disk.md
+  #        title: Fix other role nodes out of disk
+  #      - page: docs-content://troubleshoot/elasticsearch/fix-watermark-errors.md
+  #        title: Watermark errors
+  #      - page: docs-content://troubleshoot/elasticsearch/increase-cluster-shard-limit.md
+  #        title: Total shards per node has been reached
+  #      - page: docs-content://troubleshoot/elasticsearch/increase-shard-limit.md
+  #        title: Total shards for an index exceeded
+  #      - page: docs-content://troubleshoot/elasticsearch/diagnose-unassigned-shards.md
+  #        title: Not enough nodes to allocate shard replicas
+  #      - page: docs-content://troubleshoot/elasticsearch/index-lifecycle-management-errors.md
+  #        title: Fix index lifecycle management errors
+  #      - page: docs-content://troubleshoot/elasticsearch/monitoring-troubleshooting.md
+  #        title: Troubleshoot monitoring
+  #      - page: docs-content://troubleshoot/elasticsearch/remote-clusters.md
+  #        title: Troubleshoot remote clusters
+  #      - page: docs-content://troubleshoot/elasticsearch/repeated-snapshot-failures.md
+  #        title: Fix repeated snapshot policy failures
+  #      - page: docs-content://troubleshoot/elasticsearch/restore-from-snapshot.md
+  #        title: Restore from snapshot
+  #      - page: docs-content://troubleshoot/elasticsearch/start-ilm.md
+  #        title: Troubleshoot snapshot and ILM
+  #      - page: docs-content://troubleshoot/elasticsearch/transform-troubleshooting.md
+  #        title: Troubleshoot transforms
+  #      - page: docs-content://troubleshoot/elasticsearch/troubleshoot-ingest-pipelines.md
+  #        title: Troubleshoot ingest pipelines
+  #      - page: docs-content://troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
+  #        title: Troubleshoot incomplete migration to data tiers
+  #      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-searches.md
+  #        title: Troubleshoot searches
+  #      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md
+  #        title: Troubleshoot shard capacity health issues
+  #      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-unbalanced-cluster.md
+  #        title: Troubleshoot an unbalanced cluster
+  #      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-unstable-cluster.md
+  #        title: Troubleshoot an unstable cluster
+  #      - page: docs-content://troubleshoot/elasticsearch/watcher-troubleshooting.md
+  #        title: Troubleshoot Watcher
+  #    - group: Troubleshoot Kibana
+  #      children:
+  #      - page: docs-content://troubleshoot/kibana/access.md
+  #        title: Check Kibana server status
+  #      - page: docs-content://troubleshoot/kibana/alerts.md
+  #        title: Troubleshoot Kibana alerts
+  #      - page: docs-content://troubleshoot/kibana/capturing-diagnostics.md
+  #        title: Capture Kibana diagnostics
+  #      - page: docs-content://troubleshoot/kibana/error-server-not-ready.md
+  #        title: "Error: Kibana server is not ready yet"
+  #      - page: docs-content://troubleshoot/kibana/graph.md
+  #        title: Troubleshoot graph analytics
+  #      - page: docs-content://troubleshoot/kibana/maps.md
+  #        title: Troubleshoot Kibana Maps
+  #      - page: docs-content://troubleshoot/kibana/migration-failures.md
+  #        title: Troubleshoot Kibana migration and upgrades
+  #      - page: docs-content://troubleshoot/kibana/monitoring.md
+  #        title: Troubleshoot Kibana monitoring
+  #      - page: docs-content://troubleshoot/kibana/reporting.md
+  #        title: Troubleshoot Kibana reporting
+  #      - page: docs-content://troubleshoot/kibana/task-manager.md
+  #        title: Troubleshoot Kibana Task Manager
+  #      - page: docs-content://troubleshoot/kibana/trace-elasticsearch-query-to-the-origin-in-kibana.md
+  #        title: Trace an Elasticsearch query in Kibana
+  #      - page: docs-content://troubleshoot/kibana/using-kibana-server-logs.md
+  #        title: Using Kibana server logs
+  #    - group: Troubleshoot Observability
+  #      children:
+  #      - page: docs-content://troubleshoot/observability/explore-data.md
+  #        title: Explore data
+  #      - page: docs-content://troubleshoot/observability/inspect.md
+  #        title: Inspect
+  #    - group: Troubleshoot Security
+  #      children:
+  #      - page: docs-content://troubleshoot/security/agentless-integrations.md
+  #        title: Troubleshoot agentless integrations
+  #      - page: docs-content://troubleshoot/security/detection-rules.md
+  #        title: Troubleshoot detection rules
+  #      - page: docs-content://troubleshoot/security/elastic-defend.md
+  #        title: Troubleshoot Elastic Defend
+  #      - page: docs-content://troubleshoot/security/indicators-of-compromise.md
+  #        title: Troubleshoot indicators of compromise
+  #    - group: Troubleshoot ingestion tools
+  #      children:
+  #      - page: docs-content://troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md
+  #        title: Beats logging plugin
+  #      - page: docs-content://troubleshoot/ingest/elastic-serverless-forwarder.md
+  #        title: Troubleshoot Elastic Serverless Forwarder
+  #      - page: docs-content://troubleshoot/ingest/fleet/fleet-elastic-agent.md
+  #        title: Troubleshoot Fleet
+  #      - page: docs-content://troubleshoot/ingest/logstash.md
+  #        title: Troubleshoot Logstash
+  #      - page: docs-content://troubleshoot/ingest/opentelemetry/index.md
+  #        title: Troubleshoot EDOT
+
+  - section: Release notes
+    url: /release-notes/
+    children:
+    - toc: docs-content://release-notes/intro
+
+  - section: Troubleshoot
+    url: /troubleshoot/
+    children:
+    - toc: docs-content://troubleshoot
+
+  - section: Reference
+    url: /reference/
+    children:
+    - toc: docs-content://reference
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index 736b5753db..26beb1709e 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -4,17 +4,10 @@
 	<ask-ai></ask-ai>
 	<nav id="secondary-nav" hx-select-oob="#main-container" hx-swap="none"
 	     class="bg-grey-10 border-b border-grey-20">
-		<div class="
-					w-full
-					max-w-(--max-layout-width) flex mx-auto justify-between items-center
-					px-4 py-6">
-			<div class="flex gap-2 flex-nowrap items-center font-sans font-semibold text-sm text-ink-light md:text-base">
-				<a href="@Model.Link("/")"
-				   class="text-lg leading-[1em] hover:text-blue-elastic active:text-blue-elastic-100">Docs</a>
-			</div>
+		<div class="w-full max-w-(--max-layout-width) mx-auto px-4 py-2">
 			@if (Model.NavV2Sections is { Count: > 0 } navTabs)
 			{
-				<ul class="flex gap-6 font-sans font-semibold text-sm text-ink-light md:text-base">
+				<ul class="flex gap-5 font-sans font-semibold text-sm text-ink-light">
 				@foreach (var navTab in navTabs.Where(s => !s.Isolated))
 				{
 					var isActive = navTab.Id == Model.ActiveSectionId;
@@ -34,36 +27,27 @@
 			}
 			else
 			{
-				<ul class="flex gap-6 font-sans font-semibold text-sm text-ink-light md:text-base">
+				<ul class="flex gap-5 font-sans font-semibold text-sm text-ink-light">
+					<li class="text-nowrap text-blue-elastic">
+						<a href="@Model.Link("/")">Docs</a>
+					</li>
 					<li class="text-nowrap hover:text-blue-elastic active:text-blue-elastic-100">
 						<a
 							href="@Model.Link("/release-notes/")"
-							@Model.Htmx.GetHxAttributes(
-								hxSwapOob: "#main-container,#secondary-nav"
-							)
-						>
-							Release notes
-						</a>
+							@Model.Htmx.GetHxAttributes(hxSwapOob: "#main-container,#secondary-nav")
+						>Release notes</a>
 					</li>
 					<li class="text-nowrap hover:text-blue-elastic active:text-blue-elastic-100">
 						<a
 							href="@Model.Link("/troubleshoot/")"
-							@Model.Htmx.GetHxAttributes(
-								hxSwapOob: "#main-container,#secondary-nav"
-							)
-						>
-							Troubleshoot
-						</a>
+							@Model.Htmx.GetHxAttributes(hxSwapOob: "#main-container,#secondary-nav")
+						>Troubleshoot</a>
 					</li>
 					<li class="text-nowrap hover:text-blue-elastic active:text-blue-elastic-100">
 						<a
 							href="@Model.Link("/reference/")"
-							@Model.Htmx.GetHxAttributes(
-								hxSwapOob: "#main-container,#secondary-nav"
-							)
-						>
-							Reference
-						</a>
+							@Model.Htmx.GetHxAttributes(hxSwapOob: "#main-container,#secondary-nav")
+						>Reference</a>
 					</li>
 				</ul>
 			}

From ef333f82d8724757b696497bac596a1b3d291ebc Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 16 Apr 2026 18:23:45 +0200
Subject: [PATCH 069/226] fix(nav-v2): compact left-aligned top bar, section
 root highlight, auto-expand

- Wrap all V2 content in a single "Docs" section; add Release notes,
  Troubleshoot, Reference as separate section tabs
- Secondary nav: left-aligned, 55px height, restored md:text-base font
- Skip current-page highlighting on section root pages via
  data-section-url attribute (includes site prefix)
- Auto-expand top-level folders on section root pages so content is
  visible without a specific page being marked current

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../Assets/pages-nav-v2.ts                    | 35 +++++++++++++++++++
 .../Layout/_SecondaryNav.cshtml               |  6 ++--
 .../Navigation/NavigationViewModel.cs         |  3 ++
 .../Navigation/_TocTree.cshtml                |  2 +-
 .../Navigation/GlobalNavigationHtmlWriter.cs  | 10 +++++-
 5 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 6dc3df3d40..8429b1545f 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -51,6 +51,23 @@ function normalizeDocPathname(pathname: string) {
     return p === '' ? '/' : p
 }
 
+/**
+ * Returns true when the current page is the section root URL.
+ * Section root pages should not get current-page highlighting in the sidebar
+ * because the section URL is a tab target, not a page within the nav tree.
+ */
+function isOnSectionRootPage(nav: HTMLElement): boolean {
+    const sectionUrl = nav.dataset.sectionUrl
+    if (!sectionUrl) {
+        return false
+    }
+
+    return (
+        normalizeDocPathname(window.location.pathname) ===
+        normalizeDocPathname(sectionUrl)
+    )
+}
+
 /** Matches {@link markCurrentPage} / {@link expandToCurrentPage} href selectors (not root-normalized). */
 function stripTrailingSlashForNavHref(pathname: string) {
     return pathname.replace(/\/$/, '')
@@ -318,6 +335,9 @@ function deepestCurrentSidebarLink(nav: HTMLElement): HTMLAnchorElement | null {
  */
 function applyActiveSubtreeHighlight(nav: HTMLElement) {
     clearActiveSubtreeHighlight(nav)
+    if (isOnSectionRootPage(nav)) {
+        return
+    }
     const current = deepestCurrentSidebarLink(nav)
     if (!current || !nav.contains(current)) {
         return
@@ -377,8 +397,13 @@ function markCurrentPageForPath(nav: HTMLElement, pathnameRaw: string) {
 
 /**
  * Mark the current page's nav link with the "current" CSS class.
+ * Skips marking when the current page is the section root URL.
  */
 function markCurrentPage(nav: HTMLElement) {
+    if (isOnSectionRootPage(nav)) {
+        $$('.current', nav).forEach((el) => el.classList.remove('current'))
+        return
+    }
     markCurrentPageForPath(nav, window.location.pathname)
 }
 
@@ -461,6 +486,16 @@ function expandToCurrentPageForPath(nav: HTMLElement, pathnameRaw: string) {
  * is the current page (see session storage + folder row link match).
  */
 function expandToCurrentPage(nav: HTMLElement) {
+    if (isOnSectionRootPage(nav)) {
+        // On the section root page, expand all top-level folders so the
+        // section content is visible even though no specific page is current.
+        nav.querySelectorAll<HTMLInputElement>(
+            '#nav-tree > li > .peer > input[type="checkbox"]'
+        ).forEach((cb) => {
+            cb.checked = true
+        })
+        return
+    }
     expandToCurrentPageForPath(nav, window.location.pathname)
 }
 
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index 26beb1709e..241298eba2 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -4,10 +4,10 @@
 	<ask-ai></ask-ai>
 	<nav id="secondary-nav" hx-select-oob="#main-container" hx-swap="none"
 	     class="bg-grey-10 border-b border-grey-20">
-		<div class="w-full max-w-(--max-layout-width) mx-auto px-4 py-2">
+		<div class="w-full max-w-(--max-layout-width) mx-auto px-4 h-[55px] flex items-center">
 			@if (Model.NavV2Sections is { Count: > 0 } navTabs)
 			{
-				<ul class="flex gap-5 font-sans font-semibold text-sm text-ink-light">
+				<ul class="flex gap-6 font-sans font-semibold text-sm text-ink-light md:text-base">
 				@foreach (var navTab in navTabs.Where(s => !s.Isolated))
 				{
 					var isActive = navTab.Id == Model.ActiveSectionId;
@@ -27,7 +27,7 @@
 			}
 			else
 			{
-				<ul class="flex gap-5 font-sans font-semibold text-sm text-ink-light">
+				<ul class="flex gap-6 font-sans font-semibold text-sm text-ink-light md:text-base">
 					<li class="text-nowrap text-blue-elastic">
 						<a href="@Model.Link("/")">Docs</a>
 					</li>
diff --git a/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs b/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
index a092e7ac17..ecc4eb7aef 100644
--- a/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
+++ b/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
@@ -29,4 +29,7 @@ public class NavigationViewModel
 
 	/// <summary>When true, the sidebar renders a back arrow instead of appearing in the top bar.</summary>
 	public bool IsIsolatedSection { get; init; }
+
+	/// <summary>The section's own URL, used by JS to skip current-page highlighting on the section root.</summary>
+	public string? SectionUrl { get; init; }
 }
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
index bfcb6f13f3..eb7477f717 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
@@ -83,7 +83,7 @@
 			</a>
 		}
 		@* Root for V2-only CSS; JS still uses [data-nav-v2]. Scope overrides: .docs-sidebar-nav-v2 … *@
-		<nav class="docs-sidebar-nav-v2" data-nav-v2>
+		<nav class="docs-sidebar-nav-v2" data-nav-v2 @if (Model.SectionUrl is not null) { <text>data-section-url="@Model.SectionUrl"</text> }>
 			<ul class="docs-sidebar-nav-v2__tree block" id="nav-tree">
 				@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
 				{
diff --git a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
index e94418a7d1..b4e628565f 100644
--- a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -105,7 +105,8 @@ Cancel ctx
 				Htmx = new DefaultHtmxAttributeProvider("/"),
 				BuildType = BuildType.Assembler,
 				IsNavV2 = true,
-				IsIsolatedSection = section.Isolated
+				IsIsolatedSection = section.Isolated,
+				SectionUrl = CombineWithSitePrefix(navV2, section.Url)
 			};
 
 			var html = await ((INavigationHtmlWriter)this).Render(model, ctx);
@@ -118,6 +119,13 @@ Cancel ctx
 		}
 	}
 
+	private static string CombineWithSitePrefix(SiteNavigation nav, string sectionUrl)
+	{
+		var prefix = nav.Url.TrimEnd('/');
+		var path = sectionUrl.TrimStart('/');
+		return string.IsNullOrEmpty(path) ? $"{prefix}/" : $"{prefix}/{path}";
+	}
+
 	private static NavigationRenderResult CreateSectionResult(string html, NavigationSection activeSection, SiteNavigationV2 navV2) =>
 		new()
 		{

From 23f27b3c41f697a4d3021dcd3c9e33487dc325af Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 16 Apr 2026 18:52:45 +0200
Subject: [PATCH 070/226] feat(nav-v2): add Extension points and Account
 isolated sections; remove back arrow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds two isolated nav sections (not shown in top bar):
- Extension points (extend + kibana/logstash/beats/elasticsearch/integrations)
- Account and preferences (cloud-account)

Removes the back arrow from isolated sections — the UX for returning
from an island is still under design review.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml                       | 18 ++++++++++++++++++
 .../Navigation/_TocTree.cshtml                 | 11 -----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 860de00c0f..f88849ee63 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -2861,3 +2861,21 @@ nav:
     url: /reference/
     children:
     - toc: docs-content://reference
+
+  - section: Extension points
+    url: /extend/
+    isolated: true
+    children:
+    - toc: docs-content://extend
+      children:
+      - toc: kibana://extend
+      - toc: logstash://extend
+      - toc: beats://extend
+      - toc: elasticsearch://extend
+      - toc: integrations://extend
+
+  - section: Account and preferences
+    url: /cloud-account/
+    isolated: true
+    children:
+    - toc: docs-content://cloud-account
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
index eb7477f717..7fe162f7ae 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
@@ -71,17 +71,6 @@
 	<div class="pages-nav-menu min-h-0 min-w-0 flex-1 overflow-y-auto">
 	@if (Model.IsNavV2)
 	{
-		@if (Model.IsIsolatedSection)
-		{
-			<a href="/"
-			   @Model.Htmx.GetNavHxAttributes(true, null)
-			   class="flex items-center gap-2 px-4 py-3 text-sm font-semibold text-ink-light hover:text-blue-elastic border-b border-grey-20">
-				<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="w-4 h-4" aria-hidden="true">
-					<path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5 3 12m0 0 7.5-7.5M3 12h18"/>
-				</svg>
-				Back to Docs
-			</a>
-		}
 		@* Root for V2-only CSS; JS still uses [data-nav-v2]. Scope overrides: .docs-sidebar-nav-v2 … *@
 		<nav class="docs-sidebar-nav-v2" data-nav-v2 @if (Model.SectionUrl is not null) { <text>data-section-url="@Model.SectionUrl"</text> }>
 			<ul class="docs-sidebar-nav-v2__tree block" id="nav-tree">

From 7fed2c5eeb8cf4e3e39ed4edd1c081fa53ac5e76 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 16 Apr 2026 19:05:44 +0200
Subject: [PATCH 071/226] fix: correct import ordering in PlaceholderPageWriter

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../Building/PlaceholderPageWriter.cs                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs b/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs
index f3728b995b..116266a1b2 100644
--- a/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Building/PlaceholderPageWriter.cs
@@ -12,8 +12,8 @@
 using Elastic.Documentation.Navigation;
 using Elastic.Documentation.Navigation.V2;
 using Elastic.Documentation.Site;
-using Elastic.Documentation.Site.Navigation;
 using Elastic.Documentation.Site.FileProviders;
+using Elastic.Documentation.Site.Navigation;
 using Elastic.Markdown;
 using Elastic.Markdown.Page;
 using Microsoft.Extensions.Logging;

From cdabed1784be2d7fcaba1c7aedaca5313232074f Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 16 Apr 2026 19:19:44 +0200
Subject: [PATCH 072/226] feat(nav-v2): support absolute URLs for section tabs;
 add API reference

Absolute URLs (http/https) in section url: fields render as plain
links without HTMX swap or Model.Link() prefix. Sections with no
children work as external navigation targets.

Adds "API reference" tab pointing to https://www.elastic.co/docs/api

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml                      |  3 +++
 .../Layout/_SecondaryNav.cshtml               | 26 ++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index f88849ee63..7b33d1ebae 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -2857,6 +2857,9 @@ nav:
     children:
     - toc: docs-content://troubleshoot
 
+  - section: API reference
+    url: https://www.elastic.co/docs/api
+
   - section: Reference
     url: /reference/
     children:
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index 241298eba2..af16fdc260 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -10,17 +10,25 @@
 				<ul class="flex gap-6 font-sans font-semibold text-sm text-ink-light md:text-base">
 				@foreach (var navTab in navTabs.Where(s => !s.Isolated))
 				{
-					var isActive = navTab.Id == Model.ActiveSectionId;
+					var isAbsolute = navTab.Url.StartsWith("http", StringComparison.OrdinalIgnoreCase);
+					var isActive = !isAbsolute && navTab.Id == Model.ActiveSectionId;
 					<li class="text-nowrap @(isActive ? "text-blue-elastic" : "hover:text-blue-elastic active:text-blue-elastic-100")"
 						data-section-id="@navTab.Id">
-						<a
-							href="@Model.Link(navTab.Url)"
-							@Model.Htmx.GetHxAttributes(
-								hxSwapOob: "#main-container,#secondary-nav"
-							)
-						>
-							@navTab.Label
-						</a>
+						@if (isAbsolute)
+						{
+							<a href="@navTab.Url">@navTab.Label</a>
+						}
+						else
+						{
+							<a
+								href="@Model.Link(navTab.Url)"
+								@Model.Htmx.GetHxAttributes(
+									hxSwapOob: "#main-container,#secondary-nav"
+								)
+							>
+								@navTab.Label
+							</a>
+						}
 					</li>
 				}
 				</ul>

From 0557264eb8d8018216bb0c99dab5bf285d158759 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 16 Apr 2026 19:39:30 +0200
Subject: [PATCH 073/226] feat(nav-v2): add island: item type for intra-section
 nav islands

Islands are subtrees within a section that get their own focused sidebar
when a user navigates into their pages. A back arrow points to the
parent section's landing page (known at build time, no history.back).

YAML format:
  - section: Reference
    url: /reference/
    children:
    - toc: docs-content://reference
    - island: Logstash plugins
      toc: logstash-docs-md://lsr

Key changes:
- IslandNavV2Item record + YAML parsing for island: key
- IslandNavigationNode wraps an existing toc node
- NavigationIsland data carrier with ParentSection reference
- SiteNavigationV2 builds island list + URL-to-island lookup
  (islands take priority over sections in URL resolution)
- GlobalNavigationHtmlWriter renders island sidebar with back arrow
- Back arrow uses HTMX navigation to parent section URL

Adds Logstash plugins and versioned plugins as islands in Reference.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml                      |  4 +
 .../Toc/NavigationV2File.cs                   | 21 ++++
 .../V2/IslandNavigationNode.cs                | 46 +++++++++
 .../V2/NavigationSection.cs                   | 11 +++
 .../V2/SiteNavigationV2.cs                    | 97 ++++++++++++++++++-
 .../Navigation/NavigationViewModel.cs         |  3 +
 .../Navigation/_TocTree.cshtml                | 11 +++
 .../Navigation/GlobalNavigationHtmlWriter.cs  | 66 ++++++++++++-
 8 files changed, 253 insertions(+), 6 deletions(-)
 create mode 100644 src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 7b33d1ebae..8c4bba22b4 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -2864,6 +2864,10 @@ nav:
     url: /reference/
     children:
     - toc: docs-content://reference
+    - island: Logstash plugins
+      toc: logstash-docs-md://lsr
+    - island: Logstash versioned plugins
+      toc: logstash-docs-md://vpr
 
   - section: Extension points
     url: /extend/
diff --git a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
index e43453a081..71cbf85b70 100644
--- a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
+++ b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
@@ -39,6 +39,16 @@ public record SectionNavV2Item(
 	IReadOnlyList<INavV2Item> Children
 ) : INavV2Item;
 
+/// <summary>
+/// A nav island nested inside a section. When a user navigates into pages belonging to
+/// this island's toc, the sidebar shows only the island's tree with a back arrow to the
+/// parent section. The island does not appear in the secondary nav bar.
+/// </summary>
+public record IslandNavV2Item(
+	string Label,
+	Uri Source
+) : INavV2Item;
+
 /// <summary>
 /// A folder node — has a title and children, with an optional <c>page:</c> URI.
 /// When <see cref="Page"/> is set, the header is a real clickable link; otherwise it renders
@@ -135,6 +145,17 @@ private static IReadOnlyList<INavV2Item> ReadItemList(IParser parser, ObjectDese
 			return new SectionNavV2Item(sectionStr, sectionUrl, isolated, sectionChildren);
 		}
 
+		if (dict.TryGetValue("island", out var islandVal) && islandVal is string islandStr)
+		{
+			if (dict.TryGetValue("toc", out var itVal) && itVal is string itStr)
+			{
+				var itUriString = itStr.Contains("://") ? itStr : $"docs-content://{itStr}";
+				if (Uri.TryCreate(itUriString, UriKind.Absolute, out var itSource))
+					return new IslandNavV2Item(islandStr, itSource);
+			}
+			return null;
+		}
+
 		if (dict.TryGetValue("label", out var labelVal) && labelVal is string labelStr)
 		{
 			var expanded = dict.TryGetValue("expanded", out var expVal)
diff --git a/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs
new file mode 100644
index 0000000000..ad901e1bb5
--- /dev/null
+++ b/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs
@@ -0,0 +1,46 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Documentation.Extensions;
+
+namespace Elastic.Documentation.Navigation.V2;
+
+/// <summary>
+/// A nav island that wraps an existing toc node. When a page belongs to this island,
+/// the sidebar shows only the island's tree with a back arrow to the parent section.
+/// In the parent section's sidebar, the island renders as a normal folder link.
+/// </summary>
+public class IslandNavigationNode(
+	string label,
+	IRootNavigationItem<IDocumentationFile, INavigationItem> source,
+	INodeNavigationItem<INavigationModel, INavigationItem>? parent
+) : INodeNavigationItem<INavigationModel, INavigationItem>
+{
+	/// <inheritdoc />
+	public string Id { get; } = ShortId.Create("island", label);
+
+	/// <inheritdoc />
+	public string Url => source.Url;
+
+	/// <inheritdoc />
+	public string NavigationTitle { get; } = label;
+
+	/// <inheritdoc />
+	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; } = parent?.NavigationRoot!;
+
+	/// <inheritdoc />
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; } = parent;
+
+	/// <inheritdoc />
+	public bool Hidden => source.Hidden;
+
+	/// <inheritdoc />
+	public int NavigationIndex { get; set; }
+
+	/// <inheritdoc />
+	public ILeafNavigationItem<INavigationModel> Index => source.Index;
+
+	/// <inheritdoc />
+	public IReadOnlyCollection<INavigationItem> NavigationItems => source.NavigationItems;
+}
diff --git a/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs b/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
index 41c99ee76a..a3aceee214 100644
--- a/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
+++ b/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
@@ -15,3 +15,14 @@ public record NavigationSection(
 	bool Isolated,
 	IReadOnlyList<INavigationItem> NavigationItems
 );
+
+/// <summary>
+/// A nav island nested within a parent section. When a page belongs to an island,
+/// the sidebar shows only the island's tree with a back arrow to the parent section.
+/// </summary>
+public record NavigationIsland(
+	string Id,
+	string Label,
+	NavigationSection ParentSection,
+	IReadOnlyList<INavigationItem> NavigationItems
+);
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 6f5955d381..e671887c95 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -22,6 +22,7 @@ namespace Elastic.Documentation.Navigation.V2;
 public class SiteNavigationV2 : SiteNavigation
 {
 	private readonly Dictionary<string, NavigationSection> _urlToSection = new(StringComparer.OrdinalIgnoreCase);
+	private readonly Dictionary<string, NavigationIsland> _urlToIsland = new(StringComparer.OrdinalIgnoreCase);
 
 	public SiteNavigationV2(
 		NavigationV2File v2File,
@@ -34,7 +35,9 @@ public SiteNavigationV2(
 		var prefix = sitePrefix ?? string.Empty;
 		V2NavigationItems = BuildV2Items(v2File.Nav, Nodes, this, prefix);
 		Sections = BuildSections(V2NavigationItems);
+		Islands = BuildIslands(Sections);
 		BuildUrlToSectionLookup();
+		BuildUrlToIslandLookup();
 	}
 
 	/// <summary>
@@ -49,6 +52,25 @@ public SiteNavigationV2(
 	/// </summary>
 	public IReadOnlyList<NavigationSection> Sections { get; }
 
+	/// <summary>
+	/// Nav islands nested within sections. When a page belongs to an island,
+	/// the sidebar shows the island's tree with a back arrow to the parent section.
+	/// </summary>
+	public IReadOnlyList<NavigationIsland> Islands { get; }
+
+	/// <summary>
+	/// Resolves which island a page belongs to, if any. Islands take priority over sections.
+	/// </summary>
+	public NavigationIsland? GetIslandForUrl(string? pageUrl)
+	{
+		if (pageUrl is null)
+			return null;
+		var normalized = pageUrl.TrimEnd('/');
+		if (_urlToIsland.TryGetValue(normalized, out var island))
+			return island;
+		return _urlToIsland.TryGetValue(normalized + "/", out island) ? island : null;
+	}
+
 	/// <summary>
 	/// Resolves which section a page belongs to by its URL.
 	/// Returns the first non-isolated section as fallback for unresolved URLs.
@@ -72,16 +94,52 @@ private static IReadOnlyList<NavigationSection> BuildSections(IReadOnlyList<INav
 			.Select(s => new NavigationSection(s.Id, s.NavigationTitle, s.Url, s.Isolated, [.. s.NavigationItems]))
 			.ToList();
 
+	private static IReadOnlyList<NavigationIsland> BuildIslands(IReadOnlyList<NavigationSection> sections)
+	{
+		var islands = new List<NavigationIsland>();
+		foreach (var section in sections)
+			CollectIslandsFromItems(section.NavigationItems, section, islands);
+		return islands;
+	}
+
+	private static void CollectIslandsFromItems(
+		IEnumerable<INavigationItem> items,
+		NavigationSection parentSection,
+		List<NavigationIsland> islands
+	)
+	{
+		foreach (var item in items)
+		{
+			if (item is IslandNavigationNode islandNode)
+			{
+				islands.Add(new NavigationIsland(
+					islandNode.Id,
+					islandNode.NavigationTitle,
+					parentSection,
+					[.. islandNode.NavigationItems]
+				));
+			}
+			else if (item is INodeNavigationItem<INavigationModel, INavigationItem> node)
+			{
+				CollectIslandsFromItems(node.NavigationItems, parentSection, islands);
+			}
+		}
+	}
+
 	private void BuildUrlToSectionLookup()
 	{
 		foreach (var section in Sections)
-			CollectUrls(section.NavigationItems, section);
+			CollectUrlsForSection(section.NavigationItems, section);
 	}
 
-	private void CollectUrls(IEnumerable<INavigationItem> items, NavigationSection section)
+	private void CollectUrlsForSection(IEnumerable<INavigationItem> items, NavigationSection section)
 	{
 		foreach (var item in items)
 		{
+			// Skip island subtrees — they're handled by the island lookup
+			if (item is IslandNavigationNode)
+				continue;
+
 			if (!string.IsNullOrEmpty(item.Url))
 			{
 				var normalized = item.Url.TrimEnd('/');
@@ -89,7 +147,28 @@ private void CollectUrls(IEnumerable<INavigationItem> items, NavigationSection s
 			}
 
 			if (item is INodeNavigationItem<INavigationModel, INavigationItem> node)
-				CollectUrls(node.NavigationItems, section);
+				CollectUrlsForSection(node.NavigationItems, section);
+		}
+	}
+
+	private void BuildUrlToIslandLookup()
+	{
+		foreach (var island in Islands)
+			CollectUrlsForIsland(island.NavigationItems, island);
+	}
+
+	private void CollectUrlsForIsland(IEnumerable<INavigationItem> items, NavigationIsland island)
+	{
+		foreach (var item in items)
+		{
+			if (!string.IsNullOrEmpty(item.Url))
+			{
+				var normalized = item.Url.TrimEnd('/');
+				_ = _urlToIsland.TryAdd(normalized, island);
+			}
+
+			if (item is INodeNavigationItem<INavigationModel, INavigationItem> node)
+				CollectUrlsForIsland(node.NavigationItems, island);
 		}
 	}
 
@@ -114,6 +193,7 @@ string sitePrefix
 		item switch
 		{
 			SectionNavV2Item section => CreateSection(section, nodes, parent, sitePrefix),
+			IslandNavV2Item island => CreateIsland(island, nodes, parent),
 			LabelNavV2Item label => CreateLabel(label, nodes, parent, sitePrefix),
 			GroupNavV2Item group => CreateGroup(group, nodes, parent, sitePrefix),
 			TocNavV2Item toc => CreateToc(toc, nodes, parent, sitePrefix),
@@ -172,6 +252,17 @@ string sitePrefix
 		return new SectionNavigationNode(section.Label, section.Url, section.Isolated, children, parent);
 	}
 
+	private static INavigationItem? CreateIsland(
+		IslandNavV2Item island,
+		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
+		INodeNavigationItem<INavigationModel, INavigationItem> parent
+	)
+	{
+		if (!nodes.TryGetValue(island.Source, out var node))
+			return null;
+		return new IslandNavigationNode(island.Label, node, parent);
+	}
+
 	private static LabelNavigationNode CreateLabel(
 		LabelNavV2Item label,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
diff --git a/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs b/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
index ecc4eb7aef..5061b23dd9 100644
--- a/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
+++ b/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
@@ -32,4 +32,7 @@ public class NavigationViewModel
 
 	/// <summary>The section's own URL, used by JS to skip current-page highlighting on the section root.</summary>
 	public string? SectionUrl { get; init; }
+
+	/// <summary>Back arrow URL for islands — points to the parent section's landing page.</summary>
+	public string? BackArrowUrl { get; init; }
 }
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
index 7fe162f7ae..bb69329da1 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
@@ -71,6 +71,17 @@
 	<div class="pages-nav-menu min-h-0 min-w-0 flex-1 overflow-y-auto">
 	@if (Model.IsNavV2)
 	{
+		@if (Model.BackArrowUrl is not null)
+		{
+			<a href="@Model.BackArrowUrl"
+			   @Model.Htmx.GetNavHxAttributes(true, null)
+			   class="flex items-center gap-2 px-4 py-3 text-sm font-semibold text-ink-light hover:text-blue-elastic border-b border-grey-20 cursor-pointer">
+				<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="w-4 h-4" aria-hidden="true">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5 3 12m0 0 7.5-7.5M3 12h18"/>
+				</svg>
+				Back
+			</a>
+		}
 		@* Root for V2-only CSS; JS still uses [data-nav-v2]. Scope overrides: .docs-sidebar-nav-v2 … *@
 		<nav class="docs-sidebar-nav-v2" data-nav-v2 @if (Model.SectionUrl is not null) { <text>data-section-url="@Model.SectionUrl"</text> }>
 			<ul class="docs-sidebar-nav-v2__tree block" id="nav-tree">
diff --git a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
index b4e628565f..179cda6fb6 100644
--- a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -73,12 +73,14 @@ private async Task<NavigationRenderResult> RenderSectionNavigation(
 		Cancel ctx
 	)
 	{
+		// Islands take priority: if the page belongs to an island, render the island sidebar
+		var island = navV2.GetIslandForUrl(currentNavigationItem.Url);
+		if (island is not null)
+			return await RenderIslandNavigation(island, navV2, ctx);
+
 		var section = navV2.GetSectionForUrl(currentNavigationItem.Url);
 		if (section is null)
-		{
-			// Fallback: render full V2 tree if no sections are defined
 			return await RenderFullV2Navigation(navV2, ctx);
-		}
 
 		var cacheKey = $"nav-v2-section-{section.Id}";
 		if (_renderedNavigationCache.TryGetValue(cacheKey, out var cachedHtml))
@@ -119,6 +121,64 @@ Cancel ctx
 		}
 	}
 
+	private async Task<NavigationRenderResult> RenderIslandNavigation(
+		NavigationIsland island,
+		SiteNavigationV2 navV2,
+		Cancel ctx
+	)
+	{
+		var cacheKey = $"nav-v2-island-{island.Id}";
+		if (_renderedNavigationCache.TryGetValue(cacheKey, out var cachedHtml))
+			return CreateIslandResult(cachedHtml, island, navV2);
+
+		await _semaphore.WaitAsync(ctx);
+		try
+		{
+			if (_renderedNavigationCache.TryGetValue(cacheKey, out cachedHtml))
+				return CreateIslandResult(cachedHtml, island, navV2);
+
+			_logger.LogInformation("Rendering V2 island navigation: {IslandLabel} ({IslandId})", island.Label, island.Id);
+
+			var wrapper = new SectionNavigationV2Wrapper(
+				new NavigationSection(island.Id, island.Label, "", false, island.NavigationItems),
+				navV2
+			);
+			var model = new NavigationViewModel
+			{
+				Title = island.Label,
+				TitleUrl = "",
+				Tree = wrapper,
+				IsPrimaryNavEnabled = true,
+				IsUsingNavigationDropdown = false,
+				IsGlobalAssemblyBuild = true,
+				TopLevelItems = [],
+				Htmx = new DefaultHtmxAttributeProvider("/"),
+				BuildType = BuildType.Assembler,
+				IsNavV2 = true,
+				IsIsolatedSection = true,
+				SectionUrl = null,
+				BackArrowUrl = CombineWithSitePrefix(navV2, island.ParentSection.Url)
+			};
+
+			var html = await ((INavigationHtmlWriter)this).Render(model, ctx);
+			_renderedNavigationCache[cacheKey] = html;
+			return CreateIslandResult(html, island, navV2);
+		}
+		finally
+		{
+			_ = _semaphore.Release();
+		}
+	}
+
+	private static NavigationRenderResult CreateIslandResult(string html, NavigationIsland island, SiteNavigationV2 navV2) =>
+		new()
+		{
+			Html = html,
+			Id = $"nav-v2-island-{island.Id}",
+			Sections = navV2.Sections,
+			ActiveSectionId = island.ParentSection.Id
+		};
+
 	private static string CombineWithSitePrefix(SiteNavigation nav, string sectionUrl)
 	{
 		var prefix = nav.Url.TrimEnd('/');

From 1e4da5a3e79f0d3c8559f74b7b62cdb7bd1b2e50 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 22 Apr 2026 15:08:55 +0200
Subject: [PATCH 074/226] feat(nav-v2): convert Account and preferences to
 island under Docs

Moves Account and preferences from a top-level isolated section to an
island: entry under "Deployment and administration tools" in the Docs
section. This gives it:
- An entry point visible in the main Docs sidebar
- A back arrow pointing to the Docs section root (via the existing
  island mechanism)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 8c4bba22b4..9f75d62d5a 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -277,6 +277,8 @@ nav:
         children:
         - title: Overview (roundup)
         - toc: ecctl://reference
+        - island: Account and preferences
+          toc: docs-content://cloud-account
     - label: The Elasticsearch Platform
       children:
       - label: Ingest and manage data
@@ -2881,8 +2883,3 @@ nav:
       - toc: elasticsearch://extend
       - toc: integrations://extend
 
-  - section: Account and preferences
-    url: /cloud-account/
-    isolated: true
-    children:
-    - toc: docs-content://cloud-account

From a0b98a3e97c44b432b52a58f3111c0aa72a80cce Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 22 Apr 2026 16:52:49 +0200
Subject: [PATCH 075/226] fix(nav-v2): register island root URL in island
 lookup

The island's toc root URL was not being collected in the URL-to-island
lookup, so navigating to the root page (e.g. /cloud-account/) fell
through to the section lookup and showed the full Docs sidebar instead
of the island sidebar.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../V2/NavigationSection.cs                              | 1 +
 .../V2/SiteNavigationV2.cs                               | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs b/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
index a3aceee214..bfa45cba4f 100644
--- a/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
+++ b/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
@@ -23,6 +23,7 @@ IReadOnlyList<INavigationItem> NavigationItems
 public record NavigationIsland(
 	string Id,
 	string Label,
+	string Url,
 	NavigationSection ParentSection,
 	IReadOnlyList<INavigationItem> NavigationItems
 );
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index e671887c95..93e71ddb55 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -115,6 +115,7 @@ List<NavigationIsland> islands
 				islands.Add(new NavigationIsland(
 					islandNode.Id,
 					islandNode.NavigationTitle,
+					islandNode.Url,
 					parentSection,
 					[.. islandNode.NavigationItems]
 				));
@@ -154,7 +155,15 @@ private void CollectUrlsForSection(IEnumerable<INavigationItem> items, Navigatio
 	private void BuildUrlToIslandLookup()
 	{
 		foreach (var island in Islands)
+		{
+			// Register the island root URL (the toc entry point)
+			if (!string.IsNullOrEmpty(island.Url))
+			{
+				var normalized = island.Url.TrimEnd('/');
+				_ = _urlToIsland.TryAdd(normalized, island);
+			}
 			CollectUrlsForIsland(island.NavigationItems, island);
+		}
 	}
 
 	private void CollectUrlsForIsland(IEnumerable<INavigationItem> items, NavigationIsland island)

From b81302479df6adc369036c8aae36260c7995f655 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 22 Apr 2026 17:16:45 +0200
Subject: [PATCH 076/226] fix(nav-v2): use toc root identity for island lookup
 instead of URL matching
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

URL-based island lookup breaks across path prefixes (dev vs preview vs
production). The nav system already knows which toc root owns the
current page via currentRootNavigation — use that identity to resolve
islands instead.

Replaces _urlToIsland dictionary with _tocRootToIsland keyed by the
toc root's Id. GetIslandForTocRoot takes the root navigation item
directly, matching by nav ownership rather than URL strings.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../V2/IslandNavigationNode.cs                |  3 ++
 .../V2/NavigationSection.cs                   |  1 +
 .../V2/SiteNavigationV2.cs                    | 46 ++++---------------
 .../Navigation/GlobalNavigationHtmlWriter.cs  |  7 +--
 4 files changed, 17 insertions(+), 40 deletions(-)

diff --git a/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs
index ad901e1bb5..619aceac7f 100644
--- a/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs
+++ b/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs
@@ -17,6 +17,9 @@ public class IslandNavigationNode(
 	INodeNavigationItem<INavigationModel, INavigationItem>? parent
 ) : INodeNavigationItem<INavigationModel, INavigationItem>
 {
+	/// <summary>The Id of the wrapped toc root, used for island lookup by nav ownership.</summary>
+	public string SourceTocRootId { get; } = source.Id;
+
 	/// <inheritdoc />
 	public string Id { get; } = ShortId.Create("island", label);
 
diff --git a/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs b/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
index bfa45cba4f..b0ee805d19 100644
--- a/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
+++ b/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
@@ -24,6 +24,7 @@ public record NavigationIsland(
 	string Id,
 	string Label,
 	string Url,
+	string SourceTocRootId,
 	NavigationSection ParentSection,
 	IReadOnlyList<INavigationItem> NavigationItems
 );
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 93e71ddb55..1f6057df51 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -22,7 +22,7 @@ namespace Elastic.Documentation.Navigation.V2;
 public class SiteNavigationV2 : SiteNavigation
 {
 	private readonly Dictionary<string, NavigationSection> _urlToSection = new(StringComparer.OrdinalIgnoreCase);
-	private readonly Dictionary<string, NavigationIsland> _urlToIsland = new(StringComparer.OrdinalIgnoreCase);
+	private readonly Dictionary<string, NavigationIsland> _tocRootToIsland = new(StringComparer.Ordinal);
 
 	public SiteNavigationV2(
 		NavigationV2File v2File,
@@ -37,7 +37,7 @@ public SiteNavigationV2(
 		Sections = BuildSections(V2NavigationItems);
 		Islands = BuildIslands(Sections);
 		BuildUrlToSectionLookup();
-		BuildUrlToIslandLookup();
+		BuildTocRootToIslandLookup();
 	}
 
 	/// <summary>
@@ -59,17 +59,11 @@ public SiteNavigationV2(
 	public IReadOnlyList<NavigationIsland> Islands { get; }
 
 	/// <summary>
-	/// Resolves which island a page belongs to, if any. Islands take priority over sections.
+	/// Resolves which island a page belongs to by its toc root.
+	/// Uses the nav ownership model — the toc root that owns the page determines the island.
 	/// </summary>
-	public NavigationIsland? GetIslandForUrl(string? pageUrl)
-	{
-		if (pageUrl is null)
-			return null;
-		var normalized = pageUrl.TrimEnd('/');
-		if (_urlToIsland.TryGetValue(normalized, out var island))
-			return island;
-		return _urlToIsland.TryGetValue(normalized + "/", out island) ? island : null;
-	}
+	public NavigationIsland? GetIslandForTocRoot(IRootNavigationItem<INavigationModel, INavigationItem> tocRoot) =>
+		_tocRootToIsland.GetValueOrDefault(tocRoot.Id);
 
 	/// <summary>
 	/// Resolves which section a page belongs to by its URL.
@@ -116,6 +110,7 @@ List<NavigationIsland> islands
 					islandNode.Id,
 					islandNode.NavigationTitle,
 					islandNode.Url,
+					islandNode.SourceTocRootId,
 					parentSection,
 					[.. islandNode.NavigationItems]
 				));
@@ -152,33 +147,10 @@ private void CollectUrlsForSection(IEnumerable<INavigationItem> items, Navigatio
 		}
 	}
 
-	private void BuildUrlToIslandLookup()
+	private void BuildTocRootToIslandLookup()
 	{
 		foreach (var island in Islands)
-		{
-			// Register the island root URL (the toc entry point)
-			if (!string.IsNullOrEmpty(island.Url))
-			{
-				var normalized = island.Url.TrimEnd('/');
-				_ = _urlToIsland.TryAdd(normalized, island);
-			}
-			CollectUrlsForIsland(island.NavigationItems, island);
-		}
-	}
-
-	private void CollectUrlsForIsland(IEnumerable<INavigationItem> items, NavigationIsland island)
-	{
-		foreach (var item in items)
-		{
-			if (!string.IsNullOrEmpty(item.Url))
-			{
-				var normalized = item.Url.TrimEnd('/');
-				_ = _urlToIsland.TryAdd(normalized, island);
-			}
-
-			if (item is INodeNavigationItem<INavigationModel, INavigationItem> node)
-				CollectUrlsForIsland(node.NavigationItems, island);
-		}
+			_ = _tocRootToIsland.TryAdd(island.SourceTocRootId, island);
 	}
 
 	private static IReadOnlyList<INavigationItem> BuildV2Items(
diff --git a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
index 179cda6fb6..1f93a310ff 100644
--- a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -29,7 +29,7 @@ public async Task<NavigationRenderResult> RenderNavigation(
 	{
 		// V2 nav: render per-section sidebar based on current page
 		if (globalNavigation is SiteNavigationV2 navV2)
-			return await RenderSectionNavigation(navV2, currentNavigationItem, ctx);
+			return await RenderSectionNavigation(navV2, currentRootNavigation, currentNavigationItem, ctx);
 
 		if (currentRootNavigation is SiteNavigation)
 			return NavigationRenderResult.Empty;
@@ -69,12 +69,13 @@ public async Task<NavigationRenderResult> RenderNavigation(
 
 	private async Task<NavigationRenderResult> RenderSectionNavigation(
 		SiteNavigationV2 navV2,
+		IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation,
 		INavigationItem currentNavigationItem,
 		Cancel ctx
 	)
 	{
-		// Islands take priority: if the page belongs to an island, render the island sidebar
-		var island = navV2.GetIslandForUrl(currentNavigationItem.Url);
+		// Islands take priority: if the current toc root is an island, render the island sidebar
+		var island = navV2.GetIslandForTocRoot(currentRootNavigation);
 		if (island is not null)
 			return await RenderIslandNavigation(island, navV2, ctx);
 

From e02fc812f9ac6147f491a0bbc540781b9b86ff9e Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 22 Apr 2026 17:37:47 +0200
Subject: [PATCH 077/226] fix(nav-v2): scope top-level padding to label
 sections only

The 16px/24px vertical padding on top-level <li> inside the nav tree
was intended for label section separators but applied to all items,
making island sidebars with flat leaf links overly spaced. Scope the
rule to li:has(> .docs-sidebar-nav-v2__label) so only label sections
get the extra padding.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Elastic.Documentation.Site/Assets/styles.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index fbdf6ade05..8b968390dc 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -207,8 +207,8 @@ body:has([data-nav-v2]) aside.sidebar {
 	display: flex;
 }
 
-/* Nav V2: vertical padding on top-level li under the root ul (not nested folder children). */
-#pages-nav nav[data-nav-v2] ul.docs-sidebar-nav-v2__tree > li {
+/* Nav V2: vertical padding on top-level label sections only (not leaf links or folders). */
+#pages-nav nav[data-nav-v2] ul.docs-sidebar-nav-v2__tree > li:has(> .docs-sidebar-nav-v2__label) {
 	padding-top: 16px;
 	padding-bottom: 24px;
 }

From 68036306dc307cde5f5a1604978137fba379227b Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 22 Apr 2026 17:44:29 +0200
Subject: [PATCH 078/226] style: fix Prettier formatting in styles.css

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Elastic.Documentation.Site/Assets/styles.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 8b968390dc..3a45bfa2c5 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -208,7 +208,10 @@ body:has([data-nav-v2]) aside.sidebar {
 }
 
 /* Nav V2: vertical padding on top-level label sections only (not leaf links or folders). */
-#pages-nav nav[data-nav-v2] ul.docs-sidebar-nav-v2__tree > li:has(> .docs-sidebar-nav-v2__label) {
+#pages-nav
+	nav[data-nav-v2]
+	ul.docs-sidebar-nav-v2__tree
+	> li:has(> .docs-sidebar-nav-v2__label) {
 	padding-top: 16px;
 	padding-bottom: 24px;
 }

From fdb278a21fa09102acf87b08307a774bf0c69e22 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 22 Apr 2026 18:20:16 +0200
Subject: [PATCH 079/226] fix(nav-v2): back arrow swaps full page including
 sidebar

The back arrow used GetNavHxAttributes which only swaps content areas,
leaving the sidebar stuck on the island. Use GetHxAttributes with
#main-container,#secondary-nav swap targets (same as section tabs) so
the sidebar, content, and top bar all update on back navigation.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
index bb69329da1..948220b71d 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
@@ -74,7 +74,7 @@
 		@if (Model.BackArrowUrl is not null)
 		{
 			<a href="@Model.BackArrowUrl"
-			   @Model.Htmx.GetNavHxAttributes(true, null)
+			   @Model.Htmx.GetHxAttributes(hxSwapOob: "#main-container,#secondary-nav")
 			   class="flex items-center gap-2 px-4 py-3 text-sm font-semibold text-ink-light hover:text-blue-elastic border-b border-grey-20 cursor-pointer">
 				<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="w-4 h-4" aria-hidden="true">
 					<path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5 3 12m0 0 7.5-7.5M3 12h18"/>

From 2d20e27a2d5d184f42dcc6a27e6eea354bc88d45 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 23 Apr 2026 09:00:55 +0200
Subject: [PATCH 080/226] =?UTF-8?q?fix(nav-v2):=20open=20external=20sectio?=
 =?UTF-8?q?n=20links=20in=20new=20tab=20with=20=E2=86=97=20indicator?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

External section URLs (like API reference → Bump.sh) now open in a
new tab (target="_blank" rel="noopener") with a small external-link
icon (↗) to set user expectations that they're leaving elastic.co/docs.

Prevents the navigation trap where users lose their wayfinding back
to the docs site.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index af16fdc260..21ea826449 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -16,7 +16,7 @@
 						data-section-id="@navTab.Id">
 						@if (isAbsolute)
 						{
-							<a href="@navTab.Url">@navTab.Label</a>
+							<a href="@navTab.Url" target="_blank" rel="noopener" class="inline-flex items-center gap-1">@navTab.Label<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-3 h-3 opacity-60" aria-hidden="true"><path d="M8.75 1a.75.75 0 0 0 0 1.5h3.69L6.72 8.22a.75.75 0 0 0 1.06 1.06l5.72-5.72v3.69a.75.75 0 0 0 1.5 0v-5.5a.75.75 0 0 0-.75-.75h-5.5Z"/><path d="M3.5 3A1.5 1.5 0 0 0 2 4.5v8A1.5 1.5 0 0 0 3.5 14h8a1.5 1.5 0 0 0 1.5-1.5V10a.75.75 0 0 0-1.5 0v2.5h-8v-8H6A.75.75 0 0 0 6 3H3.5Z"/></svg></a>
 						}
 						else
 						{

From c4c5bab711ed7f0823ed97436ba7c0f17c11a0d1 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 23 Apr 2026 09:15:28 +0200
Subject: [PATCH 081/226] feat(nav-v2): rename Docs to Guides, API reference to
 APIs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Guides better signals task-based narrative content alongside the
content-type tabs. APIs is shorter and eliminates the repetition
with Reference.

Tabs: Guides | Release notes | Troubleshoot | APIs ↗ | Reference

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 9f75d62d5a..bf6301ebcc 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -1,5 +1,5 @@
 nav:
-  - section: Docs
+  - section: Guides
     url: /
     children:
     - label: Elasticsearch fundamentals
@@ -2859,7 +2859,7 @@ nav:
     children:
     - toc: docs-content://troubleshoot
 
-  - section: API reference
+  - section: APIs
     url: https://www.elastic.co/docs/api
 
   - section: Reference

From 13a6695584f3cf211e53b114f2683c33bcb68e03 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 23 Apr 2026 09:16:37 +0200
Subject: [PATCH 082/226] feat(nav-v2): reorder tabs by task flow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Guides → APIs → Reference → Troubleshoot → Release notes

Groups building tabs together, situational tabs at the end.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index bf6301ebcc..7fafe187ee 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -2849,16 +2849,6 @@ nav:
   #      - page: docs-content://troubleshoot/ingest/opentelemetry/index.md
   #        title: Troubleshoot EDOT
 
-  - section: Release notes
-    url: /release-notes/
-    children:
-    - toc: docs-content://release-notes/intro
-
-  - section: Troubleshoot
-    url: /troubleshoot/
-    children:
-    - toc: docs-content://troubleshoot
-
   - section: APIs
     url: https://www.elastic.co/docs/api
 
@@ -2871,6 +2861,16 @@ nav:
     - island: Logstash versioned plugins
       toc: logstash-docs-md://vpr
 
+  - section: Troubleshoot
+    url: /troubleshoot/
+    children:
+    - toc: docs-content://troubleshoot
+
+  - section: Release notes
+    url: /release-notes/
+    children:
+    - toc: docs-content://release-notes/intro
+
   - section: Extension points
     url: /extend/
     isolated: true

From 4e3bde984658438605e3818ca13d348c6b0ba4a9 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 23 Apr 2026 09:21:50 +0200
Subject: [PATCH 083/226] fix(nav-v2): shorten long nav label to 'Query
 languages and APIs'

The previous label 'Build search queries with APIs and query languages
and search templates' wrapped to three lines in the sidebar.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 7fafe187ee..a212064cd7 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -687,7 +687,7 @@ nav:
             - title: AI-powered search
             - title: Hybrid search
             - title: Ranking and reranking
-          - group: Build search queries with APIs and query languages and search templates
+          - group: Query languages and APIs
             children:
             - title: ES|QL
             - title: Query DSL

From 194a57b26a4b76a5daf9525b7ac50bc6bdb38e9f Mon Sep 17 00:00:00 2001
From: shainaraskas <58563081+shainaraskas@users.noreply.github.com>
Date: Wed, 29 Apr 2026 15:54:02 -0400
Subject: [PATCH 084/226] Install deploy and administer refinement (#3203)

---
 config/navigation-v2.yml | 980 ++++++++++++++++++++++++++++-----------
 1 file changed, 709 insertions(+), 271 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 9013fbcdb4..1acfbea012 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -26,255 +26,720 @@ nav:
           title: RAG
   - label: Install, deploy, and administer
     children:
-    - group: Distributed architecture
-      page: docs-content://deploy-manage/distributed-architecture.md
-      children:
-      - page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards.md
-        title: Clusters nodes and shards
-      - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation.md
-        title: Discovery and cluster formation
-      - page: docs-content://deploy-manage/distributed-architecture/kibana-tasks-management.md
-        title: Kibana task management
-      - page: docs-content://deploy-manage/distributed-architecture/reading-and-writing-documents.md
-        title: Reading and writing documents
-      - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md
-        title: Shard allocation relocation and recovery
-      - page: docs-content://deploy-manage/distributed-architecture/shard-request-cache.md
-        title: The shard request cache
-    - group: Plan your install
-      children:
-      - page: docs-content://get-started/versioning-availability.md
-        title: Versioning and compatibility
-      - page: docs-content://deploy-manage/deploy/deployment-comparison.md
-        title: Detailed deployment comparison
-      - group: Reference architectures
-        page: docs-content://deploy-manage/reference-architectures.md
-        children:
-        - page: docs-content://deploy-manage/reference-architectures/hotfrozen-high-availability.md
-          title: Hot/Frozen - High Availability
-      - group: Production guidance
-        page: docs-content://deploy-manage/production-guidance.md
-        children:
-        - page: docs-content://deploy-manage/production-guidance/elasticsearch-in-production-environments.md
-          title: Run Elasticsearch in production
-        - page: docs-content://deploy-manage/production-guidance/kibana-in-production-environments.md
-          title: Run Kibana in production
-    - group: Install and deploy Elasticsearch
-      page: docs-content://deploy-manage/deploy.md
-      children:
-      - title: Skills for installation and deployment
-      - page: docs-content://deploy-manage/deploy/elastic-cloud.md
-        title: Deploy in Elastic Cloud
-      - page: docs-content://deploy-manage/deploy/cloud-enterprise.md
-        title: Elastic Cloud Enterprise
-      - page: docs-content://deploy-manage/deploy/cloud-on-k8s.md
-        title: Elastic Cloud on Kubernetes
-      - group: Self-managed cluster
-        page: docs-content://deploy-manage/deploy/self-managed.md
-        children:
-        - page: elasticsearch://reference/elasticsearch/command-line-tools/index.md
-          title: Command line tools
-    - group: Administer your deployment
-      children:
-      - title: Skills for cluster and deployment administration
-      - page: docs-content://deploy-manage/stack-settings.md
-        title: Elastic Stack settings
-      - group: Autoscaling
-        page: docs-content://deploy-manage/autoscaling.md
+      - group: Distributed architecture
+        page: docs-content://deploy-manage/distributed-architecture.md
         children:
-        - page: docs-content://deploy-manage/autoscaling/autoscaling-deciders.md
-          title: Autoscaling deciders
-        - page: docs-content://deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md
-          title: Autoscaling in ECE and ECH
-        - page: docs-content://deploy-manage/autoscaling/autoscaling-in-eck.md
-          title: Autoscaling in ECK
-        - page: docs-content://deploy-manage/autoscaling/trained-model-autoscaling.md
-          title: Trained model autoscaling
-      - group: Backup high availability and resilience tools
-        page: docs-content://deploy-manage/tools.md
+        - page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards.md
+          title: Clusters, nodes, and shards
+        - page: docs-content://deploy-manage/distributed-architecture/reading-and-writing-documents.md
+          title: Reading and writing documents
+        - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md
+          title: Shard allocation, relocation, and recovery
+        - page: docs-content://deploy-manage/distributed-architecture/shard-request-cache.md
+          title: The shard request cache
+        - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation.md
+          title: Discovery and cluster formation
+        - page: docs-content://deploy-manage/distributed-architecture/kibana-tasks-management.md
+          title: Kibana task management
+      - group: Plan your install
         children:
-        - page: docs-content://deploy-manage/tools/cross-cluster-replication.md
-          title: Cross-cluster replication
-        - page: docs-content://deploy-manage/tools/snapshot-and-restore.md
-          title: Snapshot and restore
-      - page: docs-content://deploy-manage/cloud-connect.md
-        title: Cloud Connect
-      - group: Security and encryption
-        page: docs-content://deploy-manage/security.md
+        - page: docs-content://deploy-manage/deploy/deployment-comparison.md
+          title: Deployment comparison
+          children:
+          - page: docs-content://deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md
+            title: Compare Cloud Hosted and Serverless
+        - page: docs-content://get-started/versioning-availability.md
+          title: Versioning and compatibility
+        - group: Reference architectures
+          page: docs-content://deploy-manage/reference-architectures.md
+          children:
+          - page: docs-content://deploy-manage/reference-architectures/hotfrozen-high-availability.md
+            title: Hot/Frozen - High Availability
+          - page: docs-content://deploy-manage/reference-architectures/genai-search-high-availability.md
+            title: GenAI Search - High Availability
+        - group: Production guidance
+          page: docs-content://deploy-manage/production-guidance.md
+          children:
+          - page: docs-content://deploy-manage/production-guidance/elasticsearch-in-production-environments.md
+            title: Run Elasticsearch in production
+          - page: docs-content://deploy-manage/production-guidance/kibana-in-production-environments.md
+            title: Run Kibana in production
+      - group: Install and deploy Elasticsearch
+        page: docs-content://deploy-manage/deploy.md
         children:
-        - page: docs-content://deploy-manage/security/data-security.md
-          title: Encrypt your deployment data
-        - page: docs-content://deploy-manage/security/elastic-cloud-static-ips.md
-          title: Elastic Cloud Static IPs
-        - page: docs-content://deploy-manage/security/enabling-cipher-suites-for-stronger-encryption.md
-          title: Enabling cipher suites for stronger encryption
-        - page: docs-content://deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md
-          title: Use a customer-managed encryption key
-        - page: docs-content://deploy-manage/security/httprest-clients-security.md
-          title: Securing HTTP client applications
-        - page: docs-content://deploy-manage/security/ip-filtering-basic.md
-          title: Manage IP filtering in ECK and self-managed
-        - page: docs-content://deploy-manage/security/ip-filtering-cloud.md
-          title: Manage IP filters in ECH or Serverless
-        - page: docs-content://deploy-manage/security/k8s-https-settings.md
-          title: Manage HTTP certificates on ECK
-        - page: docs-content://deploy-manage/security/k8s-network-policies.md
-          title: Kubernetes network policies
-        - page: docs-content://deploy-manage/security/k8s-secure-settings.md
-          title: Secure settings on ECK
-        - page: docs-content://deploy-manage/security/k8s-transport-settings.md
-          title: Manage transport certificates on ECK
-        - page: docs-content://deploy-manage/security/kibana-es-mutual-tls.md
-          title: Mutual TLS between Kibana and Elasticsearch
-        - page: docs-content://deploy-manage/security/kibana-session-management.md
-          title: Kibana session management
-        - page: docs-content://deploy-manage/security/limitations.md
-          title: Security limitations
-        - page: docs-content://deploy-manage/security/logging-configuration/security-event-audit-logging.md
-          title: Security logging
-        - page: docs-content://deploy-manage/security/network-security.md
-          title: Network security
-        - page: docs-content://deploy-manage/security/private-connectivity.md
-          title: Private connectivity
-        - page: docs-content://deploy-manage/security/secure-clients-integrations.md
-          title: Secure other Elastic Stack components
-        - page: docs-content://deploy-manage/security/secure-cluster-communications.md
-          title: TLS encryption for cluster communications
-        - page: docs-content://deploy-manage/security/secure-saved-objects.md
-          title: Secure Kibana saved objects
-        - page: docs-content://deploy-manage/security/secure-settings.md
-          title: Secure your settings
-        - page: docs-content://deploy-manage/security/secure-your-eck-installation.md
-          title: Secure your ECK orchestrator
-        - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation.md
-          title: Secure your ECE installation
-        - page: docs-content://deploy-manage/security/self-setup.md
-          title: Set up security in self-managed
-      - group: Authentication and authorization
-        page: docs-content://deploy-manage/users-roles.md
-        children:
-        - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator.md
-          title: Elastic Cloud Enterprise orchestrator users
-        - page: docs-content://deploy-manage/users-roles/cloud-organization.md
-          title: Cloud organization users
-        - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth.md
-          title: Cluster or deployment users
-        - page: docs-content://deploy-manage/users-roles/serverless-custom-roles.md
-          title: Serverless project custom roles
-        - page: docs-content://deploy-manage/manage-spaces.md
-          title: Spaces
-        - page: docs-content://deploy-manage/manage-spaces-fleet.md
-          title: Using Spaces with Fleet
-      - group: Elastic API keys
-        page: docs-content://deploy-manage/api-keys.md
-        children:
-        - page: docs-content://deploy-manage/api-keys/elastic-cloud-api-keys.md
-          title: Elastic Cloud API keys
-        - page: docs-content://deploy-manage/api-keys/elastic-cloud-enterprise-api-keys.md
-          title: Elastic Cloud Enterprise API keys
-        - page: docs-content://deploy-manage/api-keys/elasticsearch-api-keys.md
-          title: Elasticsearch API keys
-        - page: docs-content://deploy-manage/api-keys/serverless-project-api-keys.md
-          title: Serverless project API keys
-      - page: docs-content://deploy-manage/manage-connectors.md
-        title: Connectors
-      - group: Remote clusters
-        page: docs-content://deploy-manage/remote-clusters.md
-        children:
-        - page: docs-content://deploy-manage/remote-clusters/connection-modes.md
-          title: Remote cluster connection modes
-        - page: docs-content://deploy-manage/remote-clusters/ec-enable-ccs.md
-          title: Remote clusters on Elastic Cloud Hosted
-        - page: docs-content://deploy-manage/remote-clusters/ece-enable-ccs.md
-          title: Remote clusters on Elastic Cloud Enterprise
-        - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-landing.md
-          title: Remote clusters on ECK
-        - page: docs-content://deploy-manage/remote-clusters/remote-clusters-self-managed.md
-          title: Remote clusters on self-managed
-        - page: docs-content://deploy-manage/remote-clusters/security-models.md
-          title: Remote cluster security models
-      - group: Monitoring
-        page: docs-content://deploy-manage/monitor.md
-        children:
-        - page: docs-content://deploy-manage/monitor/access-performance-metrics-on-elastic-cloud.md
-          title: Performance metrics on Elastic Cloud
-        - page: docs-content://deploy-manage/monitor/autoops.md
-          title: AutoOps
-        - page: docs-content://deploy-manage/monitor/autoops-vs-stack-monitoring.md
-          title: AutoOps and Stack Monitoring comparison
-        - page: docs-content://deploy-manage/monitor/cloud-health-perf.md
-          title: Cloud deployment health and performance
-        - page: docs-content://deploy-manage/monitor/ec-memory-pressure.md
-          title: JVM memory pressure indicator
-        - page: docs-content://deploy-manage/monitor/kibana-task-manager-health-monitoring.md
-          title: Kibana task manager health monitoring
-        - group: Logging
-          page: docs-content://deploy-manage/monitor/logging-configuration.md
-          children:
-          - page: elasticsearch://reference/elasticsearch/elasticsearch-audit-events.md
-            title: Audit events
-        - page: docs-content://deploy-manage/monitor/orchestrators.md
-          title: Monitoring orchestrators
-        - page: docs-content://deploy-manage/monitor/stack-monitoring.md
-          title: Stack monitoring
-      - page: docs-content://deploy-manage/kibana-reporting-configuration.md
-        title: Configure Kibana reporting
-      - group: Cloud organization
-        page: docs-content://deploy-manage/cloud-organization.md
-        children:
-        - page: docs-content://deploy-manage/cloud-organization/billing.md
-          title: Billing
-        - page: docs-content://deploy-manage/cloud-organization/operational-emails.md
-          title: Operational emails
-        - page: docs-content://deploy-manage/cloud-organization/service-status.md
-          title: Service status
-        - page: docs-content://deploy-manage/cloud-organization/tools-and-apis.md
-          title: Tools and APIs for your Cloud organization
-      - group: Licenses and subscriptions
-        page: docs-content://deploy-manage/license.md
-        children:
-        - page: docs-content://deploy-manage/license/manage-your-license-in-ece.md
-          title: Manage your license in ECE
-        - page: docs-content://deploy-manage/license/manage-your-license-in-eck.md
-          title: Manage your license in ECK
-        - page: docs-content://deploy-manage/license/manage-your-license-in-self-managed-cluster.md
-          title: Manage your license in self-managed
-      - group: Maintenance
-        page: docs-content://deploy-manage/maintenance.md
-        children:
-        - page: docs-content://deploy-manage/maintenance/add-and-remove-elasticsearch-nodes.md
-          title: Add and remove Elasticsearch nodes
-        - page: docs-content://deploy-manage/maintenance/ece.md
-          title: ECE maintenance
-        - page: docs-content://deploy-manage/maintenance/start-stop-routing-requests.md
-          title: Start and stop routing requests
-        - page: docs-content://deploy-manage/maintenance/start-stop-services.md
-          title: Start and stop services
-      - group: Upgrade your deployment, cluster, or orchestrator
-        page: docs-content://deploy-manage/upgrade.md
+        - title: Skills for installation and deployment
+        - group: Deploy in Elastic Cloud
+          page: docs-content://deploy-manage/deploy/elastic-cloud.md
+          children:
+          - page: docs-content://deploy-manage/deploy/elastic-cloud/create-an-organization.md
+            title: Create an organization
+            children:
+            - group: Subscribe from a marketplace
+              page: docs-content://deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md
+              children:
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/aws-marketplace.md
+                title: AWS Marketplace
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/google-cloud-platform-marketplace.md
+                title: Google Cloud Platform Marketplace
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md
+                title: Azure Native ISV Service
+              - group: Elasticsearch Add-On for Heroku
+                page: docs-content://deploy-manage/deploy/elastic-cloud/heroku.md
+                children:
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-getting-started-installing.md
+                  title: Install the add-on
+                  children:
+                  - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-getting-started-removing.md
+                    title: Remove the add-on
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-getting-started-accessing.md
+                  title: Access the console
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-working-with-elasticsearch.md
+                  title: Work with Elasticsearch
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-migrating.md
+                  title: Migrate between plans
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-reference-hardware.md
+                  title: Hardware
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-reference-regions.md
+                  title: Regions
+          - group: Elastic Cloud Serverless
+            page: docs-content://deploy-manage/deploy/elastic-cloud/serverless.md
+            children:
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/create-serverless-project.md
+              title: Create a serverless project
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/regions.md
+              title: Regions
+            - title: Production readiness checklist
+          - group: Elastic Cloud Hosted
+            page: docs-content://deploy-manage/deploy/elastic-cloud/cloud-hosted.md
+            children:
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/create-an-elastic-cloud-hosted-deployment.md
+              title: Create a deployment
+            - title: Connect to Elasticsearch
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/access-kibana.md  # BOTH PHASES
+              title: Access Kibana
+            - group: Prepare for production
+              page: docs-content://deploy-manage/deploy/elastic-cloud/elastic-cloud-hosted-planning.md
+              children:
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/ec-customize-deployment-components.md  # BOTH PHASES
+                title: Customize deployment components
+              - title: Production readiness checklist
+          - page: docs-content://deploy-manage/deploy/elastic-cloud/fedramp.md
+            title: FedRAMP authorized Cloud offerings
+            # - page: docs-content://deploy-manage/deploy/elastic-cloud/azure-marketplace-pricing.md
+              # title: Azure Marketplace pricing
+            # - page: docs-content://deploy-manage/deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-aws-marketplace.md
+              # title: Monthly AWS subscription
+            # - page: docs-content://deploy-manage/deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-gcp-marketplace.md
+              # title: Monthly GCP subscription
+            # - page: docs-content://deploy-manage/deploy/elastic-cloud/complete-registration-of-an-annual-subscription-on-aws-marketplace.md
+              # title: Annual AWS subscription
+        - group: Elastic Cloud Enterprise
+          page: docs-content://deploy-manage/deploy/cloud-enterprise.md
+          children:
+          - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-architecture.md
+            title: Service-oriented architecture
+          - group: Prepare your environment
+            page: docs-content://deploy-manage/deploy/cloud-enterprise/prepare-environment.md
+            children:
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/identify-deployment-scenario.md
+              title: Identify your deployment scenario
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-hardware-prereq.md
+              title: Hardware prerequisites
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-software-prereq.md
+              title: Software prerequisites
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-sysconfig.md
+              title: System configuration
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-networking-prereq.md
+              title: Networking prerequisites
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-users-permissions.md
+              title: Users and permissions
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-ha.md
+              title: High availability
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-roles.md
+              title: Separation of roles
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-jvm.md
+              title: JVM heap size
+          - group: Configure your operating system
+            page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-operating-system.md
+            children:
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-host-ubuntu.md
+              title: Ubuntu
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-host-rhel.md
+              title: RHEL
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-host-suse.md
+              title: SUSE
+          - group: Install ECE
+            page: docs-content://deploy-manage/deploy/cloud-enterprise/install.md
+            children:
+            - group: Installation procedures
+              page: docs-content://deploy-manage/deploy/cloud-enterprise/install-ece-procedures.md
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/deploy-small-installation.md
+                title: Small installation
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/deploy-medium-installation.md
+                title: Medium installation
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/deploy-large-installation.md
+                title: Large installation
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/fresh-installation-of-ece-using-podman-hosts.md
+                title: Deploy using Podman
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/alternative-install-ece-with-ansible.md
+              title: Ansible playbook
+            - group: Air-gapped install
+              page: docs-content://deploy-manage/deploy/cloud-enterprise/air-gapped-install.md
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-install-offline-with-registry.md
+                title: With your private Docker registry
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-install-offline-no-registry.md
+                title: Without a private Docker registry
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-install-offline-images.md
+                title: Available Docker images
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/log-into-cloud-ui.md  # BOTH PHASES
+              title: Log into the Cloud UI
+          - group: Post-installation
+            page: docs-content://deploy-manage/deploy/cloud-enterprise/post-installation-steps.md
+            children:
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-wildcard-dns.md
+              title: Wildcard DNS and certificates
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-load-balancers.md
+              title: Load balancers
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/system-deployments-configuration.md  # BOTH PHASES
+              title: System deployments configuration
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/default-system-deployment-versions.md
+                title: Default system deployment versions
+          - group: Create your first deployment
+            children:
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/create-deployment.md  # BOTH PHASES
+              title: Create a deployment
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/connect-elasticsearch.md  # BOTH PHASES
+              title: Connect to Elasticsearch
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/access-kibana.md  # BOTH PHASES
+              title: Access Kibana
+        - group: Elastic Cloud on Kubernetes
+          page: docs-content://deploy-manage/deploy/cloud-on-k8s.md
+          children:
+          - group: Deploy an orchestrator
+            page: docs-content://deploy-manage/deploy/cloud-on-k8s/install.md
+            children:
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/install-using-yaml-manifest-quickstart.md
+              title: YAML manifests
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/install-using-helm-chart.md
+              title: Helm chart
+            - group: Deploy on OpenShift
+              page: docs-content://deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-openshift.md
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-operator.md
+                title: Deploy the operator
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-elasticsearch.md
+                title: Deploy Elasticsearch
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-kibana.md
+                title: Deploy Kibana
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-anyuid-workaround.md
+                title: anyuid SCC workaround
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-gke-autopilot.md
+              title: Deploy on GKE Autopilot
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/eck-gdch.md
+              title: Deploy on Google Distributed Cloud air-gapped
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/deploy-fips-compatible-version-of-eck.md
+              title: FIPS compatibility
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/air-gapped-install.md
+              title: Air-gapped environments
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/required-rbac-permissions.md  # BOTH PHASES
+              title: Required RBAC permissions
+          - group: Deploy your first workloads
+            children:
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md
+              title: Deploy an Elasticsearch cluster
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/kibana-instance-quickstart.md
+              title: Deploy a Kibana instance
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/accessing-services.md  # BOTH PHASES
+              title: Accessing services
+          - title: Production readiness checklist
+        - group: Self-managed cluster
+          page: docs-content://deploy-manage/deploy/self-managed.md
+          children:
+          - group: Install Elasticsearch
+            page: docs-content://deploy-manage/deploy/self-managed/installing-elasticsearch.md
+            children:
+            - page: docs-content://deploy-manage/deploy/self-managed/local-development-installation-quickstart.md
+              title: Local installation (quickstart)
+            - group: Important system configuration
+              page: docs-content://deploy-manage/deploy/self-managed/important-system-configuration.md
+              children:
+              - page: docs-content://deploy-manage/deploy/self-managed/elasticsearch-service-user.md
+                title: Elasticsearch service user
+              - page: docs-content://deploy-manage/deploy/self-managed/setting-system-settings.md
+                title: Configuration methods
+              - page: docs-content://deploy-manage/deploy/self-managed/setup-configuration-memory.md
+                title: Disable swapping
+              - page: docs-content://deploy-manage/deploy/self-managed/file-descriptors.md
+                title: File descriptors
+              - page: docs-content://deploy-manage/deploy/self-managed/vm-max-map-count.md
+                title: Virtual memory
+              - page: docs-content://deploy-manage/deploy/self-managed/max-number-of-threads.md
+                title: Increase max number of threads
+              - page: docs-content://deploy-manage/deploy/self-managed/executable-jna-tmpdir.md
+                title: JNA temporary directory
+              - page: docs-content://deploy-manage/deploy/self-managed/system-config-tcpretries.md
+                title: TCP retransmission timeout
+              - page: docs-content://deploy-manage/deploy/self-managed/bootstrap-checks.md
+                title: Bootstrap checks
+            - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-from-archive-on-linux-macos.md
+              title: Linux or macOS archive
+            - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-with-zip-on-windows.md
+              title: Windows .zip
+            - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-with-debian-package.md
+              title: Debian package
+            - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-with-rpm.md
+              title: RPM
+            - group: Docker
+              page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-with-docker.md
+              children:
+              - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-docker-basic.md
+                title: Single-node cluster
+              - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-docker-compose.md
+                title: Multi-node with Docker Compose
+              - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-docker-prod.md
+                title: Docker in production
+              - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-docker-configure.md
+                title: Configure with Docker
+            - page: docs-content://deploy-manage/deploy/self-managed/important-settings-configuration.md
+              title: Important Elasticsearch settings
+            - page: docs-content://deploy-manage/deploy/self-managed/configure-elasticsearch.md  # BOTH PHASES
+              title: Configure Elasticsearch
+          - group: Install Kibana
+            page: docs-content://deploy-manage/deploy/self-managed/install-kibana.md
+            children:
+            - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-from-archive-on-linux-macos.md
+              title: Linux or macOS archive
+            - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-on-windows.md
+              title: Windows
+            - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-with-debian-package.md
+              title: Debian package
+            - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-with-rpm.md
+              title: RPM
+            - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-with-docker.md
+              title: Docker
+            - page: docs-content://deploy-manage/deploy/self-managed/configure-kibana.md  # BOTH PHASES
+              title: Configure Kibana
+          - title: Access Elasticsearch
+          - page: docs-content://deploy-manage/deploy/self-managed/access-kibana.md  # BOTH PHASES
+            title: Access Kibana
+          - page: docs-content://deploy-manage/deploy/self-managed/air-gapped-install.md
+            title: Air-gapped install
+          - group: Tutorials
+            page: docs-content://deploy-manage/deploy/self-managed/tutorials.md
+            children:
+            - page: docs-content://deploy-manage/deploy/self-managed/tutorial-self-managed-install.md
+              title: Install a self-managed Elastic Stack
+            - page: docs-content://deploy-manage/deploy/self-managed/tutorial-self-managed-secure.md
+              title: Customize TLS certificates for a self-managed Elastic Stack
+          - title: Production readiness checklist
+      - group: Administer your orchestrator, deployment, or project
+        page: docs-content://deploy-manage/index.md
         children:
-        - page: docs-content://deploy-manage/upgrade/deployment-or-cluster.md
-          title: Upgrade your deployment or cluster
-        - page: docs-content://deploy-manage/upgrade/ingest-components.md
-          title: Upgrade your ingest components
-        - page: docs-content://deploy-manage/upgrade/orchestrator.md
-          title: Upgrade your orchestrator
-        - page: docs-content://deploy-manage/upgrade/plan-upgrade.md
-          title: Plan your upgrade
-        - page: docs-content://deploy-manage/upgrade/prepare-to-upgrade.md
-          title: Prepare to upgrade
-      - group: Uninstall
-        page: docs-content://deploy-manage/uninstall.md
+        - title: Administration skills
+        - label: Deployment-specific administration
+        - group: Elastic Cloud Hosted
+          children:
+          - group: Manage deployments
+            page: docs-content://deploy-manage/deploy/elastic-cloud/manage-deployments.md
+            children:
+            - group: Configure
+              page: docs-content://deploy-manage/deploy/elastic-cloud/configure.md
+              children:
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/ec-change-hardware-profile.md
+                title: Manage hardware profiles
+                children:
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/change-hardware.md
+                  title: Change instance configuration
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/ec-customize-deployment-components.md  # BOTH PHASES
+                title: Customize deployment components
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/edit-stack-settings.md
+                title: Edit stack settings
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/add-plugins-extensions.md
+                title: Add plugins and extensions
+                children:
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/upload-custom-plugins-bundles.md
+                  title: Upload custom plugins
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/manage-plugins-extensions-through-api.md
+                  title: Manage through the API
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/custom-endpoint-aliases.md
+                title: Custom endpoint aliases
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/manage-integrations-server.md
+              title: Manage Integrations Server
+              children:
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/switch-from-apm-to-integrations-server-payload.md
+                title: Switch from APM to Integrations Server
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/find-cloud-id.md
+              title: Find your Cloud ID
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/manage-deployments-using-elastic-cloud-api.md
+              title: Manage deployments using the API
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/keep-track-of-deployment-activity.md
+              title: Keep track of deployment activity
+          - page: docs-content://deploy-manage/deploy/elastic-cloud/access-kibana.md  # BOTH PHASES
+            title: Access Kibana
+          - page: docs-content://deploy-manage/deploy/elastic-cloud/ec-vcpu-boost-instance.md
+            title: vCPU boosting and credits
+          - page: docs-content://deploy-manage/deploy/elastic-cloud/available-stack-versions.md
+            title: Available stack versions
+          - page: docs-content://deploy-manage/deploy/elastic-cloud/restrictions-known-problems.md
+            title: Restrictions and known problems
+          - page: docs-content://deploy-manage/deploy/elastic-cloud/tools-apis.md
+            title: Tools and APIs
+        - group: Elastic Cloud Serverless
+          children:
+          - page: docs-content://deploy-manage/deploy/elastic-cloud/project-settings.md
+            title: Manage project settings
+          - page: docs-content://deploy-manage/deploy/elastic-cloud/manage-serverless-projects-using-api.md
+            title: Manage projects with API
+          - page: docs-content://deploy-manage/deploy/elastic-cloud/tools-apis.md
+            title: Tools and APIs
+        - group: Elastic Cloud Enterprise
+          children:
+          - group: Manage your orchestrator
+            page: docs-content://deploy-manage/deploy/cloud-enterprise/configure.md
+            children:
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/log-into-cloud-ui.md  # BOTH PHASES
+              title: Log into the Cloud UI
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/assign-roles-to-hosts.md
+              title: Assign roles to hosts
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/system-deployments-configuration.md  # BOTH PHASES
+              title: System deployments configuration
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/default-system-deployment-versions.md
+                title: Default system deployment versions
+            - group: Deployment templates
+              page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-deployment-templates.md  # BOTH PHASES
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/deployment-templates.md  # BOTH PHASES
+                title: Deployment templates reference
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-tag-allocators.md
+                title: Tag allocators
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-edit.md
+                title: Edit instance configurations
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-create.md
+                title: Create instance configurations
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-create-templates.md
+                title: Create templates
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-configure-system-templates.md
+                title: Configure default templates
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configure-templates-index-management.md
+                title: Configure index management
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ce-add-support-for-node-roles-autoscaling.md
+                title: Data tiers and autoscaling support
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-ce-add-support-for-integrations-server.md
+                title: Integrations server support
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-default.md
+                title: Default instance configurations
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/change-ece-api-url.md
+              title: Change the API URL
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/change-endpoint-urls.md
+              title: Change endpoint URLs
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/enable-custom-endpoint-aliases.md
+              title: Enable custom endpoint aliases
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-manage-capacity.md
+              title: Manage allocator capacity
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-allocator-affinity.md
+              title: Configure allocator affinity
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/change-allocator-disconnect-timeout.md
+              title: Change allocator disconnect timeout
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/install-ece-on-additional-hosts.md
+              title: Add hosts
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/generate-roles-tokens.md
+                title: Manage roles tokens
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md
+              title: Migrate to Podman
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/migrate-to-podman-5.md
+                title: Migrate to Podman 5
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-include-additional-kibana-plugin.md
+              title: Include additional Kibana plugins
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/manage-elastic-stack-versions.md
+              title: Manage stack versions
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/statistics-collected-by-cloud-enterprise.md
+              title: Statistics collected by ECE
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/tools-apis.md
+              title: Tools and APIs
+          - group: Manage deployments
+            page: docs-content://deploy-manage/deploy/cloud-enterprise/working-with-deployments.md
+            children:
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/deployment-templates.md  # BOTH PHASES
+              title: Deployment templates reference
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/create-deployment.md  # BOTH PHASES
+              title: Create a deployment
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/access-kibana.md  # BOTH PHASES
+              title: Access Kibana
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/connect-elasticsearch.md  # BOTH PHASES
+              title: Connect to Elasticsearch
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-deployment.md
+              title: Configure
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/customize-deployment.md
+                title: Customize deployment components
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings.md
+                title: Edit stack settings
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings-elasticsearch.md
+                  title: Elasticsearch user settings
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings-kibana.md
+                  title: Kibana user settings
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings-apm.md
+                  title: APM user settings
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings-enterprise.md
+                  title: Enterprise search user settings
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/resize-deployment.md
+                title: Resize a deployment
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/add-plugins.md
+                title: Add plugins and extensions
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/add-custom-bundles-plugins.md
+                title: Add custom bundles and plugins
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-regional-deployment-aliases.md
+                title: Custom endpoint aliases
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/resource-overrides.md
+                title: Resource overrides
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/advanced-cluster-configuration.md
+                title: Advanced cluster configuration
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/search-filter-deployments.md
+              title: Search and filter deployments
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/keep-track-of-deployment-activity.md
+              title: Keep track of deployment activity
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/manage-integrations-server.md
+              title: Manage Integrations Server
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-integrations-server-api-example.md
+                title: Enable through the API
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/switch-from-apm-to-integrations-server-payload.md
+                title: Switch from APM
+        - group: Elastic Cloud on Kubernetes
+          children:
+          - group: Manage the ECK operator
+            page: docs-content://deploy-manage/deploy/cloud-on-k8s/configure.md
+            children:
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configure-eck.md
+              title: Apply configuration settings
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configure-validating-webhook.md
+              title: Validating webhook
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/restrict-cross-namespace-resource-associations.md
+              title: Cross-namespace restrictions
+            - group: Service meshes
+              page: docs-content://deploy-manage/deploy/cloud-on-k8s/service-meshes.md
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-istio.md
+                title: Istio
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-linkerd.md
+                title: Linkerd
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/webhook-namespace-selectors.md
+              title: Webhook namespace selectors
+          - group: Manage deployments and workloads
+            page: docs-content://deploy-manage/deploy/cloud-on-k8s/manage-deployments.md
+            children:
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/managing-deployments-using-helm-chart.md
+              title: Elastic Stack Helm chart
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/update-deployments.md
+              title: Applying updates
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/accessing-services.md  # BOTH PHASES
+              title: Accessing services
+            - group: Configure deployments
+              page: docs-content://deploy-manage/deploy/cloud-on-k8s/configure-deployments.md
+              children:
+              - group: Elasticsearch configuration
+                page: docs-content://deploy-manage/deploy/cloud-on-k8s/elasticsearch-configuration.md
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/nodes-orchestration.md
+                  title: Nodes orchestration
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/storage-recommendations.md
+                  title: Storage recommendations
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/node-configuration.md
+                  title: Node configuration
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/volume-claim-templates.md
+                  title: Volume claim templates
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/virtual-memory.md
+                  title: Virtual memory
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/settings-managed-by-eck.md
+                  title: Settings managed by ECK
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/custom-configuration-files-plugins.md
+                  title: Custom configuration files and plugins
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/init-containers-for-plugin-downloads.md
+                  title: Init containers for plugins
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/update-strategy.md
+                  title: Update strategy
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/pod-disruption-budget.md
+                  title: Pod disruption budget
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/advanced-elasticsearch-node-scheduling.md
+                  title: Advanced node scheduling
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/readiness-probe.md
+                  title: Readiness probe
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/pod-prestop-hook.md
+                  title: Pod PreStop hook
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/security-context.md
+                  title: Security context
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/requests-routing-to-elasticsearch-nodes.md
+                  title: Traffic splitting
+              - group: Kibana configuration
+                page: docs-content://deploy-manage/deploy/cloud-on-k8s/kibana-configuration.md
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-kibana-es.md
+                  title: Connect Kibana to Elasticsearch
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-kibana-advanced-configuration.md
+                  title: Advanced configuration
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-kibana-plugins.md
+                  title: Kibana plugins
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/customize-pods.md
+                title: Customize pods
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/propagate-labels-annotations.md
+                title: Labels and annotations
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/manage-compute-resources.md
+                title: Compute resources
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/recipes.md
+                title: Recipes
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/connect-to-external-elastic-resources.md
+                title: Connect to external resources
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/elastic-stack-configuration-policies.md
+                title: Stack configuration policies
+            - group: Other Elastic applications
+              page: docs-content://deploy-manage/deploy/cloud-on-k8s/orchestrate-other-elastic-applications.md
+              children:
+              - group: APM Server
+                page: docs-content://deploy-manage/deploy/cloud-on-k8s/apm-server.md
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
+                  title: Use an ECK-managed cluster
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/advanced-configuration.md
+                  title: Advanced configuration
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/connect-to-apm-server.md
+                  title: Connect to APM Server
+              - group: Standalone Elastic Agent
+                page: docs-content://deploy-manage/deploy/cloud-on-k8s/standalone-elastic-agent.md
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md
+                  title: Quickstart
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md
+                  title: Configuration
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-examples-standalone.md
+                  title: Configuration examples
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-agent.md
+                  title: Agent on OpenShift
+              - group: Fleet-managed Elastic Agent
+                page: docs-content://deploy-manage/deploy/cloud-on-k8s/fleet-managed-elastic-agent.md
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/quickstart-fleet.md
+                  title: Quickstart
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md
+                  title: Configuration
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-examples-fleet.md
+                  title: Configuration examples
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/known-limitations.md
+                  title: Known limitations
+              - group: Elastic Maps Server
+                page: docs-content://deploy-manage/deploy/cloud-on-k8s/elastic-maps-server.md
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/deploy-elastic-maps-server.md
+                  title: Deploy Maps Server
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/map-data.md
+                  title: Map data
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/advanced-configuration-maps-server.md
+                  title: Advanced configuration
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/http-configuration.md
+                  title: HTTP configuration
+              - group: Beats
+                page: docs-content://deploy-manage/deploy/cloud-on-k8s/beats.md
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md
+                  title: Quickstart
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-beats.md
+                  title: Configuration
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-examples-beats.md
+                  title: Configuration examples
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/troubleshooting-beats.md
+                  title: Troubleshooting
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-beats.md
+                  title: Beats on OpenShift
+              - group: Logstash
+                page: docs-content://deploy-manage/deploy/cloud-on-k8s/logstash.md
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md
+                  title: Quickstart
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-logstash.md
+                  title: Configuration
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/securing-logstash-api.md
+                  title: Securing the API
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/logstash-plugins.md
+                  title: Plugins
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-examples-logstash.md
+                  title: Configuration examples
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/update-strategy-logstash.md
+                  title: Update strategy
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/advanced-configuration-logstash.md
+                  title: Advanced configuration
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/package-registry.md
+                title: Elastic Package Registry
+          - page: docs-content://deploy-manage/deploy/cloud-on-k8s/create-custom-images.md
+            title: Custom images
+          - page: docs-content://deploy-manage/deploy/cloud-on-k8s/tools-apis.md
+            title: Tools and APIs
+        - group: Self-managed clusters
+          children:
+          - page: docs-content://deploy-manage/deploy/self-managed/configure-elasticsearch.md  # BOTH PHASES
+            title: Configure Elasticsearch
+          - page: docs-content://deploy-manage/deploy/self-managed/configure-kibana.md
+            title: Configure Kibana
+          - page: docs-content://deploy-manage/deploy/self-managed/plugins.md
+            title: Manage plugins
+          - page: docs-content://deploy-manage/deploy/self-managed/access-kibana.md
+            title: Access Kibana
+          - page: docs-content://deploy-manage/deploy/self-managed/tools-apis.md
+            title: Tools and APIs
+        - label: ───
+        - group: Security and encryption
+          page: docs-content://deploy-manage/security.md
+        - group: Authentication and authorization
+          page: docs-content://deploy-manage/users-roles.md
+        - group: API keys
+          page: docs-content://deploy-manage/api-keys.md
+        - group: Spaces
+          page: docs-content://deploy-manage/manage-spaces.md
+        - group: Monitoring
+          page: docs-content://deploy-manage/monitor.md
+        - page: docs-content://deploy-manage/kibana-reporting-configuration.md
+          title: Configure Kibana reporting
+        - group: Backup, high availability, and resilience tools
+          page: docs-content://deploy-manage/tools.md
+        - group: Autoscaling
+          page: docs-content://deploy-manage/autoscaling.md
+        - page: docs-content://deploy-manage/stack-settings.md
+          title: Stack settings
+        - page: docs-content://deploy-manage/manage-connectors.md
+          title: Connectors
+        - group: Remote clusters
+          page: docs-content://deploy-manage/remote-clusters.md
+        - group: Cross-project search
+          page: docs-content://deploy-manage/cross-project-search-config.md
+          children:
+          - page: docs-content://deploy-manage/cross-project-search-config/cps-config-link-and-manage.md
+            title: Link and manage projects
+          - page: docs-content://deploy-manage/cross-project-search-config/cps-config-access-and-scope.md
+            title: Access and scope
+        - page: docs-content://deploy-manage/cloud-connect.md
+          title: Cloud Connect
+        - label: ───
+        - group: Maintenance
+          page: docs-content://deploy-manage/maintenance.md
+        - group: Upgrade
+          page: docs-content://deploy-manage/upgrade.md
+        - group: Uninstall
+          page: docs-content://deploy-manage/uninstall.md
+        - group: Licenses and subscriptions
+          page: docs-content://deploy-manage/license.md
+        - group: Manage your Cloud organization
+          page: docs-content://deploy-manage/cloud-organization.md
+      - group: Deployment and administration tools
         children:
-        - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md
-          title: Uninstall Elastic Cloud Enterprise
-        - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-on-kubernetes.md
-          title: Uninstall Elastic Cloud on Kubernetes
-    - group: Deployment and administration tools
-      children:
-      - title: Overview (roundup)
-      - toc: ecctl://reference
-  - label: The Elasticsearch Platform
+        - toc: ecctl://reference
+        - page: elasticsearch://reference/elasticsearch/command-line-tools/index.md
+          title: Command-line tools
+  - label: The Elasticsearch platform
     children:
     - label: Ingest and manage data
       children:
@@ -382,33 +847,6 @@ nav:
         page: docs-content://reference/ingestion-tools/index.md
         children:
         - toc: opentelemetry://reference
-          children:
-          - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/index.md
-            title: Quickstarts
-          - page: opentelemetry://reference/architecture/index.md
-            title: Reference Architecture
-          - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/index.md
-            title: Use cases
-          - page: opentelemetry://reference/compatibility/index.md
-            title: Compatibility and support
-          - page: opentelemetry://reference/data-streams.md
-            title: Data streams
-          - page: opentelemetry://reference/central-configuration.md
-            title: Central configuration
-        - toc: opentelemetry://reference/motlp
-        - toc: opentelemetry://reference/edot-cloud-forwarder
-        - toc: elastic-agent://reference/edot-collector
-        - group: EDOT SDKs
-          page: opentelemetry://reference/edot-sdks/index.md
-          children:
-          - toc: apm-agent-android://reference/edot-android
-          - toc: elastic-otel-dotnet://reference/edot-dotnet
-          - toc: apm-agent-ios://reference/edot-ios
-          - toc: elastic-otel-java://reference/edot-java
-          - toc: elastic-otel-node://reference/edot-node
-          - toc: elastic-otel-php://reference/edot-php
-          - toc: elastic-otel-python://reference/edot-python
-          - toc: elastic-otel-rum-js://reference/edot-browser
         - toc: docs-content://reference/fleet
         - toc: integration-docs://reference
         - toc: elasticsearch://reference/search-connectors

From dae9fc0854b0a1c4c00d7f13f34db16dbe6eecad Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 18:01:48 +0200
Subject: [PATCH 085/226] feat(hubs): add Product.Hub field for product hub URL
 mapping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Maps each product to an optional hub page URL slug, used by the upcoming
product badge renderer to link page-level product metadata to a 360°
landing page. Elasticsearch and Kibana wired to /hubs/{product}/9.0 for
the prototype; other products leave the field null and render no badge.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/products.yml                                        | 2 ++
 .../Products/Product.cs                                    | 7 +++++++
 .../Products/ProductExtensions.cs                          | 6 +++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/config/products.yml b/config/products.yml
index d96d39e83e..b5471b8912 100644
--- a/config/products.yml
+++ b/config/products.yml
@@ -147,6 +147,7 @@ products:
   elasticsearch:
     display: 'Elasticsearch'
     versioning: 'stack'
+    hub: 'hubs/elasticsearch/9.0'
   elasticsearch-client:
     display: 'Elasticsearch Client'
     versioning: 'stack'
@@ -207,6 +208,7 @@ products:
   kibana:
     display: 'Kibana'
     versioning: 'stack'
+    hub: 'hubs/kibana/9.0'
   logstash:
     display: 'Logstash'
     versioning: 'stack'
diff --git a/src/Elastic.Documentation.Configuration/Products/Product.cs b/src/Elastic.Documentation.Configuration/Products/Product.cs
index a1f6366468..3f4e851551 100644
--- a/src/Elastic.Documentation.Configuration/Products/Product.cs
+++ b/src/Elastic.Documentation.Configuration/Products/Product.cs
@@ -84,5 +84,12 @@ public record Product
 	public VersioningSystem? VersioningSystem { get; init; }
 	public string? Repository { get; init; }
 	public ProductFeatures Features { get; init; } = ProductFeatures.All;
+
+	/// <summary>
+	/// Slug of the product hub page, relative to the site root (no leading or trailing slash).
+	/// When set, regular pages that declare this product in frontmatter render a clickable
+	/// badge linking to <c>/{Hub}/</c>. When null, no badge is rendered for the product.
+	/// </summary>
+	public string? Hub { get; init; }
 }
 
diff --git a/src/Elastic.Documentation.Configuration/Products/ProductExtensions.cs b/src/Elastic.Documentation.Configuration/Products/ProductExtensions.cs
index 0c825afb2d..3e12fa8498 100644
--- a/src/Elastic.Documentation.Configuration/Products/ProductExtensions.cs
+++ b/src/Elastic.Documentation.Configuration/Products/ProductExtensions.cs
@@ -34,7 +34,8 @@ public static ProductsConfiguration CreateProducts(this ConfigurationFileProvide
 					DisplayName = kvp.Value.Display,
 					VersioningSystem = versioningSystem,
 					Repository = kvp.Value.Repository ?? kvp.Key,
-					Features = features
+					Features = features,
+					Hub = kvp.Value.Hub
 				};
 			});
 
@@ -103,4 +104,7 @@ internal sealed record ProductDto
 
 	[YamlMember(Alias = "features")]
 	public Dictionary<string, bool>? Features { get; set; }
+
+	[YamlMember(Alias = "hub")]
+	public string? Hub { get; set; }
 }

From dbda3a4290c0c4e16cd3ecf1281601e7c9add6b8 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 18:09:18 +0200
Subject: [PATCH 086/226] feat(hubs): add 'hub' page layout with full-width
 chrome

Adds a new MarkdownPageLayout.Hub value selected by frontmatter
'layout: hub'. The hub layout shares the section sidebar with regular
pages but drops the right-hand TOC and prev/next nav, and renders the
markdown body in a full-width <article class="hub-content"> wrapper so
hero and card-group directives can manage their own widths.

Two placeholder hub pages are wired in at /hubs/elasticsearch/9.0/ and
/hubs/kibana/9.0/, listed as hidden entries in docs/_docset.yml. They
are reached only via the upcoming Product hubs nav section and the
product-badge links; their bodies will be filled by hero/card-group
directives in subsequent commits.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docs/_docset.yml                           |  2 ++
 docs/hubs/elasticsearch/9.0.md             |  7 +++++++
 docs/hubs/kibana/9.0.md                    |  7 +++++++
 src/Elastic.Markdown/MarkdownPageLayout.cs |  3 ++-
 src/Elastic.Markdown/_Layout.cshtml        | 22 +++++++++++++++++++++-
 5 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 docs/hubs/elasticsearch/9.0.md
 create mode 100644 docs/hubs/kibana/9.0.md

diff --git a/docs/_docset.yml b/docs/_docset.yml
index 16e604fe9a..c43759d2fb 100644
--- a/docs/_docset.yml
+++ b/docs/_docset.yml
@@ -60,6 +60,8 @@ toc:
   - hidden: 404.md
   - hidden: _search.md
   - hidden: developer-notes.md
+  - hidden: hubs/elasticsearch/9.0.md
+  - hidden: hubs/kibana/9.0.md
   - hidden: contribute/cumulative-docs/index.md
   - hidden: contribute/cumulative-docs/guidelines.md
   - hidden: contribute/cumulative-docs/badge-placement.md
diff --git a/docs/hubs/elasticsearch/9.0.md b/docs/hubs/elasticsearch/9.0.md
new file mode 100644
index 0000000000..8346214f32
--- /dev/null
+++ b/docs/hubs/elasticsearch/9.0.md
@@ -0,0 +1,7 @@
+---
+layout: hub
+---
+
+# Elasticsearch
+
+Elasticsearch hub page placeholder. Hero and section directives land here in step 3.
diff --git a/docs/hubs/kibana/9.0.md b/docs/hubs/kibana/9.0.md
new file mode 100644
index 0000000000..7595573dbe
--- /dev/null
+++ b/docs/hubs/kibana/9.0.md
@@ -0,0 +1,7 @@
+---
+layout: hub
+---
+
+# Kibana
+
+Kibana hub page placeholder. Hero and section directives land here in step 3.
diff --git a/src/Elastic.Markdown/MarkdownPageLayout.cs b/src/Elastic.Markdown/MarkdownPageLayout.cs
index 6563b2a0fc..7f80d07134 100644
--- a/src/Elastic.Markdown/MarkdownPageLayout.cs
+++ b/src/Elastic.Markdown/MarkdownPageLayout.cs
@@ -11,5 +11,6 @@ public enum MarkdownPageLayout
 	[EnumMember(Value = "landing-page")] LandingPage,
 	[EnumMember(Value = "not-found")] NotFound,
 	[EnumMember(Value = "archive")] Archive,
-	[EnumMember(Value = "full-search")] FullSearch
+	[EnumMember(Value = "full-search")] FullSearch,
+	[EnumMember(Value = "hub")] Hub
 }
diff --git a/src/Elastic.Markdown/_Layout.cshtml b/src/Elastic.Markdown/_Layout.cshtml
index b88596eddd..9e1208d25e 100644
--- a/src/Elastic.Markdown/_Layout.cshtml
+++ b/src/Elastic.Markdown/_Layout.cshtml
@@ -22,7 +22,7 @@
 	private async Task RenderDefault()
 	{
 		<div class="relative">
-			
+
 			<div class="min-h-screen
 						w-full
 						max-w-(--max-layout-width)
@@ -46,6 +46,23 @@
 			</div>
 		</div>
 	}
+
+	private async Task RenderHub()
+	{
+		<div class="relative hub-page">
+			<div class="min-h-screen w-full max-w-(--max-layout-width) mx-auto md:px-4">
+				<div class="min-h-screen grid grid-cols-1 md:grid-cols-[var(--max-sidebar-width)_1fr] gap-4">
+					@await RenderPartialAsync(_PagesNav.Create<GlobalLayoutViewModel>(Model))
+					<main id="content-container" class="min-w-0">
+						<input type="checkbox" class="hidden" id="pages-nav-hamburger">
+						<article id="hub-content" class="hub-content min-w-0">
+							@await RenderBodyAsync()
+						</article>
+					</main>
+				</div>
+			</div>
+		</div>
+	}
 }
 
 @if (RenderHeaderAndFooter)
@@ -75,6 +92,9 @@
 	case MarkdownPageLayout.FullSearch:
 		await RenderPartialAsync(_FullSearch.Create(Model));
 		break;
+	case MarkdownPageLayout.Hub:
+		await RenderHub();
+		break;
 	default:
 		await RenderDefault();
 		break;

From e9676c67d2b0abdbd56a2cc164b2de44a4a90358 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 18:41:27 +0200
Subject: [PATCH 087/226] feat(hubs): add {hero} directive for landing-page
 heroes

Generic, reusable directive that renders a full-bleed hero region with
optional icon, version badge, search box, and quick links. Body content
(typically an H1 plus a short description paragraph) renders inside the
hero, so the page's H1 stays the canonical title.

Title detection in MarkdownFile falls back to descendant H1s when no
top-level H1 is present, so a {hero}-wrapped H1 is still picked up as
the page title without spurious 'no title' warnings.

The wired-up Elasticsearch placeholder hub now drives the hero. Cards
and card-group come in subsequent commits.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docs/hubs/elasticsearch/9.0.md                | 10 ++-
 src/Elastic.Markdown/IO/MarkdownFile.cs       | 10 +++
 .../Myst/Directives/DirectiveBlockParser.cs   |  4 ++
 .../Myst/Directives/DirectiveHtmlRenderer.cs  | 17 +++++
 .../Myst/Directives/Hub/HeroBlock.cs          | 66 +++++++++++++++++++
 .../Myst/Directives/Hub/HeroView.cshtml       | 34 ++++++++++
 .../Myst/Directives/Hub/HeroViewModel.cs      | 13 ++++
 7 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs

diff --git a/docs/hubs/elasticsearch/9.0.md b/docs/hubs/elasticsearch/9.0.md
index 8346214f32..88a5fadf0a 100644
--- a/docs/hubs/elasticsearch/9.0.md
+++ b/docs/hubs/elasticsearch/9.0.md
@@ -2,6 +2,14 @@
 layout: hub
 ---
 
+:::{hero}
+:icon: E
+:version: 9.0
+:quick-links: What's new=#whats-new,Get started=#get-started,All versions=/
+
 # Elasticsearch
 
-Elasticsearch hub page placeholder. Hero and section directives land here in step 3.
+The distributed search and analytics engine, ready for production at scale.
+:::
+
+Card sections will land here in step 4.
diff --git a/src/Elastic.Markdown/IO/MarkdownFile.cs b/src/Elastic.Markdown/IO/MarkdownFile.cs
index ee548e9bba..8fdb7835ce 100644
--- a/src/Elastic.Markdown/IO/MarkdownFile.cs
+++ b/src/Elastic.Markdown/IO/MarkdownFile.cs
@@ -156,6 +156,16 @@ protected void ReadDocumentInstructions(MarkdownDocument document, Func<string,
 			.FirstOrDefault(block => block is HeadingBlock { Level: 1 })?
 			.GetData("header") as string ?? Title;
 
+		// Fall back to any H1 nested in directive containers (e.g. {hero}) so layouts
+		// that wrap the page title in a directive still get title detection.
+		if (Title == RelativePath)
+		{
+			Title = document
+				.Descendants<HeadingBlock>()
+				.FirstOrDefault(h => h.Level == 1)?
+				.GetData("header") as string ?? Title;
+		}
+
 		var yamlFrontMatter = ProcessYamlFrontMatter(document);
 		YamlFrontMatter = yamlFrontMatter;
 		if (yamlFrontMatter.NavigationTitle is not null)
diff --git a/src/Elastic.Markdown/Myst/Directives/DirectiveBlockParser.cs b/src/Elastic.Markdown/Myst/Directives/DirectiveBlockParser.cs
index 301822195b..a479e4180c 100644
--- a/src/Elastic.Markdown/Myst/Directives/DirectiveBlockParser.cs
+++ b/src/Elastic.Markdown/Myst/Directives/DirectiveBlockParser.cs
@@ -9,6 +9,7 @@
 using Elastic.Markdown.Myst.Directives.Button;
 using Elastic.Markdown.Myst.Directives.Changelog;
 using Elastic.Markdown.Myst.Directives.CsvInclude;
+using Elastic.Markdown.Myst.Directives.Hub;
 using Elastic.Markdown.Myst.Directives.Image;
 using Elastic.Markdown.Myst.Directives.Include;
 using Elastic.Markdown.Myst.Directives.Math;
@@ -136,6 +137,9 @@ protected override DirectiveBlock CreateFencedBlock(BlockProcessor processor)
 		if (info.IndexOf("{agent-skill}") > 0)
 			return new AgentSkillBlock(this, context);
 
+		if (info.IndexOf("{hero}") > 0)
+			return new HeroBlock(this, context);
+
 		foreach (var admonition in Admonitions)
 		{
 			if (info.IndexOf(admonition) > 0)
diff --git a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
index d731bf1b45..7c912068ea 100644
--- a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
@@ -15,6 +15,7 @@
 using Elastic.Markdown.Myst.Directives.Changelog;
 using Elastic.Markdown.Myst.Directives.CsvInclude;
 using Elastic.Markdown.Myst.Directives.Dropdown;
+using Elastic.Markdown.Myst.Directives.Hub;
 using Elastic.Markdown.Myst.Directives.Image;
 using Elastic.Markdown.Myst.Directives.Include;
 using Elastic.Markdown.Myst.Directives.Math;
@@ -121,6 +122,9 @@ protected override void Write(HtmlRenderer renderer, DirectiveBlock directiveBlo
 			case AgentSkillBlock agentSkillBlock:
 				WriteAgentSkill(renderer, agentSkillBlock);
 				return;
+			case HeroBlock heroBlock:
+				WriteHero(renderer, heroBlock);
+				return;
 			default:
 				// if (!string.IsNullOrEmpty(directiveBlock.Info) && !directiveBlock.Info.StartsWith('{'))
 				// 	WriteCode(renderer, directiveBlock);
@@ -332,6 +336,19 @@ private static void WriteTabSet(HtmlRenderer renderer, TabSetBlock block)
 		RenderRazorSlice(slice, renderer);
 	}
 
+	private static void WriteHero(HtmlRenderer renderer, HeroBlock block)
+	{
+		var slice = HeroView.Create(new HeroViewModel
+		{
+			DirectiveBlock = block,
+			Icon = block.Icon,
+			Version = block.Version,
+			ShowSearch = block.ShowSearch,
+			QuickLinks = block.QuickLinks
+		});
+		RenderRazorSlice(slice, renderer);
+	}
+
 	private static void WriteTabItem(HtmlRenderer renderer, TabItemBlock block)
 	{
 		var slice = TabItemView.Create(new TabItemViewModel
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
new file mode 100644
index 0000000000..c28ea58412
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
@@ -0,0 +1,66 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+/// <summary>
+/// Renders a full-bleed page hero (dark background, icon, title, description, optional
+/// version badge, optional quick links, optional search box). Designed for landing-style
+/// pages such as product hubs, but the directive is generic and reusable.
+/// </summary>
+/// <example>
+/// <code>
+/// :::{hero}
+/// :icon: elasticsearch
+/// :version: 9.0
+/// :quick-links: What's new=#whats-new,Get started=/get-started
+///
+/// # Elasticsearch
+///
+/// The distributed search and analytics engine.
+/// :::
+/// </code>
+/// </example>
+public class HeroBlock(DirectiveBlockParser parser, ParserContext context)
+	: DirectiveBlock(parser, context)
+{
+	public override string Directive => "hero";
+
+	public string? Icon { get; private set; }
+	public string? Version { get; private set; }
+	public bool ShowSearch { get; private set; }
+	public IReadOnlyList<HeroQuickLink> QuickLinks { get; private set; } = [];
+
+	public override void FinalizeAndValidate(ParserContext context)
+	{
+		Icon = Prop("icon");
+		Version = Prop("version");
+		// search defaults to true; explicit ":search: false" hides it
+		ShowSearch = TryPropBool("search") ?? true;
+		QuickLinks = ParseQuickLinks(Prop("quick-links"));
+	}
+
+	private static IReadOnlyList<HeroQuickLink> ParseQuickLinks(string? raw)
+	{
+		if (string.IsNullOrWhiteSpace(raw))
+			return [];
+
+		var entries = new List<HeroQuickLink>();
+		foreach (var part in raw.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
+		{
+			var separator = part.IndexOf('=');
+			if (separator <= 0 || separator == part.Length - 1)
+				continue;
+
+			var label = part[..separator].Trim();
+			var url = part[(separator + 1)..].Trim();
+			if (label.Length > 0 && url.Length > 0)
+				entries.Add(new HeroQuickLink(label, url));
+		}
+
+		return entries;
+	}
+}
+
+public readonly record struct HeroQuickLink(string Label, string Url);
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
new file mode 100644
index 0000000000..cbd2d794e0
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
@@ -0,0 +1,34 @@
+@inherits RazorSlice<Elastic.Markdown.Myst.Directives.Hub.HeroViewModel>
+
+<section class="hub-hero">
+	<div class="hub-hero-inner">
+		<div class="hub-hero-top">
+			@if (!string.IsNullOrWhiteSpace(Model.Icon))
+			{
+				<span class="hub-hero-icon" aria-hidden="true">@Model.Icon</span>
+			}
+			@if (!string.IsNullOrWhiteSpace(Model.Version))
+			{
+				<span class="hub-hero-version">@Model.Version</span>
+			}
+		</div>
+		<div class="hub-hero-content">
+			@Model.RenderBlock()
+		</div>
+		@if (Model.ShowSearch)
+		{
+			<div class="hub-hero-search">
+				<navigation-search></navigation-search>
+			</div>
+		}
+		@if (Model.QuickLinks.Count > 0)
+		{
+			<ul class="hub-hero-links">
+				@foreach (var link in Model.QuickLinks)
+				{
+					<li><a href="@link.Url">@link.Label</a></li>
+				}
+			</ul>
+		}
+	</div>
+</section>
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs
new file mode 100644
index 0000000000..1809af3d30
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs
@@ -0,0 +1,13 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+public class HeroViewModel : DirectiveViewModel
+{
+	public required string? Icon { get; init; }
+	public required string? Version { get; init; }
+	public required bool ShowSearch { get; init; }
+	public required IReadOnlyList<HeroQuickLink> QuickLinks { get; init; }
+}

From ec6ff071d4e0aeb29e1d65763e8e18e3adb3a601 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 18:44:46 +0200
Subject: [PATCH 088/226] feat(hubs): add {card-group} and {link-card}
 directives

{card-group} is a container with optional :title:, :intro:, :id:, and
:variant: options that wraps a grid of {link-card} children. {link-card}
is a leaf with a required title argument and :link: option, plus an
optional :badge: pill, and renders the directive body as the card
description.

Both are generic enough to be used outside hub pages -- any landing or
section page can render a titled card grid with these.

The Elasticsearch placeholder hub is wired up with three card groups
(What's new in news variant, Install and deploy, Index and ingest data)
to exercise the rendering end to end.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docs/hubs/elasticsearch/9.0.md                | 64 ++++++++++++++++++-
 .../Myst/Directives/DirectiveBlockParser.cs   |  6 ++
 .../Myst/Directives/DirectiveHtmlRenderer.cs  | 31 +++++++++
 .../Myst/Directives/Hub/CardGroupBlock.cs     | 46 +++++++++++++
 .../Myst/Directives/Hub/CardGroupView.cshtml  | 23 +++++++
 .../Myst/Directives/Hub/CardGroupViewModel.cs | 13 ++++
 .../Myst/Directives/Hub/LinkCardBlock.cs      | 45 +++++++++++++
 .../Myst/Directives/Hub/LinkCardView.cshtml   | 16 +++++
 .../Myst/Directives/Hub/LinkCardViewModel.cs  | 12 ++++
 9 files changed, 254 insertions(+), 2 deletions(-)
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/CardGroupBlock.cs
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/CardGroupView.cshtml
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/CardGroupViewModel.cs
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/LinkCardBlock.cs
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/LinkCardViewModel.cs

diff --git a/docs/hubs/elasticsearch/9.0.md b/docs/hubs/elasticsearch/9.0.md
index 88a5fadf0a..1069f120a3 100644
--- a/docs/hubs/elasticsearch/9.0.md
+++ b/docs/hubs/elasticsearch/9.0.md
@@ -5,11 +5,71 @@ layout: hub
 :::{hero}
 :icon: E
 :version: 9.0
-:quick-links: What's new=#whats-new,Get started=#get-started,All versions=/
+:quick-links: What's new=#whats-new,Get started=#install,All versions=/
 
 # Elasticsearch
 
 The distributed search and analytics engine, ready for production at scale.
 :::
 
-Card sections will land here in step 4.
+::::{card-group}
+:title: What's new
+:variant: news
+:id: whats-new
+
+:::{link-card} ES|QL JOIN syntax now GA
+:link: /
+:badge: 9.0
+Run cross-index joins in ES|QL queries with full GA stability and performance.
+:::
+
+:::{link-card} Vector quantization improvements
+:link: /
+:badge: 9.0
+30% smaller indices and faster search with the new BBQ encoding.
+:::
+
+::::
+
+::::{card-group}
+:title: Install and deploy
+:intro: Get Elasticsearch running on the platform of your choice.
+:id: install
+
+:::{link-card} Self-managed
+:link: /
+Run Elasticsearch on your own infrastructure for full control over hardware and configuration.
+:::
+
+:::{link-card} Elastic Cloud Hosted
+:link: /
+Managed deployments on AWS, GCP, or Azure with one-click upgrades and zero downtime.
+:::
+
+:::{link-card} Elastic Cloud Serverless
+:link: /
+Pay-per-use Elasticsearch with no clusters to manage and elastic auto-scaling.
+:::
+
+::::
+
+::::{card-group}
+:title: Index and ingest data
+:intro: Move data into Elasticsearch from any source.
+
+:::{link-card} Elastic integrations
+:link: /
+Pre-built integrations for hundreds of services and platforms.
+:::
+
+:::{link-card} Logstash
+:link: /
+Ingest, transform, and enrich data from any source.
+:::
+
+:::{link-card} Beats
+:link: /
+Lightweight shippers for logs, metrics, and network data.
+:::
+
+::::
diff --git a/src/Elastic.Markdown/Myst/Directives/DirectiveBlockParser.cs b/src/Elastic.Markdown/Myst/Directives/DirectiveBlockParser.cs
index a479e4180c..d38bfa1921 100644
--- a/src/Elastic.Markdown/Myst/Directives/DirectiveBlockParser.cs
+++ b/src/Elastic.Markdown/Myst/Directives/DirectiveBlockParser.cs
@@ -140,6 +140,12 @@ protected override DirectiveBlock CreateFencedBlock(BlockProcessor processor)
 		if (info.IndexOf("{hero}") > 0)
 			return new HeroBlock(this, context);
 
+		if (info.IndexOf("{card-group}") > 0)
+			return new CardGroupBlock(this, context);
+
+		if (info.IndexOf("{link-card}") > 0)
+			return new LinkCardBlock(this, context);
+
 		foreach (var admonition in Admonitions)
 		{
 			if (info.IndexOf(admonition) > 0)
diff --git a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
index 7c912068ea..df6f26b8a2 100644
--- a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
@@ -125,6 +125,12 @@ protected override void Write(HtmlRenderer renderer, DirectiveBlock directiveBlo
 			case HeroBlock heroBlock:
 				WriteHero(renderer, heroBlock);
 				return;
+			case CardGroupBlock cardGroupBlock:
+				WriteCardGroup(renderer, cardGroupBlock);
+				return;
+			case LinkCardBlock linkCardBlock:
+				WriteLinkCard(renderer, linkCardBlock);
+				return;
 			default:
 				// if (!string.IsNullOrEmpty(directiveBlock.Info) && !directiveBlock.Info.StartsWith('{'))
 				// 	WriteCode(renderer, directiveBlock);
@@ -349,6 +355,31 @@ private static void WriteHero(HtmlRenderer renderer, HeroBlock block)
 		RenderRazorSlice(slice, renderer);
 	}
 
+	private static void WriteCardGroup(HtmlRenderer renderer, CardGroupBlock block)
+	{
+		var slice = CardGroupView.Create(new CardGroupViewModel
+		{
+			DirectiveBlock = block,
+			Title = block.Title,
+			Intro = block.Intro,
+			Anchor = block.Anchor,
+			Variant = block.Variant
+		});
+		RenderRazorSlice(slice, renderer);
+	}
+
+	private static void WriteLinkCard(HtmlRenderer renderer, LinkCardBlock block)
+	{
+		var slice = LinkCardView.Create(new LinkCardViewModel
+		{
+			DirectiveBlock = block,
+			Title = block.Title,
+			Link = block.Link,
+			Badge = block.Badge
+		});
+		RenderRazorSlice(slice, renderer);
+	}
+
 	private static void WriteTabItem(HtmlRenderer renderer, TabItemBlock block)
 	{
 		var slice = TabItemView.Create(new TabItemViewModel
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/CardGroupBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/CardGroupBlock.cs
new file mode 100644
index 0000000000..ed6a11d43a
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/CardGroupBlock.cs
@@ -0,0 +1,46 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+/// <summary>
+/// Container directive that renders a titled section housing a grid of
+/// <see cref="LinkCardBlock"/> children. Generic and reusable wherever a
+/// linked-card grid is appropriate.
+/// </summary>
+/// <example>
+/// <code>
+/// ::::{card-group}
+/// :title: Install and deploy
+/// :intro: Set up Elasticsearch on your platform of choice.
+/// :id: install
+///
+/// :::{link-card} Self-managed
+/// :link: /deploy-manage/deploy/self-managed
+/// Run on your own infrastructure.
+/// :::
+/// ::::
+/// </code>
+/// </example>
+public class CardGroupBlock(DirectiveBlockParser parser, ParserContext context)
+	: DirectiveBlock(parser, context)
+{
+	public override string Directive => "card-group";
+
+	public string? Title { get; private set; }
+	public string? Intro { get; private set; }
+	public string? Anchor { get; private set; }
+	public string? Variant { get; private set; }
+
+	public override void FinalizeAndValidate(ParserContext context)
+	{
+		Title = Prop("title");
+		Intro = Prop("intro");
+		Anchor = Prop("id");
+		Variant = Prop("variant");
+	}
+
+	public override IEnumerable<string> GeneratedAnchors =>
+		string.IsNullOrWhiteSpace(Anchor) ? [] : [Anchor];
+}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/CardGroupView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/CardGroupView.cshtml
new file mode 100644
index 0000000000..979065318e
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/CardGroupView.cshtml
@@ -0,0 +1,23 @@
+@inherits RazorSlice<Elastic.Markdown.Myst.Directives.Hub.CardGroupViewModel>
+
+@{
+	var sectionClass = string.IsNullOrWhiteSpace(Model.Variant)
+		? "hub-card-group"
+		: $"hub-card-group hub-card-group-{Model.Variant}";
+}
+
+<section class="@sectionClass" id="@Model.Anchor">
+	@if (!string.IsNullOrWhiteSpace(Model.Title))
+	{
+		<header class="hub-card-group-header">
+			<h2>@Model.Title</h2>
+			@if (!string.IsNullOrWhiteSpace(Model.Intro))
+			{
+				<p class="hub-card-group-intro">@Model.Intro</p>
+			}
+		</header>
+	}
+	<ul class="hub-card-grid">
+		@Model.RenderBlock()
+	</ul>
+</section>
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/CardGroupViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Hub/CardGroupViewModel.cs
new file mode 100644
index 0000000000..d75d8716ac
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/CardGroupViewModel.cs
@@ -0,0 +1,13 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+public class CardGroupViewModel : DirectiveViewModel
+{
+	public required string? Title { get; init; }
+	public required string? Intro { get; init; }
+	public required string? Anchor { get; init; }
+	public required string? Variant { get; init; }
+}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardBlock.cs
new file mode 100644
index 0000000000..8c4431a8a4
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardBlock.cs
@@ -0,0 +1,45 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Markdown.Diagnostics;
+using Elastic.Markdown.Helpers;
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+/// <summary>
+/// A single card with a required title and link, plus an optional badge and
+/// description body. Designed to live inside a <see cref="CardGroupBlock"/>
+/// but rendered standalone if used outside one.
+/// </summary>
+/// <example>
+/// <code>
+/// :::{link-card} Self-managed
+/// :link: /deploy-manage/deploy/self-managed
+/// :badge: 9.0
+/// Run Elasticsearch on your own infrastructure.
+/// :::
+/// </code>
+/// </example>
+public class LinkCardBlock(DirectiveBlockParser parser, ParserContext context)
+	: DirectiveBlock(parser, context), IBlockTitle
+{
+	public override string Directive => "link-card";
+
+	public string Title { get; private set; } = default!;
+	public string? Link { get; private set; }
+	public string? Badge { get; private set; }
+
+	public override void FinalizeAndValidate(ParserContext context)
+	{
+		if (string.IsNullOrWhiteSpace(Arguments))
+			this.EmitError("{link-card} requires a title argument, e.g. `:::{link-card} My title`.");
+
+		Title = (Arguments ?? "{undefined}").ReplaceSubstitutions(context);
+		Link = Prop("link");
+		Badge = Prop("badge");
+
+		if (string.IsNullOrWhiteSpace(Link))
+			this.EmitError("{link-card} requires a `:link:` option.");
+	}
+}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml
new file mode 100644
index 0000000000..d9bb7d3d60
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml
@@ -0,0 +1,16 @@
+@inherits RazorSlice<Elastic.Markdown.Myst.Directives.Hub.LinkCardViewModel>
+
+<li class="hub-card">
+	<a class="hub-card-link" href="@Model.Link">
+		<div class="hub-card-head">
+			<span class="hub-card-title">@Model.Title</span>
+			@if (!string.IsNullOrWhiteSpace(Model.Badge))
+			{
+				<span class="hub-card-badge">@Model.Badge</span>
+			}
+		</div>
+		<div class="hub-card-body">
+			@Model.RenderBlock()
+		</div>
+	</a>
+</li>
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardViewModel.cs
new file mode 100644
index 0000000000..7d91af642c
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardViewModel.cs
@@ -0,0 +1,12 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+public class LinkCardViewModel : DirectiveViewModel
+{
+	public required string Title { get; init; }
+	public required string? Link { get; init; }
+	public required string? Badge { get; init; }
+}

From 8817c8ce2899cdb827e48c23305e747083cf74ba Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 18:47:19 +0200
Subject: [PATCH 089/226] feat(hubs): add 'Product hubs' top-bar section to
 nav-v2

New section in navigation-v2.yml that surfaces the prototype hub pages
in the V2 secondary nav. The Elasticsearch and Kibana hubs are wired up
as page references; Observability, Security, and the three deployment
runbooks are placeholder title leaves until their hub markdown lands.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/navigation-v2.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index a212064cd7..a3f262d205 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -2871,6 +2871,21 @@ nav:
     children:
     - toc: docs-content://release-notes/intro
 
+  - section: Product hubs
+    url: /hubs/
+    children:
+    - label: Stack products
+      children:
+      - page: docs-builder://hubs/elasticsearch/9.0.md
+      - page: docs-builder://hubs/kibana/9.0.md
+      - title: Observability
+      - title: Security
+    - label: Deployment runbooks
+      children:
+      - title: Elastic Cloud Hosted
+      - title: Elastic Cloud Serverless
+      - title: Self-managed
+
   - section: Extension points
     url: /extend/
     isolated: true

From e3d365f655bd9bfc9cfe410f16df1e3e4ea4e3f7 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 19:03:48 +0200
Subject: [PATCH 090/226] feat(hubs): render product badges linking to hub
 pages

Adds a ProductBadges partial that renders a clickable pill for each
frontmatter product whose Product.Hub field is set, linking to that
product's hub page. Skipped on layouts that own their own chrome
(hub, landing, archive, full-search). For products without a hub
configured, no badge is rendered, so the feature lights up
incrementally as more products get hub URLs in products.yml.

The mapping is centralized: products.yml is the single source of
truth for which products have hubs and where they live.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/Elastic.Markdown/Page/Index.cshtml        |  2 ++
 .../Page/ProductBadges.cshtml                 | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 src/Elastic.Markdown/Page/ProductBadges.cshtml

diff --git a/src/Elastic.Markdown/Page/Index.cshtml b/src/Elastic.Markdown/Page/Index.cshtml
index f820b165a6..e31eb35864 100644
--- a/src/Elastic.Markdown/Page/Index.cshtml
+++ b/src/Elastic.Markdown/Page/Index.cshtml
@@ -6,6 +6,7 @@
 @using Elastic.Markdown
 @using Elastic.Markdown.Myst.Components
 @using Markdig
+@using Elastic.Markdown.Page
 @using ViewModelSerializerContext = Elastic.Markdown.Page.ViewModelSerializerContext
 @inherits RazorSliceHttpResult<Elastic.Markdown.Page.IndexViewModel>
 @implements IUsesLayout<Elastic.Markdown._Layout, MarkdownLayoutViewModel>
@@ -91,6 +92,7 @@
 <section id="elastic-docs-v3">
 	@* This way it's correctly rendered as <h1>text</h1> instead of <h1><p>text</p></h1> *@
 	@(new HtmlString(Markdown.ToHtml("# " + Model.TitleRaw)))
+	@await RenderPartialAsync(ProductBadges.Create(Model))
 	@if (Model.AppliesTo is not null)
 	{
 		<p class="applies applies-block">
diff --git a/src/Elastic.Markdown/Page/ProductBadges.cshtml b/src/Elastic.Markdown/Page/ProductBadges.cshtml
new file mode 100644
index 0000000000..bc3066f2f1
--- /dev/null
+++ b/src/Elastic.Markdown/Page/ProductBadges.cshtml
@@ -0,0 +1,24 @@
+@inherits RazorSlice<Elastic.Markdown.Page.IndexViewModel>
+@{
+	// Hide on layouts that own the page chrome themselves (hub, landing, archive, search).
+	var layout = Model.CurrentDocument.YamlFrontMatter?.Layout;
+	var skip = layout is not null;
+	var withHubs = skip
+		? []
+		: Model.Products
+			.Where(p => !string.IsNullOrWhiteSpace(p.Hub))
+			.OrderBy(p => p.DisplayName, StringComparer.Ordinal)
+			.ToList();
+	var prefix = Model.UrlPathPrefix?.TrimEnd('/') ?? string.Empty;
+}
+@if (withHubs.Count > 0)
+{
+	<ul class="product-badges" aria-label="Related product hubs">
+		@foreach (var product in withHubs)
+		{
+			<li>
+				<a class="product-badge" href="@($"{prefix}/{product.Hub!.Trim('/')}/")">@product.DisplayName</a>
+			</li>
+		}
+	</ul>
+}

From 28cbacacc316a4600424b1c957e9d8d6cc0d04d4 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 19:11:46 +0200
Subject: [PATCH 091/226] feat(hubs): style hub pages, cards, and product
 badges + port Kibana hub

Adds hub.css with Tailwind component layer rules for hero, card-group,
link-card, and product-badges. The hero is full-bleed dark navy with
icon and version chips, content rail constrained to the standard text
width. Cards are a responsive 1/2/3-column grid; the news variant
collapses to a tighter 1/2-column list. Product badges are subtle
grey pills that hover blue.

The Kibana hub markdown is filled in with seven sections (What's new,
Install and administer, Explore visualize and analyze, Track and
respond, AI and automation, Management and developer tools) mirroring
the gist prototype.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docs/hubs/kibana/9.0.md                       | 137 +++++++++++++++++-
 .../Assets/markdown/hub.css                   | 136 +++++++++++++++++
 .../Assets/styles.css                         |   1 +
 3 files changed, 273 insertions(+), 1 deletion(-)
 create mode 100644 src/Elastic.Documentation.Site/Assets/markdown/hub.css

diff --git a/docs/hubs/kibana/9.0.md b/docs/hubs/kibana/9.0.md
index 7595573dbe..2bc63dd2c4 100644
--- a/docs/hubs/kibana/9.0.md
+++ b/docs/hubs/kibana/9.0.md
@@ -2,6 +2,141 @@
 layout: hub
 ---
 
+:::{hero}
+:icon: K
+:version: 9.0
+:quick-links: What's new=#whats-new,Install=#install,All versions=/
+
 # Kibana
 
-Kibana hub page placeholder. Hero and section directives land here in step 3.
+The window into the Elastic Stack. Visualize, analyze, and explore your data with dashboards, queries, and machine learning.
+:::
+
+::::{card-group}
+:title: What's new
+:variant: news
+:id: whats-new
+
+:::{link-card} Refreshed dashboard layout engine
+:link: /
+:badge: 9.0
+Smoother resizing, faster panel rendering, and improved touch behavior.
+:::
+
+:::{link-card} Lens chart suggestions
+:link: /
+:badge: 9.0
+Lens now suggests visualizations based on your data shape automatically.
+:::
+
+::::
+
+::::{card-group}
+:title: Install and administer
+:intro: Get Kibana running and configure it for your environment.
+:id: install
+
+:::{link-card} Self-managed
+:link: /
+Install Kibana on your own infrastructure with full configuration control.
+:::
+
+:::{link-card} Elastic Cloud Hosted
+:link: /
+Kibana included in every Elastic Cloud deployment, fully managed.
+:::
+
+:::{link-card} Configure Kibana
+:link: /
+Set up authentication, spaces, monitoring, alerts, and more.
+:::
+
+::::
+
+::::{card-group}
+:title: Explore, visualize, and analyze
+:intro: The core Kibana surfaces for working with your data.
+:id: explore
+
+:::{link-card} Discover
+:link: /
+Search and explore raw documents in any Elasticsearch index.
+:::
+
+:::{link-card} Dashboards
+:link: /
+Build and share interactive dashboards with charts, maps, and metrics.
+:::
+
+:::{link-card} Lens
+:link: /
+Drag-and-drop visualization builder with smart suggestions.
+:::
+
+::::
+
+::::{card-group}
+:title: Track and respond
+:intro: Alerting, watchers, and case management.
+:id: track
+
+:::{link-card} Alerting
+:link: /
+Define rules and trigger actions when conditions are met.
+:::
+
+:::{link-card} Cases
+:link: /
+Collect, track, and resolve issues across teams.
+:::
+
+:::{link-card} Maps
+:link: /
+Geospatial analysis and live tracking on layered maps.
+:::
+
+::::
+
+::::{card-group}
+:title: AI and automation
+:intro: Machine learning and AI-assisted workflows in Kibana.
+:id: ai
+
+:::{link-card} Machine learning
+:link: /
+Detect anomalies, classify data, and forecast trends.
+:::
+
+:::{link-card} AI Assistant
+:link: /
+A conversational assistant that helps you query and analyze data.
+:::
+
+:::{link-card} Automatic insights
+:link: /
+Surface notable changes in your data without writing rules.
+:::
+
+::::
+
+::::{card-group}
+:title: Management and developer tools
+:intro: Stack management, Dev Tools, and APIs.
+:id: manage
+
+:::{link-card} Stack Management
+:link: /
+Manage spaces, roles, index lifecycle, snapshots, and more.
+:::
+
+:::{link-card} Dev Tools
+:link: /
+Console, Painless Lab, Search Profiler, Grok Debugger.
+:::
+
+:::{link-card} Kibana APIs
+:link: /
+Automate Kibana with the public REST APIs.
+:::
+
+::::
diff --git a/src/Elastic.Documentation.Site/Assets/markdown/hub.css b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
new file mode 100644
index 0000000000..c959e1cc42
--- /dev/null
+++ b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
@@ -0,0 +1,136 @@
+@layer components {
+	.hub-page {
+		.hub-content {
+			@apply mx-auto mb-12 max-w-(--max-text-width) py-0;
+		}
+	}
+
+	/* Full-bleed hero, breaks out of the article container width. */
+	.hub-hero {
+		@apply bg-ink-navy mx-auto -mt-4 mb-10 w-full max-w-none px-6 py-14 text-white;
+
+		.hub-hero-inner {
+			@apply mx-auto max-w-(--max-text-width);
+		}
+
+		.hub-hero-top {
+			@apply mb-3 flex items-center gap-4;
+		}
+
+		.hub-hero-icon {
+			@apply inline-flex h-12 w-12 shrink-0 items-center justify-center rounded-xl bg-white/8 text-xl font-bold text-white;
+		}
+
+		.hub-hero-version {
+			@apply inline-flex items-center rounded-full border border-white/15 bg-white/10 px-2 py-0.5 text-xs font-semibold tracking-wide;
+		}
+
+		.hub-hero-content {
+			h1 {
+				@apply mb-3 text-4xl font-bold tracking-tight text-white;
+			}
+			h1 a.headerlink {
+				@apply text-white no-underline;
+			}
+			p {
+				@apply max-w-3xl text-base leading-relaxed text-white/70;
+			}
+		}
+
+		.hub-hero-search {
+			@apply mt-6 max-w-md;
+		}
+
+		.hub-hero-links {
+			@apply mt-5 flex list-none flex-wrap gap-x-5 gap-y-2 p-0;
+
+			li {
+				@apply m-0 p-0;
+			}
+
+			a {
+				@apply border-b border-transparent text-sm font-semibold text-white/85 no-underline;
+			}
+			a:hover {
+				@apply border-white/40 text-white;
+			}
+		}
+	}
+
+	.hub-card-group {
+		@apply mt-10 px-6;
+
+		.hub-card-group-header {
+			@apply mx-auto mb-5 max-w-(--max-text-width);
+
+			h2 {
+				@apply text-ink-dark m-0 text-2xl font-bold;
+			}
+		}
+
+		.hub-card-group-intro {
+			@apply text-ink-light mt-1;
+		}
+
+		.hub-card-grid {
+			@apply mx-auto grid max-w-(--max-text-width) list-none grid-cols-1 gap-4 p-0 md:grid-cols-2 lg:grid-cols-3;
+		}
+	}
+
+	/* News variant: vertical list, version chip leading. */
+	.hub-card-group-news {
+		.hub-card-grid {
+			@apply grid-cols-1 gap-3 lg:grid-cols-2;
+		}
+	}
+
+	.hub-card {
+		@apply m-0 p-0;
+	}
+
+	.hub-card-link {
+		@apply border-grey-20 block h-full rounded-xl border bg-white p-5 no-underline transition-colors;
+	}
+	.hub-card-link:hover {
+		@apply border-blue-elastic no-underline;
+	}
+
+	.hub-card-head {
+		@apply mb-2 flex items-start justify-between gap-3;
+	}
+
+	.hub-card-title {
+		@apply text-ink-dark text-base font-semibold;
+	}
+
+	.hub-card-badge {
+		@apply bg-grey-10 text-ink-light border-grey-20 inline-flex shrink-0 items-center rounded-full border px-2 py-0.5 text-xs font-semibold tracking-wide;
+	}
+
+	.hub-card-body {
+		@apply text-ink-light text-sm leading-relaxed;
+
+		& > *:first-child {
+			@apply mt-0;
+		}
+		& > *:last-child {
+			@apply mb-0;
+		}
+	}
+
+	/* Product badges shown above the H1 of a regular page. */
+	.product-badges {
+		@apply mb-3 flex list-none flex-wrap gap-2 p-0;
+
+		li {
+			@apply m-0 p-0;
+		}
+	}
+
+	.product-badge {
+		@apply bg-grey-10 text-ink-light border-grey-20 inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold tracking-wide no-underline;
+	}
+	.product-badge:hover {
+		@apply bg-blue-elastic-10 text-blue-elastic-100 border-blue-elastic no-underline;
+	}
+}
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 3a45bfa2c5..6ce8ef6141 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -27,6 +27,7 @@
 @import './markdown/stepper.css';
 @import './markdown/button.css';
 @import './markdown/agent-skill.css';
+@import './markdown/hub.css';
 @import './markdown/contributors.css';
 @import './api-docs.css';
 @import 'tippy.js/dist/tippy.css';

From a7ff2208682febc3e993f6dd38cbb32ed1e7026c Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 20:58:01 +0200
Subject: [PATCH 092/226] fix(hubs): suppress page preamble on hub layout,
 widen hub content

- Index.cshtml skips its auto-rendered H1, product-badges, and applies-to
  block when the page declares 'layout: hub' so the hero owns the page
  header and there is no duplicate H1.
- hub.css drops the article-level max-width and lets hero/card-group
  manage their own inner rails. Hero goes edge-to-edge of the content
  area; card grids open up to a 5xl rail so 3 columns render.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Assets/markdown/hub.css                   | 49 +++++++++++--------
 src/Elastic.Markdown/Page/Index.cshtml        | 25 +++++-----
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/markdown/hub.css b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
index c959e1cc42..3578c6ff0a 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/hub.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
@@ -1,16 +1,20 @@
 @layer components {
-	.hub-page {
-		.hub-content {
-			@apply mx-auto mb-12 max-w-(--max-text-width) py-0;
-		}
+	/* Full-width content area; hero and card-group manage their own inner rails. */
+	.hub-page .hub-content {
+		@apply mb-12 w-full max-w-none p-0;
+	}
+
+	/* Section-content rail used by hero/group internals. */
+	.hub-page :where(.hub-rail) {
+		@apply mx-auto w-full max-w-5xl px-6;
 	}
 
-	/* Full-bleed hero, breaks out of the article container width. */
+	/* Full-bleed hero with dark background and inner content rail. */
 	.hub-hero {
-		@apply bg-ink-navy mx-auto -mt-4 mb-10 w-full max-w-none px-6 py-14 text-white;
+		@apply bg-ink-navy mb-10 w-full px-0 py-14 text-white;
 
 		.hub-hero-inner {
-			@apply mx-auto max-w-(--max-text-width);
+			@apply mx-auto w-full max-w-5xl px-6;
 		}
 
 		.hub-hero-top {
@@ -18,11 +22,14 @@
 		}
 
 		.hub-hero-icon {
-			@apply inline-flex h-12 w-12 shrink-0 items-center justify-center rounded-xl bg-white/8 text-xl font-bold text-white;
+			@apply inline-flex h-12 w-12 shrink-0 items-center justify-center rounded-xl text-xl font-bold text-white;
+			background-color: rgb(255 255 255 / 0.08);
 		}
 
 		.hub-hero-version {
-			@apply inline-flex items-center rounded-full border border-white/15 bg-white/10 px-2 py-0.5 text-xs font-semibold tracking-wide;
+			@apply inline-flex items-center rounded-full px-2 py-0.5 text-xs font-semibold tracking-wide;
+			background-color: rgb(255 255 255 / 0.1);
+			border: 1px solid rgb(255 255 255 / 0.15);
 		}
 
 		.hub-hero-content {
@@ -33,7 +40,8 @@
 				@apply text-white no-underline;
 			}
 			p {
-				@apply max-w-3xl text-base leading-relaxed text-white/70;
+				@apply max-w-3xl text-base leading-relaxed;
+				color: rgb(255 255 255 / 0.7);
 			}
 		}
 
@@ -49,19 +57,22 @@
 			}
 
 			a {
-				@apply border-b border-transparent text-sm font-semibold text-white/85 no-underline;
+				@apply border-b border-transparent text-sm font-semibold no-underline;
+				color: rgb(255 255 255 / 0.85);
 			}
 			a:hover {
-				@apply border-white/40 text-white;
+				@apply text-white;
+				border-bottom-color: rgb(255 255 255 / 0.4);
 			}
 		}
 	}
 
+	/* Card group: section title rail, then card grid rail. */
 	.hub-card-group {
-		@apply mt-10 px-6;
+		@apply mt-10;
 
 		.hub-card-group-header {
-			@apply mx-auto mb-5 max-w-(--max-text-width);
+			@apply mx-auto mb-5 w-full max-w-5xl px-6;
 
 			h2 {
 				@apply text-ink-dark m-0 text-2xl font-bold;
@@ -73,15 +84,13 @@
 		}
 
 		.hub-card-grid {
-			@apply mx-auto grid max-w-(--max-text-width) list-none grid-cols-1 gap-4 p-0 md:grid-cols-2 lg:grid-cols-3;
+			@apply mx-auto grid w-full max-w-5xl list-none grid-cols-1 gap-4 p-0 px-6 md:grid-cols-2 lg:grid-cols-3;
 		}
 	}
 
-	/* News variant: vertical list, version chip leading. */
-	.hub-card-group-news {
-		.hub-card-grid {
-			@apply grid-cols-1 gap-3 lg:grid-cols-2;
-		}
+	/* News variant: tighter 2-column list. */
+	.hub-card-group-news .hub-card-grid {
+		@apply grid-cols-1 gap-3 md:grid-cols-2 lg:grid-cols-2;
 	}
 
 	.hub-card {
diff --git a/src/Elastic.Markdown/Page/Index.cshtml b/src/Elastic.Markdown/Page/Index.cshtml
index e31eb35864..d1ad409c34 100644
--- a/src/Elastic.Markdown/Page/Index.cshtml
+++ b/src/Elastic.Markdown/Page/Index.cshtml
@@ -90,19 +90,22 @@
 	}
 }
 <section id="elastic-docs-v3">
-	@* This way it's correctly rendered as <h1>text</h1> instead of <h1><p>text</p></h1> *@
-	@(new HtmlString(Markdown.ToHtml("# " + Model.TitleRaw)))
-	@await RenderPartialAsync(ProductBadges.Create(Model))
-	@if (Model.AppliesTo is not null)
+	@if (Model.CurrentDocument.YamlFrontMatter?.Layout != MarkdownPageLayout.Hub)
 	{
-		<p class="applies applies-block">
-		@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
+		@* This way it's correctly rendered as <h1>text</h1> instead of <h1><p>text</p></h1> *@
+		@(new HtmlString(Markdown.ToHtml("# " + Model.TitleRaw)))
+		@await RenderPartialAsync(ProductBadges.Create(Model))
+		@if (Model.AppliesTo is not null)
 		{
-			AppliesTo = Model.AppliesTo,
-			Inline = false,
-			VersionsConfig = Model.VersionsConfig
-		}))
-		</p>
+			<p class="applies applies-block">
+			@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
+			{
+				AppliesTo = Model.AppliesTo,
+				Inline = false,
+				VersionsConfig = Model.VersionsConfig
+			}))
+			</p>
+		}
 	}
 	@(new HtmlString(Model.MarkdownHtml))
 </section>

From 26b4886478e43779a8966c55b7987115d3088674 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 21:13:21 +0200
Subject: [PATCH 093/226] feat(hubs): rewrite hub directives to match gist
 prototypes

Aligns the hub-page directives with the HTML gist prototypes' DOM and
visual structure. The card / what's new / hero shapes were too thin to
reproduce the gists; this commit replaces them with richer directives:

- {hero}: adds inline product-icon SVGs (kibana/elasticsearch/observability/
  security via ProductIcons lookup; first-letter fallback otherwise),
  a version pill with status dot, quick-action pill bar, and a release
  status line rendered as inline markdown.
- {link-card}: now consumes a YAML body with title/link/description plus a
  primary link list and an optional aside (label + inline link list with
  middle-dot separators). Adds optional :icon: / :variant: for solution
  cards (es / obs / sec accent borders).
- {whats-new}: new directive for the gist's "New" panel -- header with pink
  badge, section title, optional release-notes link list on the right,
  and items rendered as link rows with title / description / right-side
  meta pill.
- {intro}: new directive for the teal-bar tip panel below the hero.
- {on-this-page}: new directive that auto-collects every {card-group} and
  {whats-new} on the page (by id+title) and renders a single inline-link
  TOC chip.

Both YAML-bodied directives use the existing YamlSerialization static
context (AOT-safe) with new types registered.

The two hub markdown files (Elasticsearch and Kibana) are rewritten to
exercise the full directive set, mirroring the gists' content and shape.
hub.css is rewritten to model the gists' rules with the project's design
tokens.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docs/hubs/elasticsearch/9.0.md                | 136 +++--
 docs/hubs/kibana/9.0.md                       | 332 +++++++----
 .../Assets/markdown/hub.css                   | 546 ++++++++++++++----
 .../Myst/Directives/DirectiveBlockParser.cs   |   9 +
 .../Myst/Directives/DirectiveHtmlRenderer.cs  |  61 +-
 .../Myst/Directives/Hub/CardGroupView.cshtml  |  32 +-
 .../Myst/Directives/Hub/HeroBlock.cs          |  21 +-
 .../Myst/Directives/Hub/HeroView.cshtml       |  46 +-
 .../Myst/Directives/Hub/HeroViewModel.cs      |   4 +-
 .../Myst/Directives/Hub/HubYamlBody.cs        |  96 +++
 .../Myst/Directives/Hub/IntroBlock.cs         |  26 +
 .../Myst/Directives/Hub/IntroView.cshtml      |   5 +
 .../Myst/Directives/Hub/IntroViewModel.cs     |   7 +
 .../Myst/Directives/Hub/LinkCardBlock.cs      | 106 +++-
 .../Myst/Directives/Hub/LinkCardView.cshtml   |  71 ++-
 .../Myst/Directives/Hub/LinkCardViewModel.cs  |   5 +-
 .../Myst/Directives/Hub/OnThisPageBlock.cs    |  54 ++
 .../Myst/Directives/Hub/OnThisPageView.cshtml |  17 +
 .../Directives/Hub/OnThisPageViewModel.cs     |  10 +
 .../Myst/Directives/Hub/ProductIcons.cs       |  68 +++
 .../Myst/Directives/Hub/WhatsNewBlock.cs      |  99 ++++
 .../Myst/Directives/Hub/WhatsNewView.cshtml   |  75 +++
 .../Myst/Directives/Hub/WhatsNewViewModel.cs  |  10 +
 .../Myst/YamlSerialization.cs                 |   5 +
 24 files changed, 1521 insertions(+), 320 deletions(-)
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/HubYamlBody.cs
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/IntroBlock.cs
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/IntroView.cshtml
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/IntroViewModel.cs
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageBlock.cs
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageView.cshtml
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageViewModel.cs
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/ProductIcons.cs
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewView.cshtml
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewViewModel.cs

diff --git a/docs/hubs/elasticsearch/9.0.md b/docs/hubs/elasticsearch/9.0.md
index 1069f120a3..005007f1a0 100644
--- a/docs/hubs/elasticsearch/9.0.md
+++ b/docs/hubs/elasticsearch/9.0.md
@@ -3,73 +3,125 @@ layout: hub
 ---
 
 :::{hero}
-:icon: E
-:version: 9.0
-:quick-links: What's new=#whats-new,Get started=#install,All versions=/
+:icon: elasticsearch
+:version: v9 / Serverless (current)
+:quick-links: Install=/install,Tutorial=/tutorial,API reference=/api,Release notes=/release-notes
+:releases: Latest&#58; [Stack 9.4.1](/release-notes/elasticsearch) (Mar 28, 2026) · [Serverless deployed](/release-notes/serverless) Apr 1, 2026
 
 # Elasticsearch
 
-The distributed search and analytics engine, ready for production at scale.
+The distributed search and analytics engine. Store, search, and analyze data at any scale, with vector search, AI toolkits, and a high-performance retrieval engine.
 :::
 
-::::{card-group}
-:title: What's new
-:variant: news
-:id: whats-new
-
-:::{link-card} ES|QL JOIN syntax now GA
-:link: /
-:badge: 9.0
-Run cross-index joins in ES|QL queries with full GA stability and performance.
+:::{on-this-page}
 :::
 
-:::{link-card} Vector quantization improvements
-:link: /
-:badge: 9.0
-30% smaller indices and faster search with the new BBQ encoding.
+:::{intro}
+**New to Elasticsearch?** [Start with Elastic Fundamentals](https://www.elastic.co/docs/get-started) — a hands-on walk-through of indexing, querying, and search relevance.
 :::
 
-::::
+:::{whats-new}
+title: What's new in Elasticsearch
+id: whats-new
+release-links:
+  - label: 9.4
+    url: /release-notes/elasticsearch
+  - label: Serverless
+    url: /release-notes/serverless
+items:
+  - title: ES|QL JOIN syntax
+    description: Run cross-index joins in ES|QL queries with full GA stability and performance
+    link: /reference/esql/joins
+    meta: 9.0 GA
+  - title: BBQ vector quantization
+    description: 30% smaller indices and faster search with the new Better Binary Quantization encoding
+    link: /reference/vector-quantization
+    meta: 9.0 GA
+:::
 
 ::::{card-group}
 :title: Install and deploy
-:intro: Get Elasticsearch running on the platform of your choice.
 :id: install
 
-:::{link-card} Self-managed
-:link: /
-Run Elasticsearch on your own infrastructure for full control over hardware and configuration.
+:::{link-card}
+title: Self-managed
+link: /deploy-manage/deploy/self-managed
+description: Run Elasticsearch on your own infrastructure for full control over hardware and configuration.
+links:
+  - label: Install on Linux / macOS
+    url: /deploy-manage/deploy/self-managed/install-elasticsearch
+  - label: Install with Docker
+    url: /deploy-manage/deploy/self-managed/install-elasticsearch-with-docker
+  - label: Configure (elasticsearch.yml)
+    url: /deploy-manage/deploy/self-managed/configure-elasticsearch
 :::
 
-:::{link-card} Elastic Cloud Hosted
-:link: /
-Managed deployments on AWS, GCP, or Azure with one-click upgrades and zero downtime.
+:::{link-card}
+title: Elastic Cloud Hosted
+link: /deploy-manage/deploy/elastic-cloud
+description: Managed deployments on AWS, GCP, or Azure with one-click upgrades and zero downtime.
+links:
+  - label: Sign up
+    url: /deploy-manage/deploy/elastic-cloud/sign-up
+  - label: Manage deployments
+    url: /deploy-manage/deploy/elastic-cloud/manage-deployments
 :::
 
-:::{link-card} Elastic Cloud Serverless
-:link: /
-Pay-per-use Elasticsearch with no clusters to manage and elastic auto-scaling.
+:::{link-card}
+title: Elastic Cloud Serverless
+link: /deploy-manage/deploy/elastic-cloud-serverless
+description: Pay-per-use Elasticsearch with no clusters to manage and elastic auto-scaling.
+links:
+  - label: Get started
+    url: /deploy-manage/deploy/elastic-cloud-serverless/get-started
 :::
-
 ::::
 
 ::::{card-group}
-:title: Index and ingest data
-:intro: Move data into Elasticsearch from any source.
-
-:::{link-card} Elastic integrations
-:link: /
-Pre-built integrations for hundreds of services and platforms.
+:title: Search and query
+:id: search
+
+:::{link-card}
+title: ES|QL
+link: /reference/esql
+description: Pipe-friendly query language for searching, filtering, and aggregating data.
+links:
+  - label: Get started
+    url: /reference/esql/get-started
+  - label: Functions reference
+    url: /reference/esql/functions
 :::
 
-:::{link-card} Logstash
-:link: /
-Ingest, transform, and enrich data from any source.
+:::{link-card}
+title: Query DSL
+link: /reference/query-dsl
+description: JSON-based query language for full-text, structured, geo, and vector search.
+links:
+  - label: Match query
+    url: /reference/query-dsl/query-dsl-match-query
+  - label: Bool query
+    url: /reference/query-dsl/query-dsl-bool-query
+aside:
+  label: Query types
+  links:
+    - label: Term
+      url: /reference/query-dsl/term-level-queries
+    - label: Full text
+      url: /reference/query-dsl/full-text-queries
+    - label: Geo
+      url: /reference/query-dsl/geo-queries
+    - label: Vector
+      url: /reference/query-dsl/vector-queries
 :::
 
-:::{link-card} Beats
-:link: /
-Lightweight shippers for logs, metrics, and network data.
+:::{link-card}
+title: Vector search
+link: /solutions/search/vector
+description: Dense and sparse vector retrieval for AI applications and semantic search.
+links:
+  - label: kNN search
+    url: /reference/search-types/knn-search
+  - label: ELSER
+    url: /reference/elasticsearch-clients/elser
 :::
-
 ::::
diff --git a/docs/hubs/kibana/9.0.md b/docs/hubs/kibana/9.0.md
index 2bc63dd2c4..11ee62040c 100644
--- a/docs/hubs/kibana/9.0.md
+++ b/docs/hubs/kibana/9.0.md
@@ -3,140 +3,278 @@ layout: hub
 ---
 
 :::{hero}
-:icon: K
-:version: 9.0
-:quick-links: What's new=#whats-new,Install=#install,All versions=/
+:icon: kibana
+:version: v9 / Serverless (current)
+:quick-links: Install=/install,Tutorial=/tutorial,API reference=/api,Release notes=/release-notes
+:releases: Latest&#58; [Stack 9.4.1](/release-notes/kibana) (Mar 28, 2026) · [Serverless deployed](/release-notes/serverless) Apr 1, 2026
 
 # Kibana
 
-The window into the Elastic Stack. Visualize, analyze, and explore your data with dashboards, queries, and machine learning.
+The UI for the Elasticsearch platform. Explore and visualize your data, build dashboards, set up alerts, automate tasks with AI, and use purpose-built solutions for Search, Observability, and Security.
 :::
 
-::::{card-group}
-:title: What's new
-:variant: news
-:id: whats-new
-
-:::{link-card} Refreshed dashboard layout engine
-:link: /
-:badge: 9.0
-Smoother resizing, faster panel rendering, and improved touch behavior.
+:::{on-this-page}
 :::
 
-:::{link-card} Lens chart suggestions
-:link: /
-:badge: 9.0
-Lens now suggests visualizations based on your data shape automatically.
+:::{intro}
+**New to Kibana?** [Learn data exploration and visualization](https://www.elastic.co/docs/explore-analyze/kibana-data-exploration-learning-tutorial) — a hands-on walk-through of Discover, ES|QL, visualizations, and dashboards.
 :::
 
-::::
+:::{whats-new}
+title: What's new in Kibana
+id: whats-new
+release-links:
+  - label: 9.4
+    url: /release-notes/kibana
+  - label: Serverless
+    url: /release-notes/serverless
+items:
+  - title: Dashboards and visualizations APIs
+    description: Programmatically create and manage dashboards and visualizations
+    link: /api/dashboards
+    meta: 9.4 preview
+  - title: AI agent skills
+    description: Teach AI coding agents to work with the Elastic stack
+    link: /ai/agent-skills
+    meta: Mar 2026
+  - title: Agent Builder
+    description: Build custom AI agents that reason over your data
+    link: /ai/agent-builder
+    meta: 9.3 GA
+  - title: Workflows
+    description: Automate tasks with Kibana actions, HTTP calls, and AI agents
+    link: /ai/workflows
+    meta: 9.3 preview
+:::
 
 ::::{card-group}
 :title: Install and administer
-:intro: Get Kibana running and configure it for your environment.
 :id: install
 
-:::{link-card} Self-managed
-:link: /
-Install Kibana on your own infrastructure with full configuration control.
+:::{link-card}
+title: Self-managed
+link: /deploy-manage/deploy/self-managed/install-kibana
+description: Install and run Kibana on your own infrastructure.
+links:
+  - label: Docker
+    url: /deploy-manage/deploy/self-managed/install-kibana-with-docker
+  - label: Debian / Ubuntu
+    url: /deploy-manage/deploy/self-managed/install-kibana-with-debian-package
+  - label: RPM
+    url: /deploy-manage/deploy/self-managed/install-kibana-with-rpm
+  - label: Windows
+    url: /deploy-manage/deploy/self-managed/install-kibana-on-windows
+  - label: Configure (kibana.yml)
+    url: /deploy-manage/deploy/self-managed/configure-kibana
 :::
 
-:::{link-card} Elastic Cloud Hosted
-:link: /
-Kibana included in every Elastic Cloud deployment, fully managed.
+:::{link-card}
+title: Managed deployments
+link: /deploy-manage/deploy/elastic-cloud/access-kibana
+description: Run Kibana on Elastic Cloud, Kubernetes, or ECE.
+links:
+  - label: Elastic Cloud Hosted
+    url: /deploy-manage/deploy/elastic-cloud/access-kibana
+  - label: Elastic Cloud on Kubernetes (ECK)
+    url: /deploy-manage/deploy/cloud-on-k8s/kibana-configuration
+  - label: Elastic Cloud Enterprise
+    url: /deploy-manage/deploy/cloud-enterprise/access-kibana
 :::
 
-:::{link-card} Configure Kibana
-:link: /
-Set up authentication, spaces, monitoring, alerts, and more.
+:::{link-card}
+title: Configure and secure
+link: /deploy-manage/users-roles/cluster-or-deployment-auth/kibana-authentication
+description: Authentication, roles, spaces, and encryption.
+links:
+  - label: Authentication (SSO, SAML, OIDC...)
+    url: /deploy-manage/users-roles/cluster-or-deployment-auth/kibana-authentication
+  - label: Kibana privileges
+    url: /deploy-manage/users-roles/cluster-or-deployment-auth/kibana-privileges
+  - label: Spaces
+    url: /deploy-manage/manage-spaces
+  - label: Secure saved objects
+    url: /deploy-manage/security/secure-saved-objects
 :::
 
+:::{link-card}
+title: Maintain and monitor
+link: /deploy-manage/production-guidance/kibana-in-production-environments
+description: Production guidance, upgrades, reporting, monitoring, and logging.
+links:
+  - label: Run in production
+    url: /deploy-manage/production-guidance/kibana-in-production-environments
+  - label: Upgrade Kibana
+    url: /deploy-manage/upgrade/deployment-or-cluster/kibana
+  - label: Monitoring
+    url: /deploy-manage/monitor/stack-monitoring/kibana-monitoring-data
+  - label: Logging
+    url: /deploy-manage/monitor/logging-configuration/kibana-logging
+:::
 ::::
 
 ::::{card-group}
 :title: Explore, visualize, and analyze
-:intro: The core Kibana surfaces for working with your data.
 :id: explore
 
-:::{link-card} Discover
-:link: /
-Search and explore raw documents in any Elasticsearch index.
+:::{link-card}
+title: Discover
+link: /explore-analyze/discover/discover-get-started
+description: Browse documents, filter, and query your indices in real time.
+links:
+  - label: Get started with Discover
+    url: /explore-analyze/discover/discover-get-started
+  - label: Use ES|QL in Kibana
+    url: /explore-analyze/query-filter/languages/esql-kibana
 :::
 
-:::{link-card} Dashboards
-:link: /
-Build and share interactive dashboards with charts, maps, and metrics.
+:::{link-card}
+title: Dashboards
+link: /explore-analyze/dashboards
+description: Build interactive dashboards that combine visualizations, controls, and context.
+links:
+  - label: Create a dashboard
+    url: /explore-analyze/dashboards/create-dashboard
+  - label: Build and customize
+    url: /explore-analyze/dashboards/building
+  - label: Organize panels and sections
+    url: /explore-analyze/dashboards/arrange-panels
+  - label: Share and export
+    url: /explore-analyze/dashboards/sharing
+aside:
+  label: Panel types
+  links:
+    - label: Visualizations
+      url: /explore-analyze/visualize/lens
+    - label: Maps
+      url: /explore-analyze/visualize/maps
+    - label: Text
+      url: /explore-analyze/visualize/text-panels
+    - label: Images
+      url: /explore-analyze/visualize/image-panels
+    - label: Links
+      url: /explore-analyze/visualize/link-panels
+    - label: Alerts
+      url: /explore-analyze/visualize/alert-panels
 :::
 
-:::{link-card} Lens
-:link: /
-Drag-and-drop visualization builder with smart suggestions.
+:::{link-card}
+title: Build visualizations
+link: /explore-analyze/visualize/lens
+description: Create charts and visual panels using the drag-and-drop editor, query mode (ES|QL), Vega, or Maps.
+links:
+  - label: Visualization editor (drag-and-drop)
+    url: /explore-analyze/visualize/lens
+  - label: Query mode (ES|QL)
+    url: /explore-analyze/visualize/esorql
+  - label: Vega
+    url: /explore-analyze/visualize/custom-visualizations-with-vega
+  - label: Maps
+    url: /explore-analyze/visualize/maps
+aside:
+  label: Chart types
+  links:
+    - label: Area
+      url: /explore-analyze/visualize/charts/area-charts
+    - label: Line
+      url: /explore-analyze/visualize/charts/line-charts
+    - label: Pie
+      url: /explore-analyze/visualize/charts/pie-charts
+    - label: Table
+      url: /explore-analyze/visualize/charts/tables
+    - label: Metric
+      url: /explore-analyze/visualize/charts/metric-charts
+    - label: Heat map
+      url: /explore-analyze/visualize/charts/heat-map-charts
+    - label: Treemap
+      url: /explore-analyze/visualize/charts/treemap-charts
+    - label: Mosaic
+      url: /explore-analyze/visualize/charts/mosaic-charts
 :::
-
 ::::
 
 ::::{card-group}
-:title: Track and respond
-:intro: Alerting, watchers, and case management.
-:id: track
-
-:::{link-card} Alerting
-:link: /
-Define rules and trigger actions when conditions are met.
-:::
-
-:::{link-card} Cases
-:link: /
-Collect, track, and resolve issues across teams.
-:::
-
-:::{link-card} Maps
-:link: /
-Geospatial analysis and live tracking on layered maps.
+:title: Solutions
+:id: solutions
+
+:::{link-card}
+title: Elasticsearch
+link: /solutions/elasticsearch-solution-project
+icon: elasticsearch
+variant: es
+description: Build powerful search and RAG applications using vector database, AI toolkit, and advanced retrieval capabilities.
+links:
+  - label: Solution overview
+    url: /solutions/elasticsearch-solution-project
+  - label: Get started
+    url: /solutions/elasticsearch-solution-project/get-started
+  - label: Agent Builder
+    url: /explore-analyze/ai-features/elastic-agent-builder
+aside:
+  label: Key features
+  links:
+    - label: Playground
+      url: /explore-analyze/query-filter/tools/playground
+    - label: Vector search
+      url: /solutions/search/vector
+    - label: Content connectors
+      url: /reference/search-connectors
+    - label: Semantic search
+      url: /solutions/search/semantic-search/semantic-search-elser-ingest-pipelines
 :::
 
-::::
-
-::::{card-group}
-:title: AI and automation
-:intro: Machine learning and AI-assisted workflows in Kibana.
-:id: ai
-
-:::{link-card} Machine learning
-:link: /
-Detect anomalies, classify data, and forecast trends.
+:::{link-card}
+title: Observability
+link: /solutions/observability
+icon: observability
+variant: obs
+description: Resolve problems with open, flexible, and unified observability powered by advanced machine learning and analytics.
+links:
+  - label: Solution overview
+    url: /solutions/observability
+  - label: Get started
+    url: /solutions/observability/get-started
+  - label: Agent Builder
+    url: /solutions/observability/ai/agent-builder-observability
+aside:
+  label: Key features
+  links:
+    - label: APM
+      url: /solutions/observability/apm
+    - label: Logs
+      url: /solutions/observability/logs
+    - label: Infrastructure
+      url: /solutions/observability/infra-and-hosts
+    - label: Synthetics
+      url: /solutions/observability/synthetics/get-started
+    - label: SLOs
+      url: /solutions/observability/incident-management/service-level-objectives-slos
 :::
 
-:::{link-card} AI Assistant
-:link: /
-A conversational assistant that helps you query and analyze data.
+:::{link-card}
+title: Security
+link: /solutions/security
+icon: security
+variant: sec
+description: Detect, investigate, and respond to threats with AI-driven security analytics to protect your organization.
+links:
+  - label: Solution overview
+    url: /solutions/security
+  - label: Get started
+    url: /solutions/security/get-started
+  - label: Agent Builder
+    url: /solutions/security/ai/agent-builder/agent-builder
+aside:
+  label: Key features
+  links:
+    - label: SIEM
+      url: /solutions/security/get-started/get-started-detect-with-siem
+    - label: Detection rules
+      url: /solutions/security/detect-and-alert/manage-detection-rules
+    - label: Elastic Defend
+      url: /solutions/security/configure-elastic-defend
+    - label: Cloud security
+      url: /solutions/security/cloud
+    - label: Cases
+      url: /solutions/security/investigate/security-cases
 :::
-
-:::{link-card} Automatic insights
-:link: /
-Surface notable changes in your data without writing rules.
-:::
-
-::::
-
-::::{card-group}
-:title: Management and developer tools
-:intro: Stack management, Dev Tools, and APIs.
-:id: manage
-
-:::{link-card} Stack Management
-:link: /
-Manage spaces, roles, index lifecycle, snapshots, and more.
-:::
-
-:::{link-card} Dev Tools
-:link: /
-Console, Painless Lab, Search Profiler, Grok Debugger.
-:::
-
-:::{link-card} Kibana APIs
-:link: /
-Automate Kibana with the public REST APIs.
-:::
-
 ::::
diff --git a/src/Elastic.Documentation.Site/Assets/markdown/hub.css b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
index 3578c6ff0a..bf2f300672 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/hub.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
@@ -1,145 +1,487 @@
+/*
+ * Hub-page styling. Models the gist prototypes in docs/hubs/. Class names
+ * mirror the directive output:
+ *
+ *   .hub-page         page wrapper (set by Layout/_Layout.cshtml's RenderHub)
+ *   .hub-content      article wrapper inside the content column
+ *   .hub-hero         hero section (full-bleed dark background)
+ *   .hub-on-this-page inline TOC chip
+ *   .hub-intro        getting-started callout panel
+ *   .hub-whats-new    What's new panel
+ *   .hub-zone         section heading
+ *   .hub-card-grid    card grid container
+ *   .hub-card         card item
+ *
+ * The hero / on-this-page / intro / whats-new / card-grid containers all
+ * use a shared inner rail of max-w-5xl + 24px horizontal padding.
+ */
+
 @layer components {
-	/* Full-width content area; hero and card-group manage their own inner rails. */
-	.hub-page .hub-content {
-		@apply mb-12 w-full max-w-none p-0;
+	/* Page wrapper: dotted background like the gist, full-width content. */
+	.hub-page {
+		background-color: var(--color-grey-10);
+		background-image: radial-gradient(
+			circle,
+			var(--color-grey-20) 0.75px,
+			transparent 0.75px
+		);
+		background-size: 24px 24px;
 	}
-
-	/* Section-content rail used by hero/group internals. */
-	.hub-page :where(.hub-rail) {
-		@apply mx-auto w-full max-w-5xl px-6;
+	.hub-page .hub-content {
+		@apply mb-20 w-full max-w-none p-0;
 	}
 
-	/* Full-bleed hero with dark background and inner content rail. */
+	/* Hero ------------------------------------------------------------- */
 	.hub-hero {
-		@apply bg-ink-navy mb-10 w-full px-0 py-14 text-white;
-
-		.hub-hero-inner {
-			@apply mx-auto w-full max-w-5xl px-6;
-		}
-
-		.hub-hero-top {
-			@apply mb-3 flex items-center gap-4;
-		}
+		background-color: var(--color-ink-navy);
+		color: var(--color-white);
+		padding: 56px 24px 48px;
+	}
+	.hub-hero .hub-hero-inner {
+		@apply mx-auto w-full max-w-5xl;
+	}
+	.hub-hero .hub-hero-top {
+		@apply mb-3 flex items-center gap-4;
+	}
+	.hub-hero .hub-hero-icon {
+		@apply inline-flex h-13 w-13 shrink-0 items-center justify-center rounded-xl text-2xl font-bold;
+		width: 52px;
+		height: 52px;
+		background-color: rgb(255 255 255 / 0.08);
+		color: var(--color-white);
+	}
+	.hub-hero .hub-hero-icon-svg {
+		background-color: transparent;
+	}
+	.hub-hero .hub-hero-icon-svg svg {
+		width: 32px;
+		height: 32px;
+	}
+	.hub-hero .hub-hero-title h1 {
+		font-size: 2.571rem;
+		font-weight: 700;
+		line-height: 1.2;
+		letter-spacing: -0.5px;
+		color: var(--color-white);
+		margin: 0;
+	}
+	.hub-hero .hub-hero-title h1 a.headerlink {
+		color: var(--color-white);
+		text-decoration: none;
+	}
+	.hub-hero .hub-hero-title p {
+		font-size: 1.143rem;
+		color: rgb(255 255 255 / 0.7);
+		max-width: 720px;
+		line-height: 1.6;
+		margin-top: 12px;
+	}
 
-		.hub-hero-icon {
-			@apply inline-flex h-12 w-12 shrink-0 items-center justify-center rounded-xl text-xl font-bold text-white;
-			background-color: rgb(255 255 255 / 0.08);
-		}
+	.hub-hero .hub-hero-search {
+		margin-top: 20px;
+		margin-bottom: 20px;
+		max-width: 480px;
+	}
 
-		.hub-hero-version {
-			@apply inline-flex items-center rounded-full px-2 py-0.5 text-xs font-semibold tracking-wide;
-			background-color: rgb(255 255 255 / 0.1);
-			border: 1px solid rgb(255 255 255 / 0.15);
-		}
+	.hub-hero .hub-hero-meta {
+		@apply mt-2 flex flex-wrap items-center gap-3;
+	}
 
-		.hub-hero-content {
-			h1 {
-				@apply mb-3 text-4xl font-bold tracking-tight text-white;
-			}
-			h1 a.headerlink {
-				@apply text-white no-underline;
-			}
-			p {
-				@apply max-w-3xl text-base leading-relaxed;
-				color: rgb(255 255 255 / 0.7);
-			}
-		}
+	.hub-hero .hub-hero-version {
+		display: inline-flex;
+		align-items: center;
+		gap: 8px;
+		background: rgb(255 255 255 / 0.08);
+		border: 1px solid rgb(255 255 255 / 0.15);
+		border-radius: 20px;
+		padding: 5px 14px;
+		font-size: 13px;
+		color: rgb(255 255 255 / 0.85);
+	}
+	.hub-hero .hub-hero-version-dot {
+		display: inline-block;
+		width: 6px;
+		height: 6px;
+		border-radius: 50%;
+		background: #9adc30;
+	}
 
-		.hub-hero-search {
-			@apply mt-6 max-w-md;
-		}
+	.hub-hero .hub-hero-pills {
+		@apply m-0 flex list-none flex-wrap gap-2 p-0;
+	}
+	.hub-hero .hub-hero-pills li {
+		@apply m-0 p-0;
+	}
+	.hub-hero .hub-hero-pills a {
+		font-size: 13px;
+		padding: 5px 14px;
+		border-radius: 20px;
+		background: rgb(255 255 255 / 0.06);
+		border: 1px solid rgb(255 255 255 / 0.12);
+		color: rgb(255 255 255 / 0.85);
+		text-decoration: none;
+		transition: background 0.15s;
+	}
+	.hub-hero .hub-hero-pills a:hover {
+		background: rgb(255 255 255 / 0.12);
+		color: var(--color-white);
+		text-decoration: none;
+	}
 
-		.hub-hero-links {
-			@apply mt-5 flex list-none flex-wrap gap-x-5 gap-y-2 p-0;
-
-			li {
-				@apply m-0 p-0;
-			}
-
-			a {
-				@apply border-b border-transparent text-sm font-semibold no-underline;
-				color: rgb(255 255 255 / 0.85);
-			}
-			a:hover {
-				@apply text-white;
-				border-bottom-color: rgb(255 255 255 / 0.4);
-			}
-		}
+	.hub-hero .hub-hero-releases {
+		@apply mt-4;
+		font-size: 12px;
+		color: rgb(255 255 255 / 0.45);
+	}
+	.hub-hero .hub-hero-releases a {
+		color: rgb(255 255 255 / 0.6);
+		text-decoration: none;
+	}
+	.hub-hero .hub-hero-releases a:hover {
+		color: rgb(255 255 255 / 0.85);
+		text-decoration: underline;
 	}
 
-	/* Card group: section title rail, then card grid rail. */
-	.hub-card-group {
-		@apply mt-10;
+	/* On this page ----------------------------------------------------- */
+	.hub-on-this-page {
+		@apply mx-auto w-full max-w-5xl;
+		margin-top: 40px;
+		margin-bottom: 36px;
+		padding: 20px 28px;
+		background: var(--color-white);
+		border: 1px solid var(--color-grey-20);
+		border-radius: 16px;
+		font-size: 14px;
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		gap: 4px 0;
+		line-height: 1.9;
+	}
+	.hub-on-this-page .hub-on-this-page-label {
+		font-weight: 700;
+		color: var(--color-ink-dark);
+		margin-right: 14px;
+	}
+	.hub-on-this-page a {
+		font-weight: 500;
+		color: var(--color-blue-elastic-100);
+		text-decoration: none;
+	}
+	.hub-on-this-page a:hover {
+		text-decoration: underline;
+	}
+	.hub-on-this-page .hub-on-this-page-sep {
+		color: var(--color-grey-30);
+		margin: 0 10px;
+		font-size: 12px;
+	}
 
-		.hub-card-group-header {
-			@apply mx-auto mb-5 w-full max-w-5xl px-6;
+	/* Intro callout ---------------------------------------------------- */
+	.hub-intro {
+		@apply mx-auto w-full max-w-5xl;
+		margin-bottom: 36px;
+		background: var(--color-white);
+		border: 1px solid var(--color-grey-20);
+		border-left: 3px solid var(--color-teal-40, #66ccc8);
+		border-radius: 16px;
+		padding: 18px 24px;
+		font-size: 14px;
+		color: var(--color-ink);
+		line-height: 1.5;
+	}
+	.hub-intro p {
+		margin: 0;
+	}
+	.hub-intro a {
+		color: var(--color-blue-elastic-100);
+		text-decoration: underline;
+	}
 
-			h2 {
-				@apply text-ink-dark m-0 text-2xl font-bold;
-			}
-		}
+	/* What's new ------------------------------------------------------- */
+	.hub-whats-new {
+		@apply mx-auto w-full max-w-5xl;
+		background: var(--color-white);
+		border: 1px solid var(--color-grey-20);
+		border-radius: 16px;
+		padding: 24px 28px;
+		margin-bottom: 36px;
+		scroll-margin-top: 120px;
+	}
+	.hub-whats-new .hub-wn-header {
+		@apply mb-4 flex items-center gap-2;
+	}
+	.hub-whats-new .hub-wn-badge {
+		font-size: 12px;
+		font-weight: 700;
+		color: var(--color-white);
+		background: #f04e98;
+		border-radius: 6px;
+		padding: 3px 10px;
+		line-height: 1.3;
+	}
+	.hub-whats-new .hub-wn-title {
+		font-size: 15px;
+		font-weight: 700;
+		color: var(--color-ink-dark);
+	}
+	.hub-whats-new .hub-wn-rn-links {
+		margin-left: auto;
+		display: flex;
+		align-items: center;
+		gap: 8px;
+		font-size: 13px;
+		flex-shrink: 0;
+		color: var(--color-ink-light);
+	}
+	.hub-whats-new .hub-wn-rn-label {
+		color: var(--color-ink-light);
+	}
+	.hub-whats-new .hub-wn-rn-links a {
+		font-weight: 500;
+		color: var(--color-blue-elastic-100);
+		text-decoration: none;
+	}
+	.hub-whats-new .hub-wn-rn-links a:hover {
+		text-decoration: underline;
+	}
+	.hub-whats-new .hub-wn-rn-sep {
+		color: var(--color-grey-30);
+	}
 
-		.hub-card-group-intro {
-			@apply text-ink-light mt-1;
-		}
+	.hub-whats-new .hub-wn-items {
+		@apply m-0 flex list-none flex-col gap-2 p-0;
+	}
+	.hub-whats-new .hub-wn-item {
+		@apply m-0 p-0;
+	}
+	.hub-whats-new .hub-wn-item-link {
+		display: flex;
+		align-items: baseline;
+		gap: 10px;
+		padding: 10px 14px;
+		border-radius: 10px;
+		background: var(--color-grey-10);
+		text-decoration: none;
+		font-size: 14px;
+		color: var(--color-body, #515151);
+		line-height: 1.4;
+		border: 1px solid transparent;
+		transition: background 0.12s;
+	}
+	.hub-whats-new a.hub-wn-item-link:hover {
+		background: var(--color-blue-elastic-10);
+		border-color: var(--color-grey-20);
+		text-decoration: none;
+	}
+	.hub-whats-new .hub-wn-item-title {
+		color: var(--color-ink-dark);
+		white-space: nowrap;
+	}
+	.hub-whats-new .hub-wn-item-desc {
+		color: var(--color-ink-light);
+	}
+	.hub-whats-new .hub-wn-item-meta {
+		margin-left: auto;
+		white-space: nowrap;
+		flex-shrink: 0;
+		font-size: 12px;
+		color: var(--color-grey-80);
+		font-weight: 500;
+	}
 
-		.hub-card-grid {
-			@apply mx-auto grid w-full max-w-5xl list-none grid-cols-1 gap-4 p-0 px-6 md:grid-cols-2 lg:grid-cols-3;
-		}
+	/* Zone (section heading) ------------------------------------------ */
+	.hub-zone {
+		@apply mx-auto w-full max-w-5xl;
+		margin-top: 56px;
+		margin-bottom: 24px;
+		scroll-margin-top: 120px;
+	}
+	.hub-zone:first-of-type {
+		margin-top: 0;
+	}
+	.hub-zone .hub-zone-title {
+		font-size: 1.571rem;
+		font-weight: 700;
+		color: var(--color-ink-dark);
+		line-height: 1.2;
+		margin: 0;
+	}
+	.hub-zone .hub-zone-intro {
+		color: var(--color-ink-light);
+		margin-top: 8px;
 	}
 
-	/* News variant: tighter 2-column list. */
-	.hub-card-group-news .hub-card-grid {
-		@apply grid-cols-1 gap-3 md:grid-cols-2 lg:grid-cols-2;
+	/* Card grid -------------------------------------------------------- */
+	.hub-card-grid {
+		@apply m-0 mx-auto w-full max-w-5xl list-none p-0;
+		display: grid;
+		grid-template-columns: repeat(auto-fill, minmax(310px, 1fr));
+		gap: 24px;
 	}
 
+	/* Card ------------------------------------------------------------- */
 	.hub-card {
-		@apply m-0 p-0;
+		background: var(--color-white);
+		border: 1px solid var(--color-grey-20);
+		border-radius: 16px;
+		padding: 28px 28px 24px;
+		transition:
+			box-shadow 0.15s,
+			border-color 0.15s;
+		margin: 0;
+		list-style: none;
+	}
+	.hub-card:hover {
+		border-color: var(--color-grey-30);
+		box-shadow: 0 2px 8px rgb(0 0 0 / 0.05);
 	}
 
-	.hub-card-link {
-		@apply border-grey-20 block h-full rounded-xl border bg-white p-5 no-underline transition-colors;
+	.hub-card .hub-card-head {
+		display: flex;
+		align-items: center;
+		gap: 10px;
+		margin-bottom: 6px;
 	}
-	.hub-card-link:hover {
-		@apply border-blue-elastic no-underline;
+	.hub-card .hub-card-icon svg {
+		width: 28px;
+		height: 28px;
+		display: block;
 	}
-
-	.hub-card-head {
-		@apply mb-2 flex items-start justify-between gap-3;
+	.hub-card .hub-card-title {
+		font-size: 1.214rem;
+		font-weight: 700;
+		color: var(--color-ink-dark);
+		margin: 0;
+	}
+	.hub-card .hub-card-title a {
+		color: var(--color-ink-dark);
+		text-decoration: none;
+	}
+	.hub-card .hub-card-title a:hover {
+		color: var(--color-blue-elastic);
+		text-decoration: none;
 	}
 
-	.hub-card-title {
-		@apply text-ink-dark text-base font-semibold;
+	.hub-card .hub-card-desc {
+		font-size: 14px;
+		color: var(--color-ink-light);
+		margin-bottom: 14px;
+		line-height: 1.5;
 	}
 
-	.hub-card-badge {
-		@apply bg-grey-10 text-ink-light border-grey-20 inline-flex shrink-0 items-center rounded-full border px-2 py-0.5 text-xs font-semibold tracking-wide;
+	.hub-card .hub-card-links {
+		list-style: none;
+		display: flex;
+		flex-direction: column;
+		gap: 2px;
+		margin: 0;
+		padding: 0;
+	}
+	.hub-card .hub-card-links li {
+		margin: 0;
+		padding: 0;
+	}
+	.hub-card .hub-card-links li a {
+		font-size: 14px;
+		font-weight: 600;
+		color: var(--color-blue-elastic-100);
+		padding: 3px 0;
+		display: inline-flex;
+		align-items: baseline;
+		gap: 6px;
+		text-decoration: none;
+	}
+	.hub-card .hub-card-links li a:hover {
+		color: var(--color-blue-elastic-110);
+		text-decoration: underline;
+	}
+	.hub-card .hub-card-links li a::before {
+		content: '\203A';
+		color: var(--color-grey-40);
+		font-weight: 700;
+		font-size: 15px;
 	}
 
-	.hub-card-body {
-		@apply text-ink-light text-sm leading-relaxed;
+	/* Card aside (Panel types, Chart types, Key features...) */
+	.hub-card .hub-card-aside {
+		margin-top: 14px;
+		padding-top: 12px;
+		border-top: 1px solid var(--color-grey-20);
+	}
+	.hub-card .hub-card-aside-label {
+		font-size: 12px;
+		color: var(--color-grey-80);
+		margin-bottom: 6px;
+		font-weight: 600;
+		letter-spacing: 0.3px;
+	}
+	.hub-card .hub-card-aside-links {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 0;
+		font-size: 13px;
+		line-height: 1.9;
+	}
+	.hub-card .hub-card-aside-links a {
+		color: var(--color-blue-elastic-100);
+		font-weight: 500;
+		text-decoration: none;
+	}
+	.hub-card .hub-card-aside-links a:hover {
+		text-decoration: underline;
+	}
+	.hub-card .hub-card-aside-sep {
+		color: var(--color-grey-30);
+		margin: 0 6px;
+	}
 
-		& > *:first-child {
-			@apply mt-0;
-		}
-		& > *:last-child {
-			@apply mb-0;
-		}
+	/* Solution accent borders */
+	.hub-card-sol {
+		border-left: 3px solid var(--color-blue-elastic);
+	}
+	.hub-card-sol-es {
+		border-left-color: #fec514;
+	}
+	.hub-card-sol-obs {
+		border-left-color: #f04e98;
+	}
+	.hub-card-sol-sec {
+		border-left-color: #00bfb3;
 	}
 
 	/* Product badges shown above the H1 of a regular page. */
 	.product-badges {
 		@apply mb-3 flex list-none flex-wrap gap-2 p-0;
-
-		li {
-			@apply m-0 p-0;
-		}
 	}
-
+	.product-badges li {
+		@apply m-0 p-0;
+	}
 	.product-badge {
-		@apply bg-grey-10 text-ink-light border-grey-20 inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold tracking-wide no-underline;
+		@apply inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-semibold tracking-wide no-underline;
+		background: var(--color-grey-10);
+		color: var(--color-ink-light);
+		border: 1px solid var(--color-grey-20);
 	}
 	.product-badge:hover {
-		@apply bg-blue-elastic-10 text-blue-elastic-100 border-blue-elastic no-underline;
+		background: var(--color-blue-elastic-10);
+		color: var(--color-blue-elastic-100);
+		border-color: var(--color-blue-elastic);
+		text-decoration: none;
+	}
+
+	@media (max-width: 768px) {
+		.hub-hero h1 {
+			font-size: 2rem;
+		}
+		.hub-card-grid {
+			grid-template-columns: 1fr;
+		}
+		.hub-on-this-page {
+			flex-direction: column;
+		}
+		.hub-card {
+			padding: 20px;
+		}
 	}
 }
diff --git a/src/Elastic.Markdown/Myst/Directives/DirectiveBlockParser.cs b/src/Elastic.Markdown/Myst/Directives/DirectiveBlockParser.cs
index d38bfa1921..fe1e022fad 100644
--- a/src/Elastic.Markdown/Myst/Directives/DirectiveBlockParser.cs
+++ b/src/Elastic.Markdown/Myst/Directives/DirectiveBlockParser.cs
@@ -146,6 +146,15 @@ protected override DirectiveBlock CreateFencedBlock(BlockProcessor processor)
 		if (info.IndexOf("{link-card}") > 0)
 			return new LinkCardBlock(this, context);
 
+		if (info.IndexOf("{whats-new}") > 0)
+			return new WhatsNewBlock(this, context);
+
+		if (info.IndexOf("{intro}") > 0)
+			return new IntroBlock(this, context);
+
+		if (info.IndexOf("{on-this-page}") > 0)
+			return new OnThisPageBlock(this, context);
+
 		foreach (var admonition in Admonitions)
 		{
 			if (info.IndexOf(admonition) > 0)
diff --git a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
index df6f26b8a2..92db50c08d 100644
--- a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
@@ -131,6 +131,15 @@ protected override void Write(HtmlRenderer renderer, DirectiveBlock directiveBlo
 			case LinkCardBlock linkCardBlock:
 				WriteLinkCard(renderer, linkCardBlock);
 				return;
+			case WhatsNewBlock whatsNewBlock:
+				WriteWhatsNew(renderer, whatsNewBlock);
+				return;
+			case IntroBlock introBlock:
+				WriteIntro(renderer, introBlock);
+				return;
+			case OnThisPageBlock onThisPageBlock:
+				WriteOnThisPage(renderer, onThisPageBlock);
+				return;
 			default:
 				// if (!string.IsNullOrEmpty(directiveBlock.Info) && !directiveBlock.Info.StartsWith('{'))
 				// 	WriteCode(renderer, directiveBlock);
@@ -344,13 +353,19 @@ private static void WriteTabSet(HtmlRenderer renderer, TabSetBlock block)
 
 	private static void WriteHero(HtmlRenderer renderer, HeroBlock block)
 	{
+		var releasesHtml = string.IsNullOrWhiteSpace(block.Releases)
+			? null
+			: RenderInlineMarkdown(block.Releases!);
+
 		var slice = HeroView.Create(new HeroViewModel
 		{
 			DirectiveBlock = block,
-			Icon = block.Icon,
+			IconKey = block.Icon,
+			IconSvg = block.IconSvg,
 			Version = block.Version,
 			ShowSearch = block.ShowSearch,
-			QuickLinks = block.QuickLinks
+			QuickLinks = block.QuickLinks,
+			ReleasesHtml = releasesHtml
 		});
 		RenderRazorSlice(slice, renderer);
 	}
@@ -373,13 +388,49 @@ private static void WriteLinkCard(HtmlRenderer renderer, LinkCardBlock block)
 		var slice = LinkCardView.Create(new LinkCardViewModel
 		{
 			DirectiveBlock = block,
-			Title = block.Title,
-			Link = block.Link,
-			Badge = block.Badge
+			Data = block.Data,
+			IconSvg = ProductIcons.Get(block.Data.Icon)
+		});
+		RenderRazorSlice(slice, renderer);
+	}
+
+	private static void WriteWhatsNew(HtmlRenderer renderer, WhatsNewBlock block)
+	{
+		var slice = WhatsNewView.Create(new WhatsNewViewModel
+		{
+			DirectiveBlock = block,
+			Data = block.Data
+		});
+		RenderRazorSlice(slice, renderer);
+	}
+
+	private static void WriteIntro(HtmlRenderer renderer, IntroBlock block)
+	{
+		var slice = IntroView.Create(new IntroViewModel { DirectiveBlock = block });
+		RenderRazorSlice(slice, renderer);
+	}
+
+	private static void WriteOnThisPage(HtmlRenderer renderer, OnThisPageBlock block)
+	{
+		var slice = OnThisPageView.Create(new OnThisPageViewModel
+		{
+			DirectiveBlock = block,
+			Items = block.CollectItems()
 		});
 		RenderRazorSlice(slice, renderer);
 	}
 
+	private static string RenderInlineMarkdown(string source)
+	{
+		var html = Markdig.Markdown.ToHtml(source).Trim();
+		// Strip a single wrapping <p>...</p> so the result can drop into a span/p directly.
+		const string open = "<p>";
+		const string close = "</p>";
+		if (html.StartsWith(open, StringComparison.Ordinal) && html.EndsWith(close, StringComparison.Ordinal))
+			html = html[open.Length..^close.Length];
+		return html;
+	}
+
 	private static void WriteTabItem(HtmlRenderer renderer, TabItemBlock block)
 	{
 		var slice = TabItemView.Create(new TabItemViewModel
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/CardGroupView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/CardGroupView.cshtml
index 979065318e..28f9d6cc86 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/CardGroupView.cshtml
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/CardGroupView.cshtml
@@ -1,23 +1,15 @@
 @inherits RazorSlice<Elastic.Markdown.Myst.Directives.Hub.CardGroupViewModel>
 
-@{
-	var sectionClass = string.IsNullOrWhiteSpace(Model.Variant)
-		? "hub-card-group"
-		: $"hub-card-group hub-card-group-{Model.Variant}";
+@if (!string.IsNullOrWhiteSpace(Model.Title))
+{
+	<div class="hub-zone" id="@Model.Anchor">
+		<h2 class="hub-zone-title">@Model.Title</h2>
+		@if (!string.IsNullOrWhiteSpace(Model.Intro))
+		{
+			<p class="hub-zone-intro">@Model.Intro</p>
+		}
+	</div>
 }
-
-<section class="@sectionClass" id="@Model.Anchor">
-	@if (!string.IsNullOrWhiteSpace(Model.Title))
-	{
-		<header class="hub-card-group-header">
-			<h2>@Model.Title</h2>
-			@if (!string.IsNullOrWhiteSpace(Model.Intro))
-			{
-				<p class="hub-card-group-intro">@Model.Intro</p>
-			}
-		</header>
-	}
-	<ul class="hub-card-grid">
-		@Model.RenderBlock()
-	</ul>
-</section>
+<ul class="hub-card-grid">
+	@Model.RenderBlock()
+</ul>
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
index c28ea58412..2797255c13 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
@@ -5,20 +5,21 @@
 namespace Elastic.Markdown.Myst.Directives.Hub;
 
 /// <summary>
-/// Renders a full-bleed page hero (dark background, icon, title, description, optional
-/// version badge, optional quick links, optional search box). Designed for landing-style
-/// pages such as product hubs, but the directive is generic and reusable.
+/// Renders a full-bleed page hero with product icon, title (from inner H1),
+/// description, search box, version chip, quick-link pills, and an optional
+/// release-status line. Designed for landing-style pages such as product hubs.
 /// </summary>
 /// <example>
 /// <code>
 /// :::{hero}
-/// :icon: elasticsearch
-/// :version: 9.0
-/// :quick-links: What's new=#whats-new,Get started=/get-started
+/// :icon: kibana
+/// :version: v9 / Serverless (current)
+/// :quick-links: Install=/install,Tutorial=/tutorial,API reference=/api,Release notes=/release-notes
+/// :releases: Latest&#58; [Stack 9.4.1](/rn) (Mar 28, 2026) · [Serverless deployed](/srn) Apr 1, 2026
 ///
-/// # Elasticsearch
+/// # Kibana
 ///
-/// The distributed search and analytics engine.
+/// The UI for the Elasticsearch platform.
 /// :::
 /// </code>
 /// </example>
@@ -28,17 +29,21 @@ public class HeroBlock(DirectiveBlockParser parser, ParserContext context)
 	public override string Directive => "hero";
 
 	public string? Icon { get; private set; }
+	public string? IconSvg { get; private set; }
 	public string? Version { get; private set; }
 	public bool ShowSearch { get; private set; }
 	public IReadOnlyList<HeroQuickLink> QuickLinks { get; private set; } = [];
+	public string? Releases { get; private set; }
 
 	public override void FinalizeAndValidate(ParserContext context)
 	{
 		Icon = Prop("icon");
+		IconSvg = ProductIcons.Get(Icon);
 		Version = Prop("version");
 		// search defaults to true; explicit ":search: false" hides it
 		ShowSearch = TryPropBool("search") ?? true;
 		QuickLinks = ParseQuickLinks(Prop("quick-links"));
+		Releases = Prop("releases");
 	}
 
 	private static IReadOnlyList<HeroQuickLink> ParseQuickLinks(string? raw)
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
index cbd2d794e0..d124143244 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
@@ -3,32 +3,50 @@
 <section class="hub-hero">
 	<div class="hub-hero-inner">
 		<div class="hub-hero-top">
-			@if (!string.IsNullOrWhiteSpace(Model.Icon))
+			@if (!string.IsNullOrWhiteSpace(Model.IconSvg))
 			{
-				<span class="hub-hero-icon" aria-hidden="true">@Model.Icon</span>
+				<span class="hub-hero-icon hub-hero-icon-svg">
+					@(new HtmlString(Model.IconSvg))
+				</span>
 			}
-			@if (!string.IsNullOrWhiteSpace(Model.Version))
+			else if (!string.IsNullOrWhiteSpace(Model.IconKey))
 			{
-				<span class="hub-hero-version">@Model.Version</span>
+				<span class="hub-hero-icon" aria-hidden="true">@Elastic.Markdown.Myst.Directives.Hub.ProductIcons.Initials(Model.IconKey)</span>
 			}
+			<div class="hub-hero-title">
+				@Model.RenderBlock()
+			</div>
 		</div>
-		<div class="hub-hero-content">
-			@Model.RenderBlock()
-		</div>
+
 		@if (Model.ShowSearch)
 		{
 			<div class="hub-hero-search">
 				<navigation-search></navigation-search>
 			</div>
 		}
-		@if (Model.QuickLinks.Count > 0)
+
+		<div class="hub-hero-meta">
+			@if (!string.IsNullOrWhiteSpace(Model.Version))
+			{
+				<span class="hub-hero-version">
+					<span class="hub-hero-version-dot" aria-hidden="true"></span>
+					<span class="hub-hero-version-text">@Model.Version</span>
+				</span>
+			}
+			@if (Model.QuickLinks.Count > 0)
+			{
+				<ul class="hub-hero-pills">
+					@foreach (var link in Model.QuickLinks)
+					{
+						<li><a href="@link.Url">@link.Label</a></li>
+					}
+				</ul>
+			}
+		</div>
+
+		@if (!string.IsNullOrWhiteSpace(Model.ReleasesHtml))
 		{
-			<ul class="hub-hero-links">
-				@foreach (var link in Model.QuickLinks)
-				{
-					<li><a href="@link.Url">@link.Label</a></li>
-				}
-			</ul>
+			<p class="hub-hero-releases">@(new HtmlString(Model.ReleasesHtml))</p>
 		}
 	</div>
 </section>
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs
index 1809af3d30..19373fd0f2 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs
@@ -6,8 +6,10 @@ namespace Elastic.Markdown.Myst.Directives.Hub;
 
 public class HeroViewModel : DirectiveViewModel
 {
-	public required string? Icon { get; init; }
+	public required string? IconKey { get; init; }
+	public required string? IconSvg { get; init; }
 	public required string? Version { get; init; }
 	public required bool ShowSearch { get; init; }
 	public required IReadOnlyList<HeroQuickLink> QuickLinks { get; init; }
+	public required string? ReleasesHtml { get; init; }
 }
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HubYamlBody.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HubYamlBody.cs
new file mode 100644
index 0000000000..fe885e3ce0
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HubYamlBody.cs
@@ -0,0 +1,96 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Markdig.Syntax;
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+/// <summary>
+/// Helpers for directives that read their body as raw YAML directly from the
+/// source file. The directive's children remain markdown blocks (so renderers
+/// that don't recognize the directive still produce something), but the
+/// canonical structured data comes from the YAML.
+/// </summary>
+internal static class HubYamlBody
+{
+	/// <summary>
+	/// Returns the raw text between the opening and closing fences of a directive
+	/// block, or null when no fenced body could be located.
+	/// </summary>
+	public static string? Extract(IBlockExtension block, IFileSystemFileReader reader)
+	{
+		if (block is not Block markdig)
+			return null;
+
+		string source;
+		try
+		{
+			source = reader.ReadAllText(block.CurrentFile.FullName);
+		}
+		catch
+		{
+			return null;
+		}
+
+		var lines = source.Split('\n');
+		var openingLine = markdig.Line;
+		if (openingLine < 0 || openingLine >= lines.Length)
+			return null;
+
+		var fence = ExtractFenceMarker(lines[openingLine]);
+		if (fence is null)
+			return null;
+
+		var closingLine = -1;
+		for (var i = openingLine + 1; i < lines.Length; i++)
+		{
+			var trimmed = lines[i].TrimStart();
+			if (trimmed.StartsWith(fence, StringComparison.Ordinal) && IsClosingFence(trimmed, fence))
+			{
+				closingLine = i;
+				break;
+			}
+		}
+		if (closingLine < 0)
+			return null;
+
+		var body = string.Join('\n', lines, openingLine + 1, closingLine - openingLine - 1);
+		return string.IsNullOrWhiteSpace(body) ? null : body;
+	}
+
+	private static string? ExtractFenceMarker(string openingLine)
+	{
+		var trimmed = openingLine.TrimStart();
+		var count = 0;
+		while (count < trimmed.Length && trimmed[count] == ':')
+			count++;
+		return count >= 3 ? new string(':', count) : null;
+	}
+
+	private static bool IsClosingFence(string trimmed, string fence)
+	{
+		if (!trimmed.StartsWith(fence, StringComparison.Ordinal))
+			return false;
+		for (var i = fence.Length; i < trimmed.Length; i++)
+		{
+			if (!char.IsWhiteSpace(trimmed[i]))
+				return false;
+		}
+		return true;
+	}
+}
+
+/// <summary>
+/// Minimal abstraction over file reading so HubYamlBody can be tested without a
+/// full <c>BuildContext</c>.
+/// </summary>
+public interface IFileSystemFileReader
+{
+	string ReadAllText(string path);
+}
+
+internal sealed class BuildContextFileReader(System.IO.Abstractions.IFileSystem fileSystem) : IFileSystemFileReader
+{
+	public string ReadAllText(string path) => fileSystem.File.ReadAllText(path);
+}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/IntroBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/IntroBlock.cs
new file mode 100644
index 0000000000..e6f350dfd6
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/IntroBlock.cs
@@ -0,0 +1,26 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+/// <summary>
+/// A small "getting started" callout panel shown between the hero and the first
+/// section. The body is rendered as inline markdown so authors can use bold,
+/// links, and emphasis. Visually a white rounded panel with a teal accent bar.
+/// </summary>
+/// <example>
+/// <code>
+/// :::{intro}
+/// **New to Kibana?** [Learn data exploration and visualization](/learn), a hands-on
+/// walk-through of Discover, ES|QL, visualizations, and dashboards.
+/// :::
+/// </code>
+/// </example>
+public class IntroBlock(DirectiveBlockParser parser, ParserContext context)
+	: DirectiveBlock(parser, context)
+{
+	public override string Directive => "intro";
+
+	public override void FinalizeAndValidate(ParserContext context) { }
+}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/IntroView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/IntroView.cshtml
new file mode 100644
index 0000000000..8f47ae9ee9
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/IntroView.cshtml
@@ -0,0 +1,5 @@
+@inherits RazorSlice<Elastic.Markdown.Myst.Directives.Hub.IntroViewModel>
+
+<aside class="hub-intro">
+	@Model.RenderBlock()
+</aside>
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/IntroViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Hub/IntroViewModel.cs
new file mode 100644
index 0000000000..f639218cea
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/IntroViewModel.cs
@@ -0,0 +1,7 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+public class IntroViewModel : DirectiveViewModel;
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardBlock.cs
index 8c4431a8a4..a116fd6e81 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardBlock.cs
@@ -3,21 +3,34 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Markdown.Diagnostics;
-using Elastic.Markdown.Helpers;
+using YamlDotNet.Core;
+using YamlDotNet.Serialization;
 
 namespace Elastic.Markdown.Myst.Directives.Hub;
 
 /// <summary>
-/// A single card with a required title and link, plus an optional badge and
-/// description body. Designed to live inside a <see cref="CardGroupBlock"/>
-/// but rendered standalone if used outside one.
+/// A rich card with title, link, description, primary-link list, and an optional
+/// aside (e.g. "Panel types: A · B · C"). The card schema is YAML-formatted in the
+/// directive body for predictable structure.
 /// </summary>
 /// <example>
 /// <code>
-/// :::{link-card} Self-managed
-/// :link: /deploy-manage/deploy/self-managed
-/// :badge: 9.0
-/// Run Elasticsearch on your own infrastructure.
+/// :::{link-card}
+/// title: Discover
+/// link: /discover/
+/// description: Browse documents, filter, and query your indices in real time.
+/// links:
+///   - label: Get started with Discover
+///     url: /discover/get-started
+///   - label: Use ES|QL in Kibana
+///     url: /esql
+/// aside:
+///   label: Panel types
+///   links:
+///     - label: Visualizations
+///       url: /viz
+///     - label: Maps
+///       url: /maps
 /// :::
 /// </code>
 /// </example>
@@ -26,20 +39,77 @@ public class LinkCardBlock(DirectiveBlockParser parser, ParserContext context)
 {
 	public override string Directive => "link-card";
 
-	public string Title { get; private set; } = default!;
-	public string? Link { get; private set; }
-	public string? Badge { get; private set; }
+	public LinkCardData Data { get; private set; } = LinkCardData.Empty;
+
+	public string Title => Data.Title ?? string.Empty;
 
 	public override void FinalizeAndValidate(ParserContext context)
 	{
-		if (string.IsNullOrWhiteSpace(Arguments))
-			this.EmitError("{link-card} requires a title argument, e.g. `:::{link-card} My title`.");
+		var yaml = HubYamlBody.Extract(this, new BuildContextFileReader(Build.ReadFileSystem));
+		if (yaml is null)
+		{
+			this.EmitError("{link-card} requires a YAML body. See the link-card directive docs.");
+			return;
+		}
 
-		Title = (Arguments ?? "{undefined}").ReplaceSubstitutions(context);
-		Link = Prop("link");
-		Badge = Prop("badge");
+		try
+		{
+			Data = YamlSerialization.Deserialize<LinkCardData>(yaml, Build.ProductsConfiguration) ?? LinkCardData.Empty;
+		}
+		catch (YamlException ex)
+		{
+			this.EmitError($"{{link-card}} YAML parse error: {ex.Message}");
+			return;
+		}
 
-		if (string.IsNullOrWhiteSpace(Link))
-			this.EmitError("{link-card} requires a `:link:` option.");
+		if (string.IsNullOrWhiteSpace(Data.Title))
+			this.EmitError("{link-card} requires a `title` field in its YAML body.");
 	}
 }
+
+[YamlSerializable]
+public record LinkCardData
+{
+	[YamlMember(Alias = "title")]
+	public string? Title { get; set; }
+
+	[YamlMember(Alias = "link")]
+	public string? Link { get; set; }
+
+	[YamlMember(Alias = "description")]
+	public string? Description { get; set; }
+
+	[YamlMember(Alias = "icon")]
+	public string? Icon { get; set; }
+
+	[YamlMember(Alias = "variant")]
+	public string? Variant { get; set; }
+
+	[YamlMember(Alias = "links")]
+	public LinkCardLink[] Links { get; set; } = [];
+
+	[YamlMember(Alias = "aside")]
+	public LinkCardAside? Aside { get; set; }
+
+	public static LinkCardData Empty { get; } = new();
+}
+
+[YamlSerializable]
+public record LinkCardLink
+{
+	[YamlMember(Alias = "label")]
+	public string? Label { get; set; }
+
+	[YamlMember(Alias = "url")]
+	public string? Url { get; set; }
+}
+
+[YamlSerializable]
+public record LinkCardAside
+{
+	[YamlMember(Alias = "label")]
+	public string? Label { get; set; }
+
+	[YamlMember(Alias = "links")]
+	public LinkCardLink[] Links { get; set; } = [];
+}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml
index d9bb7d3d60..2017da0d05 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml
@@ -1,16 +1,67 @@
 @inherits RazorSlice<Elastic.Markdown.Myst.Directives.Hub.LinkCardViewModel>
 
-<li class="hub-card">
-	<a class="hub-card-link" href="@Model.Link">
-		<div class="hub-card-head">
-			<span class="hub-card-title">@Model.Title</span>
-			@if (!string.IsNullOrWhiteSpace(Model.Badge))
+@{
+	var d = Model.Data;
+	var classes = "hub-card";
+	if (!string.IsNullOrWhiteSpace(d.Variant))
+		classes += " hub-card-sol hub-card-sol-" + d.Variant;
+}
+
+<li class="@classes">
+	<div class="hub-card-head">
+		@if (!string.IsNullOrWhiteSpace(Model.IconSvg))
+		{
+			<span class="hub-card-icon">@(new HtmlString(Model.IconSvg))</span>
+		}
+		<h3 class="hub-card-title">
+			@if (!string.IsNullOrWhiteSpace(d.Link))
 			{
-				<span class="hub-card-badge">@Model.Badge</span>
+				<a href="@d.Link">@d.Title</a>
 			}
+			else
+			{
+				@d.Title
+			}
+		</h3>
+	</div>
+
+	@if (!string.IsNullOrWhiteSpace(d.Description))
+	{
+		<p class="hub-card-desc">@d.Description</p>
+	}
+
+	@if (d.Links.Length > 0)
+	{
+		<ul class="hub-card-links">
+			@foreach (var link in d.Links)
+			{
+				if (string.IsNullOrWhiteSpace(link.Url) || string.IsNullOrWhiteSpace(link.Label))
+					continue;
+				<li><a href="@link.Url">@link.Label</a></li>
+			}
+		</ul>
+	}
+
+	@if (d.Aside is { } aside && aside.Links.Length > 0)
+	{
+		<div class="hub-card-aside">
+			@if (!string.IsNullOrWhiteSpace(aside.Label))
+			{
+				<div class="hub-card-aside-label">@aside.Label</div>
+			}
+			<div class="hub-card-aside-links">
+				@for (var i = 0; i < aside.Links.Length; i++)
+				{
+					var link = aside.Links[i];
+					if (string.IsNullOrWhiteSpace(link.Url) || string.IsNullOrWhiteSpace(link.Label))
+						continue;
+					<a href="@link.Url">@link.Label</a>
+					@if (i < aside.Links.Length - 1)
+					{
+						<span class="hub-card-aside-sep" aria-hidden="true">·</span>
+					}
+				}
+			</div>
 		</div>
-		<div class="hub-card-body">
-			@Model.RenderBlock()
-		</div>
-	</a>
+	}
 </li>
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardViewModel.cs
index 7d91af642c..ff75e4821f 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardViewModel.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardViewModel.cs
@@ -6,7 +6,6 @@ namespace Elastic.Markdown.Myst.Directives.Hub;
 
 public class LinkCardViewModel : DirectiveViewModel
 {
-	public required string Title { get; init; }
-	public required string? Link { get; init; }
-	public required string? Badge { get; init; }
+	public required LinkCardData Data { get; init; }
+	public required string? IconSvg { get; init; }
 }
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageBlock.cs
new file mode 100644
index 0000000000..adb9fc9e04
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageBlock.cs
@@ -0,0 +1,54 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Markdig.Syntax;
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+/// <summary>
+/// Inline table-of-contents chip listing every {card-group} and {whats-new}
+/// section on the page that has a non-empty id and title. Auto-generated; no
+/// options or body required.
+/// </summary>
+/// <example>
+/// <code>
+/// :::{on-this-page}
+/// :::
+/// </code>
+/// </example>
+public class OnThisPageBlock(DirectiveBlockParser parser, ParserContext context)
+	: DirectiveBlock(parser, context)
+{
+	public override string Directive => "on-this-page";
+
+	public override void FinalizeAndValidate(ParserContext context) { }
+
+	/// <summary>
+	/// Resolved at render time, since later sibling card-groups may not be
+	/// validated yet at parse time.
+	/// </summary>
+	public IReadOnlyList<OnThisPageItem> CollectItems()
+	{
+		var current = (ContainerBlock)this;
+		while (current.Parent is not null)
+			current = current.Parent;
+
+		var items = new List<OnThisPageItem>();
+		foreach (var descendant in current.Descendants())
+		{
+			switch (descendant)
+			{
+				case CardGroupBlock g when !string.IsNullOrWhiteSpace(g.Anchor) && !string.IsNullOrWhiteSpace(g.Title):
+					items.Add(new OnThisPageItem(g.Title!, g.Anchor!));
+					break;
+				case WhatsNewBlock w when !string.IsNullOrWhiteSpace(w.Data.Id) && !string.IsNullOrWhiteSpace(w.Data.Title):
+					items.Add(new OnThisPageItem(w.Data.Title!, w.Data.Id!));
+					break;
+			}
+		}
+		return items;
+	}
+}
+
+public readonly record struct OnThisPageItem(string Title, string Anchor);
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageView.cshtml
new file mode 100644
index 0000000000..69b9231df0
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageView.cshtml
@@ -0,0 +1,17 @@
+@inherits RazorSlice<Elastic.Markdown.Myst.Directives.Hub.OnThisPageViewModel>
+
+@if (Model.Items.Count > 0)
+{
+	<nav class="hub-on-this-page" aria-label="On this page">
+		<span class="hub-on-this-page-label">On this page</span>
+		@for (var i = 0; i < Model.Items.Count; i++)
+		{
+			var item = Model.Items[i];
+			<a href="@($"#{item.Anchor}")">@item.Title</a>
+			@if (i < Model.Items.Count - 1)
+			{
+				<span class="hub-on-this-page-sep" aria-hidden="true">·</span>
+			}
+		}
+	</nav>
+}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageViewModel.cs
new file mode 100644
index 0000000000..e4f190c7a9
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageViewModel.cs
@@ -0,0 +1,10 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+public class OnThisPageViewModel : DirectiveViewModel
+{
+	public required IReadOnlyList<OnThisPageItem> Items { get; init; }
+}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/ProductIcons.cs b/src/Elastic.Markdown/Myst/Directives/Hub/ProductIcons.cs
new file mode 100644
index 0000000000..3cd39b84ec
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/ProductIcons.cs
@@ -0,0 +1,68 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using System.Collections.Frozen;
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+/// <summary>
+/// Looks up an inline SVG by product key. Used by the {hero} directive (hero-icon
+/// chip) and {link-card} (solution-card icon). Keys are kept lowercase and match
+/// the product ids in <c>products.yml</c> wherever possible.
+/// </summary>
+public static class ProductIcons
+{
+	private static readonly FrozenDictionary<string, string> Icons = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+	{
+		["elasticsearch"] = """
+			<svg width="32" height="32" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+				<path fill-rule="evenodd" clip-rule="evenodd" d="M55.7246 14.7075L55.7276 14.7015C50.7746 8.77351 43.3286 4.99951 34.9996 4.99951C24.4006 4.99951 15.2326 11.1115 10.8136 19.9995H46.0056C48.5306 19.9995 50.9886 19.1295 52.9206 17.5035C53.9246 16.6585 54.8636 15.7385 55.7246 14.7075Z" fill="#FEC514"/>
+				<path fill-rule="evenodd" clip-rule="evenodd" d="M8 32C8 34.422 8.324 36.767 8.922 39H42C45.866 39 49 35.866 49 32C49 28.134 45.866 25 42 25H8.922C8.324 27.233 8 29.578 8 32Z" fill="rgba(255,255,255,0.85)"/>
+				<path fill-rule="evenodd" clip-rule="evenodd" d="M55.7246 49.2925L55.7276 49.2985C50.7746 55.2265 43.3286 59.0005 34.9996 59.0005C24.4006 59.0005 15.2326 52.8885 10.8136 44.0005H46.0056C48.5306 44.0005 50.9886 44.8705 52.9206 46.4965C53.9246 47.3415 54.8636 48.2615 55.7246 49.2925Z" fill="#00BFB3"/>
+			</svg>
+			""",
+		["kibana"] = """
+			<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" aria-hidden="true">
+				<g fill="none" fill-rule="evenodd" transform="translate(4)">
+					<polygon fill="#F04E98" points="0 0 0 28.789 24.935 .017"/>
+					<path fill="rgba(255,255,255,0.25)" d="M0,12 L0,28.789 L11.906,15.051 C8.368,13.115 4.317,12 0,12"/>
+					<path fill="#00BFB3" d="M14.4785,16.664 L2.2675,30.754 L1.1945,31.991 L24.3865,31.991 C23.1345,25.699 19.5035,20.272 14.4785,16.664"/>
+				</g>
+			</svg>
+			""",
+		["observability"] = """
+			<svg width="32" height="32" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+				<path fill-rule="evenodd" clip-rule="evenodd" d="M22 59H17.0906C10.966 59 6 54.0201 6 47.8785V32H22V59Z" fill="#F04E98"/>
+				<path fill-rule="evenodd" clip-rule="evenodd" d="M22 59H38V19H22V59Z" fill="rgba(255,255,255,0.85)"/>
+				<path fill-rule="evenodd" clip-rule="evenodd" d="M59 59H43V6L46.5081 6.04052C53.4282 6.11868 59 12.18 59 19.6277V42.9611V59Z" fill="#0077CC"/>
+			</svg>
+			""",
+		["security"] = """
+			<svg width="32" height="32" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+				<path fill-rule="evenodd" clip-rule="evenodd" d="M20 17V4H56V34C56 41.0112 43.7467 45.6044 39 47V17H20Z" fill="#FA744E"/>
+				<path fill-rule="evenodd" clip-rule="evenodd" d="M9 39.3984V22H34V60C34 60 9 49.5847 9 39.3984Z" fill="#00BFB3"/>
+				<path fill-rule="evenodd" clip-rule="evenodd" d="M19 22H34V47C28.406 44.9626 19 40.292 19 34.4224V22Z" fill="rgba(255,255,255,0.85)"/>
+			</svg>
+			"""
+	}.ToFrozenDictionary(StringComparer.OrdinalIgnoreCase);
+
+	/// <summary>
+	/// Returns the inline SVG markup for <paramref name="key"/>, or null when no icon
+	/// is registered for that product.
+	/// </summary>
+	public static string? Get(string? key)
+	{
+		if (string.IsNullOrWhiteSpace(key))
+			return null;
+		return Icons.TryGetValue(key, out var svg) ? svg : null;
+	}
+
+	/// <summary>
+	/// Initials fallback: the first character of the key, uppercased. Returns a
+	/// single-letter string, suitable for the standard hero-icon chip when no
+	/// SVG is registered.
+	/// </summary>
+	public static string Initials(string? key) =>
+		string.IsNullOrWhiteSpace(key) ? "?" : char.ToUpperInvariant(key[0]).ToString();
+}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
new file mode 100644
index 0000000000..f009c3f0b8
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
@@ -0,0 +1,99 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Markdown.Diagnostics;
+using YamlDotNet.Core;
+using YamlDotNet.Serialization;
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+/// <summary>
+/// Renders the "What's new" panel: a header with a New badge, a section title,
+/// optional release-notes links, and a list of items with title / description /
+/// per-item meta pill (e.g. "9.4 preview", "Mar 2026").
+/// </summary>
+/// <example>
+/// <code>
+/// :::{whats-new}
+/// title: What's new in Kibana
+/// id: whats-new
+/// release-links:
+///   - label: 9.4
+///     url: /release-notes/kibana
+///   - label: Serverless
+///     url: /release-notes/serverless
+/// items:
+///   - title: Dashboards APIs
+///     description: Programmatically create dashboards
+///     link: /api/dashboards
+///     meta: 9.4 preview
+/// :::
+/// </code>
+/// </example>
+public class WhatsNewBlock(DirectiveBlockParser parser, ParserContext context)
+	: DirectiveBlock(parser, context)
+{
+	public override string Directive => "whats-new";
+
+	public WhatsNewData Data { get; private set; } = WhatsNewData.Empty;
+
+	public override void FinalizeAndValidate(ParserContext context)
+	{
+		var yaml = HubYamlBody.Extract(this, new BuildContextFileReader(Build.ReadFileSystem));
+		if (yaml is null)
+		{
+			this.EmitError("{whats-new} requires a YAML body. See the whats-new directive docs.");
+			return;
+		}
+
+		try
+		{
+			Data = YamlSerialization.Deserialize<WhatsNewData>(yaml, Build.ProductsConfiguration) ?? WhatsNewData.Empty;
+		}
+		catch (YamlException ex)
+		{
+			this.EmitError($"{{whats-new}} YAML parse error: {ex.Message}");
+		}
+	}
+
+	public override IEnumerable<string> GeneratedAnchors =>
+		string.IsNullOrWhiteSpace(Data.Id) ? [] : [Data.Id!];
+}
+
+[YamlSerializable]
+public record WhatsNewData
+{
+	[YamlMember(Alias = "title")]
+	public string? Title { get; set; }
+
+	[YamlMember(Alias = "id")]
+	public string? Id { get; set; }
+
+	[YamlMember(Alias = "badge")]
+	public string? Badge { get; set; } = "New";
+
+	[YamlMember(Alias = "release-links")]
+	public LinkCardLink[] ReleaseLinks { get; set; } = [];
+
+	[YamlMember(Alias = "items")]
+	public WhatsNewItem[] Items { get; set; } = [];
+
+	public static WhatsNewData Empty { get; } = new();
+}
+
+[YamlSerializable]
+public record WhatsNewItem
+{
+	[YamlMember(Alias = "title")]
+	public string? Title { get; set; }
+
+	[YamlMember(Alias = "description")]
+	public string? Description { get; set; }
+
+	[YamlMember(Alias = "link")]
+	public string? Link { get; set; }
+
+	[YamlMember(Alias = "meta")]
+	public string? Meta { get; set; }
+}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewView.cshtml
new file mode 100644
index 0000000000..ea449797ec
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewView.cshtml
@@ -0,0 +1,75 @@
+@inherits RazorSlice<Elastic.Markdown.Myst.Directives.Hub.WhatsNewViewModel>
+
+@{
+	var d = Model.Data;
+}
+
+<section class="hub-whats-new" id="@d.Id">
+	<header class="hub-wn-header">
+		@if (!string.IsNullOrWhiteSpace(d.Badge))
+		{
+			<span class="hub-wn-badge">@d.Badge</span>
+		}
+		@if (!string.IsNullOrWhiteSpace(d.Title))
+		{
+			<span class="hub-wn-title">@d.Title</span>
+		}
+		@if (d.ReleaseLinks.Length > 0)
+		{
+			<span class="hub-wn-rn-links">
+				<span class="hub-wn-rn-label">Release notes:</span>
+				@for (var i = 0; i < d.ReleaseLinks.Length; i++)
+				{
+					var link = d.ReleaseLinks[i];
+					if (string.IsNullOrWhiteSpace(link.Url) || string.IsNullOrWhiteSpace(link.Label))
+						continue;
+					<a href="@link.Url">@link.Label</a>
+					@if (i < d.ReleaseLinks.Length - 1)
+					{
+						<span class="hub-wn-rn-sep" aria-hidden="true">·</span>
+					}
+				}
+			</span>
+		}
+	</header>
+	@if (d.Items.Length > 0)
+	{
+		<ul class="hub-wn-items">
+			@foreach (var item in d.Items)
+			{
+				if (string.IsNullOrWhiteSpace(item.Title))
+					continue;
+				<li class="hub-wn-item">
+					@if (!string.IsNullOrWhiteSpace(item.Link))
+					{
+						<a href="@item.Link" class="hub-wn-item-link">
+							<strong class="hub-wn-item-title">@item.Title</strong>
+							@if (!string.IsNullOrWhiteSpace(item.Description))
+							{
+								<span class="hub-wn-item-desc">@item.Description</span>
+							}
+							@if (!string.IsNullOrWhiteSpace(item.Meta))
+							{
+								<span class="hub-wn-item-meta">@item.Meta</span>
+							}
+						</a>
+					}
+					else
+					{
+						<div class="hub-wn-item-link">
+							<strong class="hub-wn-item-title">@item.Title</strong>
+							@if (!string.IsNullOrWhiteSpace(item.Description))
+							{
+								<span class="hub-wn-item-desc">@item.Description</span>
+							}
+							@if (!string.IsNullOrWhiteSpace(item.Meta))
+							{
+								<span class="hub-wn-item-meta">@item.Meta</span>
+							}
+						</div>
+					}
+				</li>
+			}
+		</ul>
+	}
+</section>
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewViewModel.cs
new file mode 100644
index 0000000000..678e31f650
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewViewModel.cs
@@ -0,0 +1,10 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+public class WhatsNewViewModel : DirectiveViewModel
+{
+	public required WhatsNewData Data { get; init; }
+}
diff --git a/src/Elastic.Markdown/Myst/YamlSerialization.cs b/src/Elastic.Markdown/Myst/YamlSerialization.cs
index 4f8502e75f..9b9309e1cc 100644
--- a/src/Elastic.Markdown/Myst/YamlSerialization.cs
+++ b/src/Elastic.Markdown/Myst/YamlSerialization.cs
@@ -42,4 +42,9 @@ public static T Deserialize<T>(string yaml, ProductsConfiguration products)
 [YamlSerializable(typeof(ContributorEntry))]
 [YamlSerializable(typeof(ChangelogDirectiveConfigYaml))]
 [YamlSerializable(typeof(ChangelogDirectiveBundleConfigYaml))]
+[YamlSerializable(typeof(Elastic.Markdown.Myst.Directives.Hub.LinkCardData))]
+[YamlSerializable(typeof(Elastic.Markdown.Myst.Directives.Hub.LinkCardLink))]
+[YamlSerializable(typeof(Elastic.Markdown.Myst.Directives.Hub.LinkCardAside))]
+[YamlSerializable(typeof(Elastic.Markdown.Myst.Directives.Hub.WhatsNewData))]
+[YamlSerializable(typeof(Elastic.Markdown.Myst.Directives.Hub.WhatsNewItem))]
 public partial class DocsBuilderYamlStaticContext;

From 705bd159abda5185566d61de115fe8adf5e6863b Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 21:25:12 +0200
Subject: [PATCH 094/226] feat(hubs): restore full section coverage matching
 the gist prototypes

Adds the sections that were dropped during the directive rewrite so the
hub markdown matches the gist HTML one-to-one:

- Elasticsearch: Index and ingest data, Aggregations, Data modeling,
  Manage data, AI and vector search, Security, Clients and integrations,
  Reference (8 sections previously missing).
- Kibana: Track and respond, AI and automation, Management and developer
  tools, Reference (4 sections previously missing).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docs/hubs/elasticsearch/9.0.md | 631 +++++++++++++++++++++++++++++----
 docs/hubs/kibana/9.0.md        | 217 ++++++++++++
 2 files changed, 785 insertions(+), 63 deletions(-)

diff --git a/docs/hubs/elasticsearch/9.0.md b/docs/hubs/elasticsearch/9.0.md
index 005007f1a0..6ef52436c4 100644
--- a/docs/hubs/elasticsearch/9.0.md
+++ b/docs/hubs/elasticsearch/9.0.md
@@ -4,9 +4,9 @@ layout: hub
 
 :::{hero}
 :icon: elasticsearch
-:version: v9 / Serverless (current)
-:quick-links: Install=/install,Tutorial=/tutorial,API reference=/api,Release notes=/release-notes
-:releases: Latest&#58; [Stack 9.4.1](/release-notes/elasticsearch) (Mar 28, 2026) · [Serverless deployed](/release-notes/serverless) Apr 1, 2026
+:version: v9 (current)
+:quick-links: Install=https://www.elastic.co/docs/deploy-manage/deploy/self-managed/installing-elasticsearch,Quick start=https://www.elastic.co/docs/reference/elasticsearch/rest-apis/api-examples,API reference=https://www.elastic.co/docs/api/doc/elasticsearch,Release notes=https://www.elastic.co/docs/release-notes/elasticsearch
+:releases: Latest&#58; [Stack 9.0.0](https://www.elastic.co/docs/release-notes/elasticsearch) (Apr 2025)
 
 # Elasticsearch
 
@@ -17,26 +17,32 @@ The distributed search and analytics engine. Store, search, and analyze data at
 :::
 
 :::{intro}
-**New to Elasticsearch?** [Start with Elastic Fundamentals](https://www.elastic.co/docs/get-started) — a hands-on walk-through of indexing, querying, and search relevance.
+**New to Elasticsearch?** [Follow the quick start](https://www.elastic.co/docs/reference/elasticsearch/rest-apis/api-examples) to run your first queries, or explore [how to bring your data in](https://www.elastic.co/docs/manage-data/ingest) and start searching in minutes.
 :::
 
 :::{whats-new}
 title: What's new in Elasticsearch
 id: whats-new
 release-links:
-  - label: 9.4
-    url: /release-notes/elasticsearch
-  - label: Serverless
-    url: /release-notes/serverless
+  - label: 9.0
+    url: https://www.elastic.co/docs/release-notes/elasticsearch
 items:
-  - title: ES|QL JOIN syntax
-    description: Run cross-index joins in ES|QL queries with full GA stability and performance
-    link: /reference/esql/joins
-    meta: 9.0 GA
-  - title: BBQ vector quantization
-    description: 30% smaller indices and faster search with the new Better Binary Quantization encoding
-    link: /reference/vector-quantization
+  - title: semantic_text field type
+    description: Simplify semantic search — no pipeline setup needed, just define the field and start querying
+    link: https://www.elastic.co/docs/solutions/search/semantic-search/semantic-search-semantic-text
     meta: 9.0 GA
+  - title: ES|QL improvements
+    description: New functions, cross-cluster support, and dense vector operations directly in ES|QL queries
+    link: https://www.elastic.co/docs/reference/query-languages/esql/esql-getting-started
+    meta: '9.0'
+  - title: Inference API expansion
+    description: Connect to external AI models (OpenAI, Cohere, Anthropic, Hugging Face, Azure, Google) for embeddings and reranking
+    link: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put
+    meta: '9.0'
+  - title: Breaking changes in 9.0
+    description: Review removed settings, deprecated APIs, and behavioral changes before upgrading from 8.x
+    link: https://www.elastic.co/docs/release-notes/elasticsearch/breaking-changes
+    meta: Upgrade guide
 :::
 
 ::::{card-group}
@@ -45,83 +51,582 @@ items:
 
 :::{link-card}
 title: Self-managed
-link: /deploy-manage/deploy/self-managed
-description: Run Elasticsearch on your own infrastructure for full control over hardware and configuration.
+link: https://www.elastic.co/docs/deploy-manage/deploy/self-managed/installing-elasticsearch
+description: Install and run Elasticsearch on your own infrastructure.
 links:
-  - label: Install on Linux / macOS
-    url: /deploy-manage/deploy/self-managed/install-elasticsearch
-  - label: Install with Docker
-    url: /deploy-manage/deploy/self-managed/install-elasticsearch-with-docker
-  - label: Configure (elasticsearch.yml)
-    url: /deploy-manage/deploy/self-managed/configure-elasticsearch
+  - label: Docker
+    url: https://www.elastic.co/docs/deploy-manage/deploy/self-managed/install-elasticsearch-with-docker
+  - label: Debian / Ubuntu
+    url: https://www.elastic.co/docs/deploy-manage/deploy/self-managed/install-elasticsearch-with-debian-package
+  - label: RPM
+    url: https://www.elastic.co/docs/deploy-manage/deploy/self-managed/install-elasticsearch-with-rpm
+  - label: Windows
+    url: https://www.elastic.co/docs/deploy-manage/deploy/self-managed/install-elasticsearch-with-zip-on-windows
+  - label: Linux / macOS archive
+    url: https://www.elastic.co/docs/deploy-manage/deploy/self-managed/install-elasticsearch-from-archive-on-linux-macos
+  - label: Configure Elasticsearch
+    url: https://www.elastic.co/docs/deploy-manage/deploy/self-managed/configure-elasticsearch
+  - label: Secure a self-managed cluster
+    url: https://www.elastic.co/docs/deploy-manage/deploy/self-managed/tutorial-self-managed-secure
 :::
 
 :::{link-card}
-title: Elastic Cloud Hosted
-link: /deploy-manage/deploy/elastic-cloud
-description: Managed deployments on AWS, GCP, or Azure with one-click upgrades and zero downtime.
+title: Managed deployments
+link: https://www.elastic.co/docs/deploy-manage/deploy/elastic-cloud
+description: Run Elasticsearch on Elastic Cloud, Kubernetes, or ECE.
 links:
-  - label: Sign up
-    url: /deploy-manage/deploy/elastic-cloud/sign-up
-  - label: Manage deployments
-    url: /deploy-manage/deploy/elastic-cloud/manage-deployments
+  - label: Elastic Cloud Hosted
+    url: https://www.elastic.co/docs/deploy-manage/deploy/elastic-cloud
+  - label: Elastic Cloud on Kubernetes (ECK)
+    url: https://www.elastic.co/docs/deploy-manage/deploy/cloud-on-k8s
+  - label: Elastic Cloud Enterprise (ECE)
+    url: https://www.elastic.co/docs/deploy-manage/deploy/cloud-enterprise
 :::
 
 :::{link-card}
-title: Elastic Cloud Serverless
-link: /deploy-manage/deploy/elastic-cloud-serverless
-description: Pay-per-use Elasticsearch with no clusters to manage and elastic auto-scaling.
+title: Maintain and monitor
+link: https://www.elastic.co/docs/deploy-manage/maintenance/start-stop-services/start-stop-elasticsearch
+description: Production guidance, upgrades, cluster health, and diagnostics.
 links:
-  - label: Get started
-    url: /deploy-manage/deploy/elastic-cloud-serverless/get-started
+  - label: Start and stop Elasticsearch
+    url: https://www.elastic.co/docs/deploy-manage/maintenance/start-stop-services/start-stop-elasticsearch
+  - label: Stack monitoring
+    url: https://www.elastic.co/docs/deploy-manage/monitor/stack-monitoring/elasticsearch-monitoring-self-managed
+  - label: Capture diagnostics
+    url: https://www.elastic.co/docs/troubleshoot/elasticsearch/diagnostic
+  - label: Troubleshoot
+    url: https://www.elastic.co/docs/troubleshoot/elasticsearch
+  - label: Snapshot and restore
+    url: https://www.elastic.co/docs/deploy-manage/tools/snapshot-and-restore
 :::
 ::::
 
 ::::{card-group}
-:title: Search and query
-:id: search
+:title: Index and ingest data
+:id: ingest
 
 :::{link-card}
-title: ES|QL
-link: /reference/esql
-description: Pipe-friendly query language for searching, filtering, and aggregating data.
+title: Ingest pipelines
+link: https://www.elastic.co/docs/manage-data/ingest/transform-enrich/ingest-pipelines
+description: Pre-process documents before indexing with processors that parse, transform, and enrich your data.
+links:
+  - label: Overview and setup
+    url: https://www.elastic.co/docs/manage-data/ingest/transform-enrich/ingest-pipelines
+  - label: Simulate ingestion (API)
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-simulate-ingest
+  - label: All ingest methods
+    url: https://www.elastic.co/docs/manage-data/ingest
+:::
+
+:::{link-card}
+title: Data streams
+link: https://www.elastic.co/docs/manage-data/data-store/data-streams
+description: Manage time-series data with a single resource that spans multiple backing indices.
+links:
+  - label: Data streams overview
+    url: https://www.elastic.co/docs/manage-data/data-store/data-streams
+  - label: Manage data streams
+    url: https://www.elastic.co/docs/manage-data/data-store/data-streams/manage-data-stream
+  - label: Logs data stream (logsdb)
+    url: https://www.elastic.co/docs/manage-data/data-store/data-streams/logs-data-stream
+:::
+
+:::{link-card}
+title: Document APIs
+link: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-index
+description: Index, update, delete, and retrieve documents with the core document APIs.
 links:
-  - label: Get started
-    url: /reference/esql/get-started
-  - label: Functions reference
-    url: /reference/esql/functions
+  - label: Index a document
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-index
+  - label: Bulk API
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-bulk
+  - label: Reindex API
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-reindex
+  - label: Reindex examples
+    url: https://www.elastic.co/docs/reference/elasticsearch/rest-apis/reindex-indices
+  - label: Migrate data between clusters
+    url: https://www.elastic.co/docs/manage-data/migrate/migrate-data-between-elasticsearch-clusters-with-minimal-downtime
 :::
+::::
+
+::::{card-group}
+:title: Search and query
+:id: search
 
 :::{link-card}
 title: Query DSL
-link: /reference/query-dsl
-description: JSON-based query language for full-text, structured, geo, and vector search.
+link: https://www.elastic.co/docs/reference/query-languages/query-dsl/full-text-queries
+description: Write expressive queries using the JSON-based Domain Specific Language — from simple term filters to compound boolean queries.
 links:
-  - label: Match query
-    url: /reference/query-dsl/query-dsl-match-query
-  - label: Bool query
-    url: /reference/query-dsl/query-dsl-bool-query
+  - label: Full-text search
+    url: https://www.elastic.co/docs/solutions/search/full-text
+  - label: Full-text queries
+    url: https://www.elastic.co/docs/reference/query-languages/query-dsl/full-text-queries
+  - label: Search API
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search
+  - label: Cross-cluster search
+    url: https://www.elastic.co/docs/explore-analyze/cross-cluster-search
 aside:
   label: Query types
   links:
-    - label: Term
-      url: /reference/query-dsl/term-level-queries
-    - label: Full text
-      url: /reference/query-dsl/full-text-queries
+    - label: Full-text
+      url: https://www.elastic.co/docs/reference/query-languages/query-dsl/full-text-queries
+    - label: Term-level
+      url: https://www.elastic.co/docs/reference/query-languages/query-dsl
     - label: Geo
-      url: /reference/query-dsl/geo-queries
-    - label: Vector
-      url: /reference/query-dsl/vector-queries
+      url: https://www.elastic.co/docs/reference/query-languages/query-dsl
+    - label: Shape
+      url: https://www.elastic.co/docs/reference/query-languages/query-dsl
+    - label: Joining
+      url: https://www.elastic.co/docs/reference/query-languages/query-dsl
+    - label: Span
+      url: https://www.elastic.co/docs/reference/query-languages/query-dsl
+:::
+
+:::{link-card}
+title: ES|QL
+link: https://www.elastic.co/docs/reference/query-languages/esql/esql-getting-started
+description: A pipe-based query language purpose-built for filtering, transforming, and analyzing data — usable from the API, Kibana Discover, or directly in search.
+links:
+  - label: Get started with ES|QL
+    url: https://www.elastic.co/docs/reference/query-languages/esql/esql-getting-started
+  - label: Syntax reference
+    url: https://www.elastic.co/docs/reference/query-languages/esql/esql-syntax-reference
+  - label: Commands
+    url: https://www.elastic.co/docs/reference/query-languages/esql/esql-commands
+  - label: ES|QL for search
+    url: https://www.elastic.co/docs/solutions/search/esql-for-search
+  - label: Cross-cluster ES|QL
+    url: https://www.elastic.co/docs/reference/query-languages/esql/esql-cross-clusters
+:::
+
+:::{link-card}
+title: Other query languages
+link: https://www.elastic.co/docs/reference/query-languages
+description: Use EQL for event sequences, SQL for familiar syntax, or Painless for custom scoring and scripted queries.
+links:
+  - label: EQL (Event Query Language)
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-eql-search
+  - label: SQL
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-sql-query
+  - label: Translate SQL to Query DSL
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-sql-translate
+  - label: Painless scripting
+    url: https://www.elastic.co/docs/explore-analyze/scripting/modules-scripting-painless
+:::
+::::
+
+::::{card-group}
+:title: Aggregations
+:id: aggs
+
+:::{link-card}
+title: Aggregations overview
+link: https://www.elastic.co/docs/explore-analyze/query-filter/aggregations
+description: Summarize and compute statistics over your data — counts, averages, histograms, date ranges, and more.
+links:
+  - label: Introduction
+    url: https://www.elastic.co/docs/explore-analyze/query-filter/aggregations
+  - label: 'Tutorial: eCommerce data analysis'
+    url: https://www.elastic.co/docs/explore-analyze/query-filter/aggregations/tutorial-analyze-ecommerce-data-with-aggregations-using-query-dsl
+aside:
+  label: Aggregation families
+  links:
+    - label: Metric
+      url: https://www.elastic.co/docs/reference/aggregations
+    - label: Bucket
+      url: https://www.elastic.co/docs/reference/aggregations
+    - label: Pipeline
+      url: https://www.elastic.co/docs/reference/aggregations
+    - label: Matrix
+      url: https://www.elastic.co/docs/reference/aggregations
 :::
 
 :::{link-card}
-title: Vector search
-link: /solutions/search/vector
-description: Dense and sparse vector retrieval for AI applications and semantic search.
+title: Metric aggregations
+link: https://www.elastic.co/docs/reference/aggregations
+description: Compute single numeric values from field data — min, max, avg, sum, percentiles, stats, and more.
+links:
+  - label: Top hits
+    url: https://www.elastic.co/docs/reference/aggregations/search-aggregations-metrics-top-hits-aggregation
+  - label: Top metrics
+    url: https://www.elastic.co/docs/reference/aggregations/search-aggregations-metrics-top-metrics
+  - label: Cardinality, percentiles, stats
+    url: https://www.elastic.co/docs/reference/aggregations
+:::
+
+:::{link-card}
+title: Bucket and pipeline aggregations
+link: https://www.elastic.co/docs/reference/aggregations
+description: Group documents into buckets, then chain pipeline aggregations to compute on those buckets.
+links:
+  - label: Filters aggregation
+    url: https://www.elastic.co/docs/reference/aggregations/search-aggregations-bucket-filters-aggregation
+  - label: Multi-terms aggregation
+    url: https://www.elastic.co/docs/reference/aggregations/search-aggregations-bucket-multi-terms-aggregation
+  - label: Avg bucket (pipeline)
+    url: https://www.elastic.co/docs/reference/aggregations/search-aggregations-pipeline-avg-bucket-aggregation
+  - label: Bucket script (pipeline)
+    url: https://www.elastic.co/docs/reference/aggregations/search-aggregations-pipeline-bucket-script-aggregation
+:::
+::::
+
+::::{card-group}
+:title: Data modeling
+:id: modeling
+
+:::{link-card}
+title: Mapping
+link: https://www.elastic.co/docs/reference/elasticsearch/mapping-reference
+description: Define how documents and their fields are stored, indexed, and analyzed.
+links:
+  - label: Field data types
+    url: https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/field-data-types
+  - label: Dynamic field mapping
+    url: https://www.elastic.co/docs/manage-data/data-store/mapping/dynamic-field-mapping
+  - label: Runtime fields
+    url: https://www.elastic.co/docs/manage-data/data-store/mapping/define-runtime-fields-in-search-request
+  - label: Update mappings (examples)
+    url: https://www.elastic.co/docs/manage-data/data-store/mapping/update-mappings-examples
+  - label: Put mapping API
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-put-mapping
+aside:
+  label: Common field types
+  links:
+    - label: keyword
+      url: https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/field-data-types
+    - label: text
+      url: https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/field-data-types
+    - label: date
+      url: https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/field-data-types
+    - label: dense_vector
+      url: https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/field-data-types
+    - label: semantic_text
+      url: https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/field-data-types
+    - label: geo_point
+      url: https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/field-data-types
+:::
+
+:::{link-card}
+title: Text analysis
+link: https://www.elastic.co/docs/manage-data/data-store/text-analysis/configure-text-analysis
+description: Control how text is tokenized and indexed to optimize relevance and search recall.
+links:
+  - label: Configure text analysis
+    url: https://www.elastic.co/docs/manage-data/data-store/text-analysis/configure-text-analysis
+  - label: Create a custom analyzer
+    url: https://www.elastic.co/docs/manage-data/data-store/text-analysis/create-custom-analyzer
+  - label: Specify an analyzer
+    url: https://www.elastic.co/docs/manage-data/data-store/text-analysis/specify-an-analyzer
+  - label: Analyze API
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-analyze
+  - label: Analyzers, tokenizers, and filters reference
+    url: https://www.elastic.co/docs/reference/text-analysis
+:::
+
+:::{link-card}
+title: Configuration reference
+link: https://www.elastic.co/docs/reference/elasticsearch/configuration-reference
+description: All Elasticsearch node settings — network, thread pools, index defaults, security, and more.
+links:
+  - label: Node settings
+    url: https://www.elastic.co/docs/reference/elasticsearch/configuration-reference/node-settings
+  - label: Security settings
+    url: https://www.elastic.co/docs/reference/elasticsearch/configuration-reference/security-settings
+  - label: All settings reference
+    url: https://www.elastic.co/docs/reference/elasticsearch/configuration-reference
+:::
+::::
+
+::::{card-group}
+:title: Manage data
+:id: manage
+
+:::{link-card}
+title: Index lifecycle management (ILM)
+link: https://www.elastic.co/docs/manage-data/lifecycle/index-lifecycle-management
+description: Automate index policies to move data through hot, warm, cold, and frozen tiers — and eventually delete it.
+links:
+  - label: Create an ILM policy
+    url: https://www.elastic.co/docs/manage-data/lifecycle/index-lifecycle-management/configure-lifecycle-policy
+  - label: Tutorials
+    url: https://www.elastic.co/docs/manage-data/lifecycle/index-lifecycle-management/ilm-tutorials
+  - label: Check ILM status
+    url: https://www.elastic.co/docs/manage-data/lifecycle/index-lifecycle-management/policy-view-status
+  - label: Start and stop ILM
+    url: https://www.elastic.co/docs/manage-data/lifecycle/index-lifecycle-management/start-stop-index-lifecycle-management
+  - label: Explain lifecycle (API)
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-explain-lifecycle
+:::
+
+:::{link-card}
+title: Data stream lifecycle
+link: https://www.elastic.co/docs/manage-data/lifecycle/data-stream
+description: Set built-in retention and rollover directly on data streams, without a separate ILM policy.
+links:
+  - label: Data stream lifecycle overview
+    url: https://www.elastic.co/docs/manage-data/lifecycle/data-stream
+  - label: Update an existing data stream
+    url: https://www.elastic.co/docs/manage-data/lifecycle/data-stream/tutorial-update-existing-data-stream
+  - label: Manage data tiers
+    url: https://www.elastic.co/docs/manage-data/lifecycle/data-tiers/manage-data-tiers-self-managed-eck
+:::
+
+:::{link-card}
+title: Snapshot and restore
+link: https://www.elastic.co/docs/deploy-manage/tools/snapshot-and-restore
+description: Back up indices and data streams to a remote repository and restore them when needed.
+links:
+  - label: Overview
+    url: https://www.elastic.co/docs/deploy-manage/tools/snapshot-and-restore
+  - label: Restore a snapshot
+    url: https://www.elastic.co/docs/deploy-manage/tools/snapshot-and-restore/restore-snapshot
+  - label: Create a snapshot repository (API)
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-create-repository
+  - label: Create a snapshot (API)
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-create
+  - label: Troubleshoot snapshots
+    url: https://www.elastic.co/docs/troubleshoot/elasticsearch/snapshot-and-restore
+:::
+::::
+
+::::{card-group}
+:title: AI and vector search
+:id: ai
+
+:::{link-card}
+title: Semantic search
+link: https://www.elastic.co/docs/solutions/search/semantic-search/semantic-search-semantic-text
+description: Search by meaning rather than exact keywords using dense or sparse vector embeddings.
+links:
+  - label: Semantic search with semantic_text
+    url: https://www.elastic.co/docs/solutions/search/semantic-search/semantic-search-semantic-text
+  - label: Semantic search with ELSER
+    url: https://www.elastic.co/docs/solutions/search/semantic-search/semantic-search-elser-ingest-pipelines
+  - label: Get started with semantic search
+    url: https://www.elastic.co/docs/solutions/search/get-started/semantic-search
+  - label: Dense vs. sparse ingest pipelines
+    url: https://www.elastic.co/docs/solutions/search/vector/dense-versus-sparse-ingest-pipelines
+:::
+
+:::{link-card}
+title: Vector search (kNN)
+link: https://www.elastic.co/docs/solutions/search/vector/knn
+description: Find the nearest neighbors to a query vector for similarity-based retrieval and hybrid search.
 links:
   - label: kNN search
-    url: /reference/search-types/knn-search
-  - label: ELSER
-    url: /reference/elasticsearch-clients/elser
+    url: https://www.elastic.co/docs/solutions/search/vector/knn
+  - label: Sparse vector search
+    url: https://www.elastic.co/docs/solutions/search/vector/sparse-vector
+  - label: Bring your own vectors
+    url: https://www.elastic.co/docs/solutions/search/vector/bring-own-vectors
+  - label: kNN retriever
+    url: https://www.elastic.co/docs/reference/elasticsearch/rest-apis/retrievers/knn-retriever
+  - label: kNN in ES|QL
+    url: https://www.elastic.co/docs/reference/query-languages/esql/functions-operators/dense-vector-functions/knn
+:::
+
+:::{link-card}
+title: Inference API
+link: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put
+description: Connect Elasticsearch to external AI model providers for embeddings, reranking, and completions.
+links:
+  - label: Create an inference endpoint
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put
+  - label: ELSER inference endpoint
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-elser
+aside:
+  label: Supported providers
+  links:
+    - label: OpenAI
+      url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put
+    - label: Cohere
+      url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put
+    - label: Anthropic
+      url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put
+    - label: Azure
+      url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put
+    - label: Google
+      url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put
+    - label: Hugging Face
+      url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put
+    - label: Mistral
+      url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put
+:::
+::::
+
+::::{card-group}
+:title: Security
+:id: security
+
+:::{link-card}
+title: Encryption and TLS
+link: https://www.elastic.co/docs/deploy-manage/security/secure-cluster-communications
+description: Encrypt communications between nodes and between clients and the cluster.
+links:
+  - label: Set up basic security (TLS)
+    url: https://www.elastic.co/docs/deploy-manage/security/set-up-basic-security
+  - label: Secure cluster communications
+    url: https://www.elastic.co/docs/deploy-manage/security/secure-cluster-communications
+  - label: Secure HTTP clients
+    url: https://www.elastic.co/docs/deploy-manage/security/httprest-clients-security
+  - label: Security settings reference
+    url: https://www.elastic.co/docs/reference/elasticsearch/configuration-reference/security-settings
+:::
+
+:::{link-card}
+title: Authentication
+link: https://www.elastic.co/docs/deploy-manage/users-roles/cluster-or-deployment-auth/ldap
+description: Verify user identity with native realms, LDAP, Active Directory, SAML, OIDC, PKI, and more.
+links:
+  - label: LDAP authentication
+    url: https://www.elastic.co/docs/deploy-manage/users-roles/cluster-or-deployment-auth/ldap
+  - label: SAML authentication (API)
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-saml-authenticate
+  - label: All authentication methods
+    url: https://www.elastic.co/docs/deploy-manage/users-roles/cluster-or-deployment-auth
+:::
+
+:::{link-card}
+title: Authorization and RBAC
+link: https://www.elastic.co/docs/deploy-manage/users-roles
+description: Control what users and applications can access using roles, privileges, and field- and document-level security.
+links:
+  - label: Users and roles overview
+    url: https://www.elastic.co/docs/deploy-manage/users-roles
+  - label: Create or update a role (API)
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-put-role
+  - label: Create or update a user (API)
+    url: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-put-user
+:::
+::::
+
+::::{card-group}
+:title: Clients and integrations
+:id: clients
+
+:::{link-card}
+title: Language clients
+link: https://www.elastic.co/docs/reference/elasticsearch/clients
+description: Official Elasticsearch clients for your preferred programming language.
+links:
+  - label: Python
+    url: https://www.elastic.co/docs/reference/elasticsearch/clients/python
+  - label: Java
+    url: https://www.elastic.co/docs/reference/elasticsearch/clients/java/getting-started
+  - label: Go
+    url: https://www.elastic.co/docs/reference/elasticsearch/clients/go/using-the-api/dense-vectors
+  - label: Rust
+    url: https://www.elastic.co/docs/reference/elasticsearch/clients/rust
+  - label: PHP
+    url: https://www.elastic.co/docs/reference/elasticsearch/clients/php
+  - label: Ruby
+    url: https://www.elastic.co/docs/reference/elasticsearch/clients/ruby/api
+  - label: Community clients
+    url: https://www.elastic.co/docs/reference/elasticsearch/clients/community
+:::
+
+:::{link-card}
+title: Python DSL and helpers
+link: https://www.elastic.co/docs/reference/elasticsearch/clients/python/elasticsearch-dsl
+description: High-level Python libraries that simplify building queries, mappings, and bulk operations.
+links:
+  - label: Elasticsearch DSL (Python)
+    url: https://www.elastic.co/docs/reference/elasticsearch/clients/python/elasticsearch-dsl
+  - label: Java bulk indexing
+    url: https://www.elastic.co/docs/reference/elasticsearch/clients/java/usage/indexing-bulk
+  - label: Troubleshoot clients
+    url: https://www.elastic.co/docs/troubleshoot/elasticsearch/clients
+:::
+
+:::{link-card}
+title: Ingest tools
+link: https://www.elastic.co/docs/manage-data/ingest
+description: Get data into Elasticsearch using Fleet, Logstash, Beats, or search connectors.
+links:
+  - label: Fleet and Elastic Agent
+    url: https://www.elastic.co/docs/reference/fleet
+  - label: Content connectors
+    url: https://www.elastic.co/docs/reference/search-connectors
+  - label: All ingest options
+    url: https://www.elastic.co/docs/manage-data/ingest
+:::
+::::
+
+::::{card-group}
+:title: Reference
+:id: ref
+
+:::{link-card}
+title: REST APIs
+link: https://www.elastic.co/docs/reference/elasticsearch/rest-apis
+description: Conventions, common options, compatibility guarantees, and the full interactive API specification.
+links:
+  - label: API conventions
+    url: https://www.elastic.co/docs/reference/elasticsearch/rest-apis/api-conventions
+  - label: Common options
+    url: https://www.elastic.co/docs/reference/elasticsearch/rest-apis/common-options
+  - label: API compatibility
+    url: https://www.elastic.co/docs/reference/elasticsearch/rest-apis/compatibility
+  - label: Examples and quick start
+    url: https://www.elastic.co/docs/reference/elasticsearch/rest-apis/api-examples
+  - label: Full API reference
+    url: https://www.elastic.co/docs/api/doc/elasticsearch
+:::
+
+:::{link-card}
+title: Painless scripting
+link: https://www.elastic.co/docs/explore-analyze/scripting/modules-scripting-painless
+description: Write custom scripts in Painless for queries, aggregations, ingest processors, and runtime fields.
+links:
+  - label: Introduction to Painless
+    url: https://www.elastic.co/docs/explore-analyze/scripting/modules-scripting-painless
+  - label: Language specification
+    url: https://www.elastic.co/docs/reference/scripting-languages/painless/painless-language-specification
+  - label: Use Painless in runtime fields
+    url: https://www.elastic.co/docs/reference/scripting-languages/painless/use-painless-scripts-in-runtime-fields
+  - label: Scripts reference
+    url: https://www.elastic.co/docs/reference/scripting-languages/painless/painless-scripts
+:::
+
+:::{link-card}
+title: Release notes
+link: https://www.elastic.co/docs/release-notes/elasticsearch
+description: What's new, deprecated, and fixed in each Elasticsearch release.
+links:
+  - label: Elasticsearch
+    url: https://www.elastic.co/docs/release-notes/elasticsearch
+  - label: Breaking changes
+    url: https://www.elastic.co/docs/release-notes/elasticsearch/breaking-changes
+  - label: Deprecations
+    url: https://www.elastic.co/docs/release-notes/elasticsearch/deprecations
+aside:
+  label: Client release notes
+  links:
+    - label: Python
+      url: https://www.elastic.co/docs/release-notes/elasticsearch/clients/python
+    - label: Java
+      url: https://www.elastic.co/docs/release-notes/elasticsearch/clients/java
+    - label: .NET
+      url: https://www.elastic.co/docs/release-notes/elasticsearch/clients/dotnet
+    - label: PHP
+      url: https://www.elastic.co/docs/release-notes/elasticsearch/clients/php
+    - label: Ruby
+      url: https://www.elastic.co/docs/release-notes/elasticsearch/clients/ruby
+:::
+
+:::{link-card}
+title: Troubleshooting
+link: https://www.elastic.co/docs/troubleshoot/elasticsearch
+description: Diagnose and fix common Elasticsearch cluster, performance, and operational issues.
+links:
+  - label: Cluster issues
+    url: https://www.elastic.co/docs/troubleshoot/elasticsearch/clusters
+  - label: Snapshot and restore
+    url: https://www.elastic.co/docs/troubleshoot/elasticsearch/snapshot-and-restore
+  - label: Clients
+    url: https://www.elastic.co/docs/troubleshoot/elasticsearch/clients
+  - label: Capture diagnostics
+    url: https://www.elastic.co/docs/troubleshoot/elasticsearch/diagnostic
 :::
 ::::
diff --git a/docs/hubs/kibana/9.0.md b/docs/hubs/kibana/9.0.md
index 11ee62040c..4c703b0eb8 100644
--- a/docs/hubs/kibana/9.0.md
+++ b/docs/hubs/kibana/9.0.md
@@ -192,6 +192,98 @@ aside:
 :::
 ::::
 
+::::{card-group}
+:title: Track and respond
+:id: track
+
+:::{link-card}
+title: Alerting and rules
+link: https://www.elastic.co/docs/explore-analyze/alerting/alerts/alerting-getting-started
+description: Detect important changes and notify people or trigger actions.
+links:
+  - label: Getting started
+    url: https://www.elastic.co/docs/explore-analyze/alerting/alerts/alerting-getting-started
+  - label: Create and manage rules
+    url: https://www.elastic.co/docs/explore-analyze/alerting/alerts/create-manage-rules
+  - label: Performance and scaling
+    url: https://www.elastic.co/docs/deploy-manage/production-guidance/kibana-alerting-production-considerations
+:::
+
+:::{link-card}
+title: Connectors
+link: https://www.elastic.co/docs/reference/kibana/connectors-kibana
+description: Integrate Kibana with external services for AI, notifications, and case management.
+links:
+  - label: GenAI (OpenAI, Bedrock, Gemini...)
+    url: https://www.elastic.co/docs/reference/kibana/connectors-kibana/gen-ai-connectors
+  - label: Alerting & cases (Jira, ServiceNow, PagerDuty...)
+    url: https://www.elastic.co/docs/reference/kibana/connectors-kibana/alerting-cases-connectors
+  - label: Elastic Stack
+    url: https://www.elastic.co/docs/reference/kibana/connectors-kibana
+  - label: Data & context sources
+    url: https://www.elastic.co/docs/reference/kibana/connectors-kibana
+:::
+
+:::{link-card}
+title: Reporting and sharing
+link: https://www.elastic.co/docs/deploy-manage/kibana-reporting-configuration
+description: Generate PDF, PNG, and CSV exports. Share dashboards with links or embeds.
+links:
+  - label: Configure reporting
+    url: https://www.elastic.co/docs/deploy-manage/kibana-reporting-configuration
+  - label: Share dashboards
+    url: https://www.elastic.co/docs/explore-analyze/dashboards/sharing
+  - label: Saved objects
+    url: https://www.elastic.co/docs/explore-analyze/find-and-organize/saved-objects
+:::
+::::
+
+::::{card-group}
+:title: AI and automation
+:id: ai
+
+:::{link-card}
+title: Agent Builder
+link: https://www.elastic.co/docs/explore-analyze/ai-features/elastic-agent-builder
+description: Build custom AI agents that reason over your Elasticsearch data using LLMs and tools.
+links:
+  - label: Overview
+    url: https://www.elastic.co/docs/explore-analyze/ai-features/elastic-agent-builder
+  - label: Agents
+    url: https://www.elastic.co/docs/explore-analyze/ai-features/agent-builder/agent-builder-agents
+  - label: Custom tools
+    url: https://www.elastic.co/docs/explore-analyze/ai-features/agent-builder/tools/custom-tools
+  - label: Programmatic access (MCP, A2A, API)
+    url: https://www.elastic.co/docs/explore-analyze/ai-features/agent-builder/programmatic-access
+  - label: 'Tutorial: build a custom agent'
+    url: https://www.elastic.co/docs/explore-analyze/ai-features/agent-builder/agent-builder-api-tutorial
+:::
+
+:::{link-card}
+title: Workflows
+link: https://www.elastic.co/docs/explore-analyze/workflows
+description: Automate tasks with sequences that chain Kibana actions, HTTP calls, and AI agents.
+links:
+  - label: Get started
+    url: https://www.elastic.co/docs/explore-analyze/workflows/get-started
+  - label: Kibana action steps
+    url: https://www.elastic.co/docs/explore-analyze/workflows/steps/kibana
+  - label: Call agents from workflows
+    url: https://www.elastic.co/docs/explore-analyze/ai-features/agent-builder/agents-and-workflows
+:::
+
+:::{link-card}
+title: Machine learning
+link: https://www.elastic.co/docs/explore-analyze/machine-learning/machine-learning-in-kibana
+description: Detect anomalies, forecast trends, and run data frame analytics.
+links:
+  - label: Machine learning in Kibana
+    url: https://www.elastic.co/docs/explore-analyze/machine-learning/machine-learning-in-kibana
+  - label: Anomaly detection job wizards
+    url: https://www.elastic.co/docs/reference/machine-learning/supplied-anomaly-detection-configurations
+:::
+::::
+
 ::::{card-group}
 :title: Solutions
 :id: solutions
@@ -278,3 +370,128 @@ aside:
       url: /solutions/security/investigate/security-cases
 :::
 ::::
+
+::::{card-group}
+:title: Management and developer tools
+:id: manage
+
+:::{link-card}
+title: Data and indices
+description: Manage Elasticsearch indices, data streams, ingest pipelines, and transforms from Kibana.
+links:
+  - label: Index management
+    url: https://www.elastic.co/docs/manage-data/lifecycle/index-lifecycle-management/index-management-in-kibana
+  - label: Data streams
+    url: https://www.elastic.co/docs/manage-data/data-store/data-streams/manage-data-stream
+  - label: Transforms
+    url: https://www.elastic.co/docs/explore-analyze/transforms/transform-setup
+  - label: Task management
+    url: https://www.elastic.co/docs/deploy-manage/distributed-architecture/kibana-tasks-management
+:::
+
+:::{link-card}
+title: Integrations and Fleet
+description: Deploy and manage Elastic Agents, integrations, and Osquery.
+links:
+  - label: Fleet
+    url: https://www.elastic.co/docs/reference/fleet
+  - label: Manage agents
+    url: https://www.elastic.co/docs/reference/fleet/manage-elastic-agents-in-fleet
+  - label: Agent policies
+    url: https://www.elastic.co/docs/reference/fleet/agent-policy
+:::
+
+:::{link-card}
+title: Developer tools
+description: Run API requests, profile queries, test grok patterns, and debug Painless scripts.
+links:
+  - label: Console
+    url: https://www.elastic.co/docs/reference/cloud/cloud-hosted/ec-api-console
+  - label: Search Profiler
+    url: https://www.elastic.co/docs/explore-analyze/query-filter/tools/search-profiler
+  - label: Grok Debugger
+    url: https://www.elastic.co/docs/explore-analyze/query-filter/tools/grok-debugger
+:::
+::::
+
+::::{card-group}
+:title: Reference
+:id: ref
+
+:::{link-card}
+title: Configuration and settings
+link: https://www.elastic.co/docs/reference/kibana/configuration-reference
+description: All kibana.yml settings and UI-configurable advanced settings.
+links:
+  - label: General
+    url: https://www.elastic.co/docs/reference/kibana/configuration-reference/general-settings
+  - label: Alerting
+    url: https://www.elastic.co/docs/reference/kibana/configuration-reference/alerting-settings
+  - label: Security
+    url: https://www.elastic.co/docs/reference/kibana/configuration-reference/security-settings
+  - label: Reporting
+    url: https://www.elastic.co/docs/reference/kibana/configuration-reference/reporting-settings
+  - label: Monitoring
+    url: https://www.elastic.co/docs/reference/kibana/configuration-reference/monitoring-settings
+  - label: Advanced settings (UI)
+    url: https://www.elastic.co/docs/reference/kibana/advanced-settings
+:::
+
+:::{link-card}
+title: APIs and plugins
+link: https://www.elastic.co/docs/api/doc/kibana
+description: REST API, plugins, and CLI commands.
+links:
+  - label: Kibana REST API
+    url: https://www.elastic.co/docs/api/doc/kibana
+  - label: Kibana serverless API
+    url: https://www.elastic.co/docs/api/doc/serverless-kibana
+  - label: Plugins
+    url: https://www.elastic.co/docs/reference/kibana/kibana-plugins
+  - label: kibana-setup command
+    url: https://www.elastic.co/docs/reference/kibana/commands/kibana-setup
+:::
+
+:::{link-card}
+title: Release notes
+link: https://www.elastic.co/docs/release-notes/kibana
+description: What's new, deprecated, and fixed in each Kibana release.
+links:
+  - label: Kibana
+    url: https://www.elastic.co/docs/release-notes/kibana
+  - label: Known issues
+    url: https://www.elastic.co/docs/release-notes/kibana/known-issues
+  - label: Breaking changes
+    url: https://www.elastic.co/docs/release-notes/kibana/breaking-changes
+  - label: Deprecations
+    url: https://www.elastic.co/docs/release-notes/kibana/deprecations
+aside:
+  label: Related release notes
+  links:
+    - label: Elasticsearch
+      url: https://www.elastic.co/docs/release-notes/elasticsearch
+    - label: Security
+      url: https://www.elastic.co/docs/release-notes/security
+    - label: Observability
+      url: https://www.elastic.co/docs/release-notes/observability
+    - label: Serverless
+      url: https://www.elastic.co/docs/release-notes/serverless
+:::
+
+:::{link-card}
+title: Troubleshooting
+link: https://www.elastic.co/docs/troubleshoot/kibana
+description: Diagnose and fix common Kibana issues.
+links:
+  - label: General
+    url: https://www.elastic.co/docs/troubleshoot/kibana
+  - label: Alerts
+    url: https://www.elastic.co/docs/troubleshoot/kibana/alerts
+  - label: Maps
+    url: https://www.elastic.co/docs/troubleshoot/kibana/maps
+  - label: Reporting
+    url: https://www.elastic.co/docs/troubleshoot/kibana/reporting
+  - label: Capture diagnostics
+    url: https://www.elastic.co/docs/troubleshoot/kibana/capturing-diagnostics
+:::
+::::

From 7cc21db461fb9cdc7c7a2d5e0fcdbfafeb1902df Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 21:27:51 +0200
Subject: [PATCH 095/226] feat(hubs): render fake search box in hero

Replaces the inert navigation-search web component placeholder with a
styled fake search box that matches the gist prototypes (white pill
with magnifying-glass icon, contextual placeholder, disabled input).
The input is disabled until search is wired up, but visually it's now
indistinguishable from the gist.

Placeholder text uses the hero :icon: key (e.g. 'Search Kibana docs...').

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Assets/markdown/hub.css                   | 27 +++++++++++++++++++
 .../Myst/Directives/Hub/HeroView.cshtml       | 10 ++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/Elastic.Documentation.Site/Assets/markdown/hub.css b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
index bf2f300672..b559711f75 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/hub.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
@@ -82,6 +82,33 @@
 		margin-bottom: 20px;
 		max-width: 480px;
 	}
+	.hub-hero .hub-hero-search-box {
+		display: flex;
+		align-items: center;
+		gap: 10px;
+		background: var(--color-white);
+		border-radius: 10px;
+		padding: 10px 16px;
+		box-shadow: 0 2px 12px rgb(0 0 0 / 0.15);
+		color: var(--color-grey-80);
+		cursor: text;
+	}
+	.hub-hero .hub-hero-search-icon {
+		flex-shrink: 0;
+	}
+	.hub-hero .hub-hero-search-box input {
+		flex: 1;
+		border: none;
+		outline: none;
+		background: transparent;
+		font-size: 15px;
+		font-family: inherit;
+		color: var(--color-ink-dark);
+		min-width: 0;
+	}
+	.hub-hero .hub-hero-search-box input::placeholder {
+		color: var(--color-grey-40);
+	}
 
 	.hub-hero .hub-hero-meta {
 		@apply mt-2 flex flex-wrap items-center gap-3;
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
index d124143244..8206116af4 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
@@ -20,8 +20,16 @@
 
 		@if (Model.ShowSearch)
 		{
+			var placeholder = string.IsNullOrWhiteSpace(Model.IconKey)
+				? "Search docs..."
+				: $"Search {char.ToUpperInvariant(Model.IconKey![0])}{Model.IconKey.AsSpan(1).ToString()} docs...";
 			<div class="hub-hero-search">
-				<navigation-search></navigation-search>
+				<label class="hub-hero-search-box">
+					<svg class="hub-hero-search-icon" width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true">
+						<path d="M11.271 11.978l3.872 3.873a.502.502 0 00.708-.708l-3.565-3.564c2.38-2.747 2.267-6.923-.342-9.532-2.73-2.73-7.17-2.73-9.898 0-2.728 2.729-2.728 7.17 0 9.9a6.955 6.955 0 004.949 2.05 6.99 6.99 0 004.276-1.5v-.519zM2.752 11.24c-2.342-2.342-2.342-6.152 0-8.494 2.343-2.343 6.152-2.343 8.494 0 2.343 2.342 2.343 6.152 0 8.494-2.342 2.342-6.151 2.342-8.494 0z" fill="currentColor"/>
+					</svg>
+					<input type="text" placeholder="@placeholder" autocomplete="off" aria-label="@placeholder" disabled />
+				</label>
 			</div>
 		}
 

From 91795999e9ddaf218113d3b540b09bb7c117c9dc Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 21:31:27 +0200
Subject: [PATCH 096/226] fix(hubs): align hero icon with H1, push description
 to its own row

Switches .hub-hero-top from flex to a 2-col grid and uses
display:contents on .hub-hero-title so its children become direct grid
items. The icon vertically centers with the H1 (row 1), and the
description spans both columns in row 2 -- matching the gist layout
where the description starts at the left edge below the icon row, not
hanging-indented next to the H1.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Assets/markdown/hub.css                   | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/markdown/hub.css b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
index b559711f75..82e6726a12 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/hub.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
@@ -41,7 +41,24 @@
 		@apply mx-auto w-full max-w-5xl;
 	}
 	.hub-hero .hub-hero-top {
-		@apply mb-3 flex items-center gap-4;
+		display: grid;
+		grid-template-columns: auto 1fr;
+		column-gap: 16px;
+		align-items: center;
+		margin-bottom: 12px;
+	}
+	.hub-hero .hub-hero-title {
+		display: contents;
+	}
+	.hub-hero .hub-hero-title .heading-wrapper {
+		grid-column: 2;
+		grid-row: 1;
+		margin: 0;
+	}
+	.hub-hero .hub-hero-title p {
+		grid-column: 1 / -1;
+		grid-row: 2;
+		margin-top: 16px;
 	}
 	.hub-hero .hub-hero-icon {
 		@apply inline-flex h-13 w-13 shrink-0 items-center justify-center rounded-xl text-2xl font-bold;
@@ -74,7 +91,6 @@
 		color: rgb(255 255 255 / 0.7);
 		max-width: 720px;
 		line-height: 1.6;
-		margin-top: 12px;
 	}
 
 	.hub-hero .hub-hero-search {

From 7940d99c608b2ae0e4acfb22a81afb4643c0ed02 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 21:36:02 +0200
Subject: [PATCH 097/226] feat(hubs): turn hero version pill into a real
 dropdown

Adds a :versions: option to {hero} taking comma-separated 'Label[=URL]'
entries. When non-empty, the version chip renders as a <details>
dropdown -- click to reveal a menu listing the current version (with a
checkmark) plus each entry. Entries with a URL are clickable links;
entries without a URL render as greyed-out 'soon' rows.

ES 9.4 / Kibana 9.4 hubs are wired with v8 and v7 as disabled entries
so reviewers can see the dropdown shape without yet-built hub pages.

Also bumps Elasticsearch examples to 9.4 and adds a Serverless
release-notes link in the What's new header (matching the Kibana hub).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docs/hubs/elasticsearch/9.0.md                |  17 ++-
 docs/hubs/kibana/9.0.md                       |   1 +
 .../Assets/markdown/hub.css                   | 131 ++++++++++++++++++
 .../Myst/Directives/DirectiveHtmlRenderer.cs  |   1 +
 .../Myst/Directives/Hub/HeroBlock.cs          |  41 ++++--
 .../Myst/Directives/Hub/HeroView.cshtml       |  41 +++++-
 .../Myst/Directives/Hub/HeroViewModel.cs      |   1 +
 7 files changed, 212 insertions(+), 21 deletions(-)

diff --git a/docs/hubs/elasticsearch/9.0.md b/docs/hubs/elasticsearch/9.0.md
index 6ef52436c4..4c03a55cdf 100644
--- a/docs/hubs/elasticsearch/9.0.md
+++ b/docs/hubs/elasticsearch/9.0.md
@@ -4,9 +4,10 @@ layout: hub
 
 :::{hero}
 :icon: elasticsearch
-:version: v9 (current)
+:version: v9 / Serverless (current)
+:versions: v8,v7
 :quick-links: Install=https://www.elastic.co/docs/deploy-manage/deploy/self-managed/installing-elasticsearch,Quick start=https://www.elastic.co/docs/reference/elasticsearch/rest-apis/api-examples,API reference=https://www.elastic.co/docs/api/doc/elasticsearch,Release notes=https://www.elastic.co/docs/release-notes/elasticsearch
-:releases: Latest&#58; [Stack 9.0.0](https://www.elastic.co/docs/release-notes/elasticsearch) (Apr 2025)
+:releases: Latest&#58; [Stack 9.4.1](https://www.elastic.co/docs/release-notes/elasticsearch) (Mar 28, 2026) · [Serverless deployed](https://www.elastic.co/docs/release-notes/serverless) Apr 1, 2026
 
 # Elasticsearch
 
@@ -24,22 +25,24 @@ The distributed search and analytics engine. Store, search, and analyze data at
 title: What's new in Elasticsearch
 id: whats-new
 release-links:
-  - label: 9.0
+  - label: '9.4'
     url: https://www.elastic.co/docs/release-notes/elasticsearch
+  - label: Serverless
+    url: https://www.elastic.co/docs/release-notes/serverless
 items:
   - title: semantic_text field type
     description: Simplify semantic search — no pipeline setup needed, just define the field and start querying
     link: https://www.elastic.co/docs/solutions/search/semantic-search/semantic-search-semantic-text
-    meta: 9.0 GA
+    meta: 9.4 GA
   - title: ES|QL improvements
     description: New functions, cross-cluster support, and dense vector operations directly in ES|QL queries
     link: https://www.elastic.co/docs/reference/query-languages/esql/esql-getting-started
-    meta: '9.0'
+    meta: '9.4'
   - title: Inference API expansion
     description: Connect to external AI models (OpenAI, Cohere, Anthropic, Hugging Face, Azure, Google) for embeddings and reranking
     link: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put
-    meta: '9.0'
-  - title: Breaking changes in 9.0
+    meta: '9.4'
+  - title: Breaking changes in 9.x
     description: Review removed settings, deprecated APIs, and behavioral changes before upgrading from 8.x
     link: https://www.elastic.co/docs/release-notes/elasticsearch/breaking-changes
     meta: Upgrade guide
diff --git a/docs/hubs/kibana/9.0.md b/docs/hubs/kibana/9.0.md
index 4c703b0eb8..9c9f84ff18 100644
--- a/docs/hubs/kibana/9.0.md
+++ b/docs/hubs/kibana/9.0.md
@@ -5,6 +5,7 @@ layout: hub
 :::{hero}
 :icon: kibana
 :version: v9 / Serverless (current)
+:versions: v8,v7
 :quick-links: Install=/install,Tutorial=/tutorial,API reference=/api,Release notes=/release-notes
 :releases: Latest&#58; [Stack 9.4.1](/release-notes/kibana) (Mar 28, 2026) · [Serverless deployed](/release-notes/serverless) Apr 1, 2026
 
diff --git a/src/Elastic.Documentation.Site/Assets/markdown/hub.css b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
index 82e6726a12..607b3117df 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/hub.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
@@ -149,6 +149,137 @@
 		background: #9adc30;
 	}
 
+	/* Version dropdown ------------------------------------------------- */
+	.hub-hero details.hub-hero-version-dropdown {
+		position: relative;
+		display: inline-block;
+		padding: 0;
+		border: 0;
+		background: transparent;
+	}
+	.hub-hero details.hub-hero-version-dropdown summary {
+		display: inline-flex;
+		align-items: center;
+		gap: 8px;
+		background: rgb(255 255 255 / 0.08);
+		border: 1px solid rgb(255 255 255 / 0.15);
+		border-radius: 20px;
+		padding: 5px 14px;
+		font-size: 13px;
+		color: rgb(255 255 255 / 0.85);
+		cursor: pointer;
+		list-style: none;
+		user-select: none;
+		transition: background 0.15s;
+	}
+	.hub-hero
+		details.hub-hero-version-dropdown
+		summary::-webkit-details-marker {
+		display: none;
+	}
+	.hub-hero details.hub-hero-version-dropdown summary:hover {
+		background: rgb(255 255 255 / 0.14);
+	}
+	.hub-hero .hub-hero-version-caret {
+		font-size: 10px;
+		opacity: 0.6;
+		transition: transform 0.15s;
+	}
+	.hub-hero details[open] .hub-hero-version-caret {
+		transform: rotate(180deg);
+	}
+
+	.hub-hero .hub-hero-version-menu {
+		position: absolute;
+		top: calc(100% + 6px);
+		left: 0;
+		min-width: 220px;
+		background: var(--color-white);
+		border: 1px solid var(--color-grey-20);
+		border-radius: 10px;
+		padding: 4px;
+		margin: 0;
+		list-style: none;
+		box-shadow: 0 8px 24px rgb(0 0 0 / 0.15);
+		font-size: 13px;
+		color: var(--color-ink-dark);
+		z-index: 20;
+	}
+	.hub-hero .hub-hero-version-menu li {
+		margin: 0;
+		padding: 0;
+		border-radius: 6px;
+	}
+	.hub-hero .hub-hero-version-menu li a,
+	.hub-hero
+		.hub-hero-version-menu
+		li
+		> span:not(.hub-hero-version-tick):not(.hub-hero-version-soon) {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 12px;
+		padding: 8px 12px;
+		text-decoration: none;
+		color: inherit;
+		white-space: nowrap;
+	}
+	.hub-hero
+		.hub-hero-version-menu
+		li
+		> span:not(.hub-hero-version-tick):not(.hub-hero-version-soon) {
+		display: flex;
+	}
+	.hub-hero .hub-hero-version-menu li {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 12px;
+		padding: 8px 12px;
+		white-space: nowrap;
+	}
+	.hub-hero .hub-hero-version-menu li a,
+	.hub-hero .hub-hero-version-menu li > span {
+		padding: 0;
+	}
+	.hub-hero
+		.hub-hero-version-menu
+		li:hover:not(.hub-hero-version-current):not(
+			.hub-hero-version-disabled
+		) {
+		background: var(--color-grey-10);
+	}
+	.hub-hero .hub-hero-version-menu li a {
+		color: inherit;
+		text-decoration: none;
+		flex: 1;
+	}
+	.hub-hero .hub-hero-version-menu li a:hover {
+		color: var(--color-blue-elastic-100);
+		text-decoration: none;
+	}
+	.hub-hero .hub-hero-version-current {
+		font-weight: 600;
+		color: var(--color-ink-dark);
+	}
+	.hub-hero .hub-hero-version-tick {
+		color: var(--color-blue-elastic-100);
+		font-weight: 700;
+	}
+	.hub-hero .hub-hero-version-disabled {
+		color: var(--color-grey-40);
+		cursor: not-allowed;
+	}
+	.hub-hero .hub-hero-version-soon {
+		font-size: 11px;
+		text-transform: uppercase;
+		letter-spacing: 0.5px;
+		color: var(--color-grey-40);
+		background: var(--color-grey-10);
+		padding: 2px 6px;
+		border-radius: 4px;
+	}
+
 	.hub-hero .hub-hero-pills {
 		@apply m-0 flex list-none flex-wrap gap-2 p-0;
 	}
diff --git a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
index 92db50c08d..3e234c9072 100644
--- a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
@@ -365,6 +365,7 @@ private static void WriteHero(HtmlRenderer renderer, HeroBlock block)
 			Version = block.Version,
 			ShowSearch = block.ShowSearch,
 			QuickLinks = block.QuickLinks,
+			OtherVersions = block.OtherVersions,
 			ReleasesHtml = releasesHtml
 		});
 		RenderRazorSlice(slice, renderer);
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
index 2797255c13..529f8d8f4a 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
@@ -33,6 +33,7 @@ public class HeroBlock(DirectiveBlockParser parser, ParserContext context)
 	public string? Version { get; private set; }
 	public bool ShowSearch { get; private set; }
 	public IReadOnlyList<HeroQuickLink> QuickLinks { get; private set; } = [];
+	public IReadOnlyList<HeroVersion> OtherVersions { get; private set; } = [];
 	public string? Releases { get; private set; }
 
 	public override void FinalizeAndValidate(ParserContext context)
@@ -42,26 +43,44 @@ public override void FinalizeAndValidate(ParserContext context)
 		Version = Prop("version");
 		// search defaults to true; explicit ":search: false" hides it
 		ShowSearch = TryPropBool("search") ?? true;
-		QuickLinks = ParseQuickLinks(Prop("quick-links"));
+		QuickLinks = ParsePairs(Prop("quick-links"), allowEmptyUrl: false)
+			.Select(p => new HeroQuickLink(p.Label, p.Url!)).ToList();
+		OtherVersions = ParsePairs(Prop("versions"), allowEmptyUrl: true)
+			.Select(p => new HeroVersion(p.Label, p.Url)).ToList();
 		Releases = Prop("releases");
 	}
 
-	private static IReadOnlyList<HeroQuickLink> ParseQuickLinks(string? raw)
+	private static IReadOnlyList<(string Label, string? Url)> ParsePairs(string? raw, bool allowEmptyUrl)
 	{
 		if (string.IsNullOrWhiteSpace(raw))
 			return [];
 
-		var entries = new List<HeroQuickLink>();
+		var entries = new List<(string, string?)>();
 		foreach (var part in raw.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
 		{
 			var separator = part.IndexOf('=');
-			if (separator <= 0 || separator == part.Length - 1)
-				continue;
-
-			var label = part[..separator].Trim();
-			var url = part[(separator + 1)..].Trim();
-			if (label.Length > 0 && url.Length > 0)
-				entries.Add(new HeroQuickLink(label, url));
+			string label;
+			string? url;
+			if (separator < 0)
+			{
+				if (!allowEmptyUrl)
+					continue;
+				label = part.Trim();
+				url = null;
+			}
+			else
+			{
+				label = part[..separator].Trim();
+				url = part[(separator + 1)..].Trim();
+				if (string.IsNullOrEmpty(url))
+				{
+					if (!allowEmptyUrl)
+						continue;
+					url = null;
+				}
+			}
+			if (label.Length > 0)
+				entries.Add((label, url));
 		}
 
 		return entries;
@@ -69,3 +88,5 @@ private static IReadOnlyList<HeroQuickLink> ParseQuickLinks(string? raw)
 }
 
 public readonly record struct HeroQuickLink(string Label, string Url);
+
+public readonly record struct HeroVersion(string Label, string? Url);
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
index 8206116af4..7190cfaa05 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
@@ -36,10 +36,43 @@
 		<div class="hub-hero-meta">
 			@if (!string.IsNullOrWhiteSpace(Model.Version))
 			{
-				<span class="hub-hero-version">
-					<span class="hub-hero-version-dot" aria-hidden="true"></span>
-					<span class="hub-hero-version-text">@Model.Version</span>
-				</span>
+				if (Model.OtherVersions.Count > 0)
+				{
+					<details class="hub-hero-version hub-hero-version-dropdown">
+						<summary>
+							<span class="hub-hero-version-dot" aria-hidden="true"></span>
+							<span class="hub-hero-version-text">@Model.Version</span>
+							<span class="hub-hero-version-caret" aria-hidden="true">▾</span>
+						</summary>
+						<ul class="hub-hero-version-menu" role="menu">
+							<li class="hub-hero-version-current" role="menuitem" aria-current="page">
+								<span>@Model.Version</span>
+								<span class="hub-hero-version-tick" aria-hidden="true">✓</span>
+							</li>
+							@foreach (var v in Model.OtherVersions)
+							{
+								if (string.IsNullOrEmpty(v.Url))
+								{
+									<li class="hub-hero-version-disabled" role="menuitem" aria-disabled="true">
+										<span>@v.Label</span>
+										<span class="hub-hero-version-soon">soon</span>
+									</li>
+								}
+								else
+								{
+									<li role="menuitem"><a href="@v.Url">@v.Label</a></li>
+								}
+							}
+						</ul>
+					</details>
+				}
+				else
+				{
+					<span class="hub-hero-version">
+						<span class="hub-hero-version-dot" aria-hidden="true"></span>
+						<span class="hub-hero-version-text">@Model.Version</span>
+					</span>
+				}
 			}
 			@if (Model.QuickLinks.Count > 0)
 			{
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs
index 19373fd0f2..6f69430990 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs
@@ -11,5 +11,6 @@ public class HeroViewModel : DirectiveViewModel
 	public required string? Version { get; init; }
 	public required bool ShowSearch { get; init; }
 	public required IReadOnlyList<HeroQuickLink> QuickLinks { get; init; }
+	public required IReadOnlyList<HeroVersion> OtherVersions { get; init; }
 	public required string? ReleasesHtml { get; init; }
 }

From 1908fee724f83eb4de2e27ac8ef77e61346641bb Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 21:47:26 +0200
Subject: [PATCH 098/226] feat(hubs): centralize What's new content in
 config/whats-new.yml

The {whats-new} directive now accepts a :product: option that looks the
content up in a single source-of-truth file. Authors edit one YAML in
config/, and any page can render that product's panel with a one-line
directive:

    :::{whats-new}
    :product: kibana
    :::

Inline YAML body still works as a fallback / override for one-offs.

The new file is loaded through ConfigurationFileProvider (with embedded-
resource fallback so the binary always has it) and made available to
the directive via BuildContext. Configuration is cached per-build so
multiple {whats-new} blocks share one parse pass.

Both hub markdowns are slimmed down to the one-line shape; their
previous inline data is now in config/whats-new.yml.

Also:
- Switches the What's new item layout to grid with a fixed-width meta
  column (130px), so version/date pills line up across rows and
  descriptions don't run into them.
- Makes the hero version chip read more clearly as a dropdown: caret is
  bigger and lives in a translucent circle, the chip itself has a
  brighter idle / hover / open state.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/whats-new.yml                          | 72 +++++++++++++++++
 docs/hubs/elasticsearch/9.0.md                | 25 +-----
 docs/hubs/kibana/9.0.md                       | 25 +-----
 .../ConfigurationFileProvider.cs              |  4 +
 ...Elastic.Documentation.Configuration.csproj |  1 +
 .../Assets/markdown/hub.css                   | 56 ++++++++++---
 .../Myst/Directives/Hub/WhatsNewBlock.cs      | 81 ++++++++++++++-----
 .../Myst/YamlSerialization.cs                 |  1 +
 8 files changed, 185 insertions(+), 80 deletions(-)
 create mode 100644 config/whats-new.yml

diff --git a/config/whats-new.yml b/config/whats-new.yml
new file mode 100644
index 0000000000..2cfb4f0105
--- /dev/null
+++ b/config/whats-new.yml
@@ -0,0 +1,72 @@
+###
+# Centralized "What's new" feed used by the {whats-new} directive.
+#
+# Any page can render a product's recent highlights with:
+#
+#   :::{whats-new}
+#   :product: kibana
+#   :::
+#
+# The {whats-new} directive looks the product up in this file and renders the
+# full panel (header + items). Authors only edit this file; the directive
+# stays trivial in markdown.
+#
+# An optional `id` and `badge` per product control the section anchor and the
+# small badge shown to the left of the title; default badge is "New".
+###
+
+products:
+
+  kibana:
+    title: What's new in Kibana
+    id: whats-new
+    badge: New
+    release-links:
+      - label: '9.4'
+        url: https://www.elastic.co/docs/release-notes/kibana
+      - label: Serverless
+        url: https://www.elastic.co/docs/release-notes/serverless
+    items:
+      - title: Dashboards and visualizations APIs
+        description: Programmatically create and manage dashboards and visualizations
+        link: https://www.elastic.co/docs/api/doc/kibana
+        meta: 9.4 preview
+      - title: AI agent skills
+        description: Teach AI coding agents to work with the Elastic stack
+        link: https://www.elastic.co/docs/explore-analyze/ai-features/agent-skills
+        meta: Mar 2026
+      - title: Agent Builder
+        description: Build custom AI agents that reason over your data
+        link: https://www.elastic.co/docs/explore-analyze/ai-features/elastic-agent-builder
+        meta: 9.3 GA
+      - title: Workflows
+        description: Automate tasks with Kibana actions, HTTP calls, and AI agents
+        link: https://www.elastic.co/docs/explore-analyze/workflows
+        meta: 9.3 preview
+
+  elasticsearch:
+    title: What's new in Elasticsearch
+    id: whats-new
+    badge: New
+    release-links:
+      - label: '9.4'
+        url: https://www.elastic.co/docs/release-notes/elasticsearch
+      - label: Serverless
+        url: https://www.elastic.co/docs/release-notes/serverless
+    items:
+      - title: semantic_text field type
+        description: Simplify semantic search — no pipeline setup needed, just define the field and start querying
+        link: https://www.elastic.co/docs/solutions/search/semantic-search/semantic-search-semantic-text
+        meta: 9.4 GA
+      - title: ES|QL improvements
+        description: New functions, cross-cluster support, and dense vector operations directly in ES|QL queries
+        link: https://www.elastic.co/docs/reference/query-languages/esql/esql-getting-started
+        meta: '9.4'
+      - title: Inference API expansion
+        description: Connect to external AI models (OpenAI, Cohere, Anthropic, Hugging Face, Azure, Google) for embeddings and reranking
+        link: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put
+        meta: '9.4'
+      - title: Breaking changes in 9.x
+        description: Review removed settings, deprecated APIs, and behavioral changes before upgrading from 8.x
+        link: https://www.elastic.co/docs/release-notes/elasticsearch/breaking-changes
+        meta: Upgrade guide
diff --git a/docs/hubs/elasticsearch/9.0.md b/docs/hubs/elasticsearch/9.0.md
index 4c03a55cdf..ecf192ba34 100644
--- a/docs/hubs/elasticsearch/9.0.md
+++ b/docs/hubs/elasticsearch/9.0.md
@@ -22,30 +22,7 @@ The distributed search and analytics engine. Store, search, and analyze data at
 :::
 
 :::{whats-new}
-title: What's new in Elasticsearch
-id: whats-new
-release-links:
-  - label: '9.4'
-    url: https://www.elastic.co/docs/release-notes/elasticsearch
-  - label: Serverless
-    url: https://www.elastic.co/docs/release-notes/serverless
-items:
-  - title: semantic_text field type
-    description: Simplify semantic search — no pipeline setup needed, just define the field and start querying
-    link: https://www.elastic.co/docs/solutions/search/semantic-search/semantic-search-semantic-text
-    meta: 9.4 GA
-  - title: ES|QL improvements
-    description: New functions, cross-cluster support, and dense vector operations directly in ES|QL queries
-    link: https://www.elastic.co/docs/reference/query-languages/esql/esql-getting-started
-    meta: '9.4'
-  - title: Inference API expansion
-    description: Connect to external AI models (OpenAI, Cohere, Anthropic, Hugging Face, Azure, Google) for embeddings and reranking
-    link: https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put
-    meta: '9.4'
-  - title: Breaking changes in 9.x
-    description: Review removed settings, deprecated APIs, and behavioral changes before upgrading from 8.x
-    link: https://www.elastic.co/docs/release-notes/elasticsearch/breaking-changes
-    meta: Upgrade guide
+:product: elasticsearch
 :::
 
 ::::{card-group}
diff --git a/docs/hubs/kibana/9.0.md b/docs/hubs/kibana/9.0.md
index 9c9f84ff18..8d16f4d737 100644
--- a/docs/hubs/kibana/9.0.md
+++ b/docs/hubs/kibana/9.0.md
@@ -22,30 +22,7 @@ The UI for the Elasticsearch platform. Explore and visualize your data, build da
 :::
 
 :::{whats-new}
-title: What's new in Kibana
-id: whats-new
-release-links:
-  - label: 9.4
-    url: /release-notes/kibana
-  - label: Serverless
-    url: /release-notes/serverless
-items:
-  - title: Dashboards and visualizations APIs
-    description: Programmatically create and manage dashboards and visualizations
-    link: /api/dashboards
-    meta: 9.4 preview
-  - title: AI agent skills
-    description: Teach AI coding agents to work with the Elastic stack
-    link: /ai/agent-skills
-    meta: Mar 2026
-  - title: Agent Builder
-    description: Build custom AI agents that reason over your data
-    link: /ai/agent-builder
-    meta: 9.3 GA
-  - title: Workflows
-    description: Automate tasks with Kibana actions, HTTP calls, and AI agents
-    link: /ai/workflows
-    meta: 9.3 preview
+:product: kibana
 :::
 
 ::::{card-group}
diff --git a/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs b/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs
index ba59191eb7..3fca252636 100644
--- a/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs
+++ b/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs
@@ -112,6 +112,7 @@ public ConfigurationFileProvider(
 		LegacyUrlMappingsFile = CreateTemporaryConfigurationFile("legacy-url-mappings.yml");
 		// reading from synonyms.yml is temporary. If you spot this again as a future reader, feel free to remove it.
 		SearchFile = CreateTemporaryConfigurationFile("search.yml", "synonyms.yml");
+		WhatsNewFile = TryCreateTemporaryConfigurationFile("whats-new.yml");
 	}
 
 	public bool SkipPrivateRepositories { get; }
@@ -127,6 +128,9 @@ public ConfigurationFileProvider(
 
 	public IFileInfo ProductsFile { get; }
 
+	/// <summary>Optional — present only when <c>config/whats-new.yml</c> exists.</summary>
+	public IFileInfo? WhatsNewFile { get; }
+
 	public IFileInfo AssemblerFile { get; }
 
 	public IFileInfo LegacyUrlMappingsFile { get; }
diff --git a/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj b/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj
index 0f96c00f34..5712b6a1d9 100644
--- a/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj
+++ b/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj
@@ -31,5 +31,6 @@
     <EmbeddedResource Include="$(SolutionRoot)\config\navigation.yml" />
     <EmbeddedResource Include="$(SolutionRoot)\config\legacy-url-mappings.yml" />
     <EmbeddedResource Include="$(SolutionRoot)\config\search.yml" />
+    <EmbeddedResource Include="$(SolutionRoot)\config\whats-new.yml" />
   </ItemGroup>
 </Project>
diff --git a/src/Elastic.Documentation.Site/Assets/markdown/hub.css b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
index 607b3117df..8005538897 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/hub.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
@@ -160,17 +160,19 @@
 	.hub-hero details.hub-hero-version-dropdown summary {
 		display: inline-flex;
 		align-items: center;
-		gap: 8px;
-		background: rgb(255 255 255 / 0.08);
-		border: 1px solid rgb(255 255 255 / 0.15);
+		gap: 10px;
+		background: rgb(255 255 255 / 0.12);
+		border: 1px solid rgb(255 255 255 / 0.25);
 		border-radius: 20px;
-		padding: 5px 14px;
+		padding: 5px 6px 5px 14px;
 		font-size: 13px;
-		color: rgb(255 255 255 / 0.85);
+		color: var(--color-white);
 		cursor: pointer;
 		list-style: none;
 		user-select: none;
-		transition: background 0.15s;
+		transition:
+			background 0.15s,
+			border-color 0.15s;
 	}
 	.hub-hero
 		details.hub-hero-version-dropdown
@@ -178,12 +180,33 @@
 		display: none;
 	}
 	.hub-hero details.hub-hero-version-dropdown summary:hover {
-		background: rgb(255 255 255 / 0.14);
+		background: rgb(255 255 255 / 0.2);
+		border-color: rgb(255 255 255 / 0.4);
+	}
+	.hub-hero details[open].hub-hero-version-dropdown summary {
+		background: rgb(255 255 255 / 0.2);
+		border-color: rgb(255 255 255 / 0.4);
 	}
 	.hub-hero .hub-hero-version-caret {
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		width: 22px;
+		height: 22px;
+		border-radius: 50%;
+		background: rgb(255 255 255 / 0.18);
 		font-size: 10px;
-		opacity: 0.6;
-		transition: transform 0.15s;
+		line-height: 1;
+		color: var(--color-white);
+		transition:
+			transform 0.18s ease,
+			background 0.15s;
+	}
+	.hub-hero
+		details.hub-hero-version-dropdown
+		summary:hover
+		.hub-hero-version-caret {
+		background: rgb(255 255 255 / 0.3);
 	}
 	.hub-hero details[open] .hub-hero-version-caret {
 		transform: rotate(180deg);
@@ -430,9 +453,10 @@
 		@apply m-0 p-0;
 	}
 	.hub-whats-new .hub-wn-item-link {
-		display: flex;
+		display: grid;
+		grid-template-columns: auto minmax(0, 1fr) 130px;
 		align-items: baseline;
-		gap: 10px;
+		column-gap: 12px;
 		padding: 10px 14px;
 		border-radius: 10px;
 		background: var(--color-grey-10);
@@ -456,13 +480,19 @@
 		color: var(--color-ink-light);
 	}
 	.hub-whats-new .hub-wn-item-meta {
-		margin-left: auto;
+		justify-self: end;
+		text-align: right;
 		white-space: nowrap;
-		flex-shrink: 0;
 		font-size: 12px;
 		color: var(--color-grey-80);
 		font-weight: 500;
 	}
+	.hub-whats-new .hub-wn-item-desc {
+		min-width: 0;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
 
 	/* Zone (section heading) ------------------------------------------ */
 	.hub-zone {
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
index f009c3f0b8..59202757cc 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
@@ -2,6 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using System.Collections.Concurrent;
 using Elastic.Markdown.Diagnostics;
 using YamlDotNet.Core;
 using YamlDotNet.Serialization;
@@ -9,41 +10,52 @@
 namespace Elastic.Markdown.Myst.Directives.Hub;
 
 /// <summary>
-/// Renders the "What's new" panel: a header with a New badge, a section title,
-/// optional release-notes links, and a list of items with title / description /
-/// per-item meta pill (e.g. "9.4 preview", "Mar 2026").
-/// </summary>
-/// <example>
+/// Renders the "What's new" panel for a product. Two usage shapes:
+///
+/// <para><b>Centralized lookup (preferred):</b></para>
 /// <code>
 /// :::{whats-new}
-/// title: What's new in Kibana
-/// id: whats-new
-/// release-links:
-///   - label: 9.4
-///     url: /release-notes/kibana
-///   - label: Serverless
-///     url: /release-notes/serverless
-/// items:
-///   - title: Dashboards APIs
-///     description: Programmatically create dashboards
-///     link: /api/dashboards
-///     meta: 9.4 preview
+/// :product: kibana
 /// :::
 /// </code>
-/// </example>
+/// <para>The directive looks the product key up in <c>config/whats-new.yml</c>
+/// and renders the data declared there. Authors edit one file; any page can
+/// surface the panel.</para>
+///
+/// <para><b>Inline override:</b> if no <c>:product:</c> option is provided,
+/// the directive expects a YAML body declaring <c>title</c>, <c>items</c>,
+/// etc. directly. Useful for one-offs that don't belong in the central
+/// feed.</para>
+/// </summary>
 public class WhatsNewBlock(DirectiveBlockParser parser, ParserContext context)
 	: DirectiveBlock(parser, context)
 {
+	private static readonly ConcurrentDictionary<string, WhatsNewConfig?> CentralConfigCache = new();
+
 	public override string Directive => "whats-new";
 
 	public WhatsNewData Data { get; private set; } = WhatsNewData.Empty;
 
 	public override void FinalizeAndValidate(ParserContext context)
 	{
+		var product = Prop("product");
+
+		if (!string.IsNullOrWhiteSpace(product))
+		{
+			var resolved = LoadFromCentralConfig(product!);
+			if (resolved is null)
+			{
+				this.EmitError($"{{whats-new}} :product: '{product}' was not found in config/whats-new.yml.");
+				return;
+			}
+			Data = resolved;
+			return;
+		}
+
 		var yaml = HubYamlBody.Extract(this, new BuildContextFileReader(Build.ReadFileSystem));
 		if (yaml is null)
 		{
-			this.EmitError("{whats-new} requires a YAML body. See the whats-new directive docs.");
+			this.EmitError("{whats-new} requires either a `:product:` option or a YAML body.");
 			return;
 		}
 
@@ -57,10 +69,41 @@ public override void FinalizeAndValidate(ParserContext context)
 		}
 	}
 
+	private WhatsNewData? LoadFromCentralConfig(string productKey)
+	{
+		var configFile = Build.ConfigurationFileProvider.WhatsNewFile;
+		if (configFile is null || !configFile.Exists)
+			return null;
+
+		var config = CentralConfigCache.GetOrAdd(configFile.FullName, path =>
+		{
+			try
+			{
+				var yaml = Build.ReadFileSystem.File.ReadAllText(path);
+				return YamlSerialization.Deserialize<WhatsNewConfig>(yaml, Build.ProductsConfiguration);
+			}
+			catch
+			{
+				return null;
+			}
+		});
+
+		if (config?.Products is null)
+			return null;
+		return config.Products.TryGetValue(productKey, out var data) ? data : null;
+	}
+
 	public override IEnumerable<string> GeneratedAnchors =>
 		string.IsNullOrWhiteSpace(Data.Id) ? [] : [Data.Id!];
 }
 
+[YamlSerializable]
+public record WhatsNewConfig
+{
+	[YamlMember(Alias = "products")]
+	public Dictionary<string, WhatsNewData> Products { get; set; } = [];
+}
+
 [YamlSerializable]
 public record WhatsNewData
 {
diff --git a/src/Elastic.Markdown/Myst/YamlSerialization.cs b/src/Elastic.Markdown/Myst/YamlSerialization.cs
index 9b9309e1cc..af1a36d2a1 100644
--- a/src/Elastic.Markdown/Myst/YamlSerialization.cs
+++ b/src/Elastic.Markdown/Myst/YamlSerialization.cs
@@ -47,4 +47,5 @@ public static T Deserialize<T>(string yaml, ProductsConfiguration products)
 [YamlSerializable(typeof(Elastic.Markdown.Myst.Directives.Hub.LinkCardAside))]
 [YamlSerializable(typeof(Elastic.Markdown.Myst.Directives.Hub.WhatsNewData))]
 [YamlSerializable(typeof(Elastic.Markdown.Myst.Directives.Hub.WhatsNewItem))]
+[YamlSerializable(typeof(Elastic.Markdown.Myst.Directives.Hub.WhatsNewConfig))]
 public partial class DocsBuilderYamlStaticContext;

From f6ce8b8339366f5db7fc1bca1b6d2b1292c50fc2 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 21:54:28 +0200
Subject: [PATCH 099/226] feat(hubs): wire hub pages under testing/hubs in
 docs-builder nav
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Moves docs/hubs/{es,kibana}/9.0.md to docs/testing/hubs/{es,kibana}/9.0.md
  so they appear in the docs-builder docs sidebar under the Testing
  group, while still rendering with layout: hub.
- Adds matching folder children in _docset.yml.
- Updates products.yml hub slugs to the new paths so the product badges
  link to /testing/hubs/{product}/9.0/.

Also:
- Drops the description truncation in What's new items so long
  descriptions wrap onto a second line cleanly under the title (meta
  pill stays right-aligned with align-items: baseline).
- Bigger hero version dropdown caret: 28x28 puck with a 16px SVG
  chevron (replacing the small ▾ character) so it's clearly a
  click target.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/products.yml                           |  4 ++--
 docs/_docset.yml                              | 10 ++++++++--
 docs/{ => testing}/hubs/elasticsearch/9.0.md  |  0
 docs/{ => testing}/hubs/kibana/9.0.md         |  0
 .../Assets/markdown/hub.css                   | 20 +++++++++----------
 .../Myst/Directives/Hub/HeroView.cshtml       |  6 +++++-
 6 files changed, 25 insertions(+), 15 deletions(-)
 rename docs/{ => testing}/hubs/elasticsearch/9.0.md (100%)
 rename docs/{ => testing}/hubs/kibana/9.0.md (100%)

diff --git a/config/products.yml b/config/products.yml
index b5471b8912..160d8a2006 100644
--- a/config/products.yml
+++ b/config/products.yml
@@ -147,7 +147,7 @@ products:
   elasticsearch:
     display: 'Elasticsearch'
     versioning: 'stack'
-    hub: 'hubs/elasticsearch/9.0'
+    hub: 'testing/hubs/elasticsearch/9.0'
   elasticsearch-client:
     display: 'Elasticsearch Client'
     versioning: 'stack'
@@ -208,7 +208,7 @@ products:
   kibana:
     display: 'Kibana'
     versioning: 'stack'
-    hub: 'hubs/kibana/9.0'
+    hub: 'testing/hubs/kibana/9.0'
   logstash:
     display: 'Logstash'
     versioning: 'stack'
diff --git a/docs/_docset.yml b/docs/_docset.yml
index c43759d2fb..189227f00c 100644
--- a/docs/_docset.yml
+++ b/docs/_docset.yml
@@ -60,8 +60,6 @@ toc:
   - hidden: 404.md
   - hidden: _search.md
   - hidden: developer-notes.md
-  - hidden: hubs/elasticsearch/9.0.md
-  - hidden: hubs/kibana/9.0.md
   - hidden: contribute/cumulative-docs/index.md
   - hidden: contribute/cumulative-docs/guidelines.md
   - hidden: contribute/cumulative-docs/badge-placement.md
@@ -234,6 +232,14 @@ toc:
   - folder: testing
     children:
       - file: index.md
+      - folder: hubs
+        children:
+          - folder: elasticsearch
+            children:
+              - file: 9.0.md
+          - folder: kibana
+            children:
+              - file: 9.0.md
       - file: kibana-settings-yaml-samples.md
       - file: security-settings.md
       - file: req.md
diff --git a/docs/hubs/elasticsearch/9.0.md b/docs/testing/hubs/elasticsearch/9.0.md
similarity index 100%
rename from docs/hubs/elasticsearch/9.0.md
rename to docs/testing/hubs/elasticsearch/9.0.md
diff --git a/docs/hubs/kibana/9.0.md b/docs/testing/hubs/kibana/9.0.md
similarity index 100%
rename from docs/hubs/kibana/9.0.md
rename to docs/testing/hubs/kibana/9.0.md
diff --git a/src/Elastic.Documentation.Site/Assets/markdown/hub.css b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
index 8005538897..b2c65e46c5 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/hub.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
@@ -163,8 +163,8 @@
 		gap: 10px;
 		background: rgb(255 255 255 / 0.12);
 		border: 1px solid rgb(255 255 255 / 0.25);
-		border-radius: 20px;
-		padding: 5px 6px 5px 14px;
+		border-radius: 999px;
+		padding: 4px 4px 4px 14px;
 		font-size: 13px;
 		color: var(--color-white);
 		cursor: pointer;
@@ -191,17 +191,20 @@
 		display: inline-flex;
 		align-items: center;
 		justify-content: center;
-		width: 22px;
-		height: 22px;
+		width: 28px;
+		height: 28px;
 		border-radius: 50%;
-		background: rgb(255 255 255 / 0.18);
-		font-size: 10px;
-		line-height: 1;
+		background: rgb(255 255 255 / 0.22);
 		color: var(--color-white);
 		transition:
 			transform 0.18s ease,
 			background 0.15s;
 	}
+	.hub-hero .hub-hero-version-caret svg {
+		display: block;
+		width: 16px;
+		height: 16px;
+	}
 	.hub-hero
 		details.hub-hero-version-dropdown
 		summary:hover
@@ -489,9 +492,6 @@
 	}
 	.hub-whats-new .hub-wn-item-desc {
 		min-width: 0;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
 	}
 
 	/* Zone (section heading) ------------------------------------------ */
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
index 7190cfaa05..3080d703fa 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
@@ -42,7 +42,11 @@
 						<summary>
 							<span class="hub-hero-version-dot" aria-hidden="true"></span>
 							<span class="hub-hero-version-text">@Model.Version</span>
-							<span class="hub-hero-version-caret" aria-hidden="true">▾</span>
+							<span class="hub-hero-version-caret" aria-hidden="true">
+								<svg width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+									<path d="M3.5 6L8 10.5L12.5 6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+								</svg>
+							</span>
 						</summary>
 						<ul class="hub-hero-version-menu" role="menu">
 							<li class="hub-hero-version-current" role="menuitem" aria-current="page">

From 24cee853cdb2d901840bda0e8fbd67e335702f05 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 21:59:31 +0200
Subject: [PATCH 100/226] feat(hubs): rename URL segment hubs/ -> products/

Establishes the production-target URL convention. The 'hub' page type
keeps its name internally (frontmatter layout: hub, products.yml
'hub:' field), but the published path segment becomes /products/.

- Files moved: docs/testing/hubs/{...} -> docs/testing/products/{...}
- _docset.yml: folder hubs -> products
- products.yml hub slugs updated
- nav-v2.yml Product hubs section: url /hubs/ -> /products/, page
  references updated to docs-builder://testing/products/{...}

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/navigation-v2.yml                             | 6 +++---
 config/products.yml                                  | 4 ++--
 docs/_docset.yml                                     | 2 +-
 docs/testing/{hubs => products}/elasticsearch/9.0.md | 0
 docs/testing/{hubs => products}/kibana/9.0.md        | 0
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename docs/testing/{hubs => products}/elasticsearch/9.0.md (100%)
 rename docs/testing/{hubs => products}/kibana/9.0.md (100%)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index a3f262d205..8570c6c1fd 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -2872,12 +2872,12 @@ nav:
     - toc: docs-content://release-notes/intro
 
   - section: Product hubs
-    url: /hubs/
+    url: /products/
     children:
     - label: Stack products
       children:
-      - page: docs-builder://hubs/elasticsearch/9.0.md
-      - page: docs-builder://hubs/kibana/9.0.md
+      - page: docs-builder://testing/products/elasticsearch/9.0.md
+      - page: docs-builder://testing/products/kibana/9.0.md
       - title: Observability
       - title: Security
     - label: Deployment runbooks
diff --git a/config/products.yml b/config/products.yml
index 160d8a2006..7c0068ca81 100644
--- a/config/products.yml
+++ b/config/products.yml
@@ -147,7 +147,7 @@ products:
   elasticsearch:
     display: 'Elasticsearch'
     versioning: 'stack'
-    hub: 'testing/hubs/elasticsearch/9.0'
+    hub: 'testing/products/elasticsearch/9.0'
   elasticsearch-client:
     display: 'Elasticsearch Client'
     versioning: 'stack'
@@ -208,7 +208,7 @@ products:
   kibana:
     display: 'Kibana'
     versioning: 'stack'
-    hub: 'testing/hubs/kibana/9.0'
+    hub: 'testing/products/kibana/9.0'
   logstash:
     display: 'Logstash'
     versioning: 'stack'
diff --git a/docs/_docset.yml b/docs/_docset.yml
index 189227f00c..ae7ceba2b2 100644
--- a/docs/_docset.yml
+++ b/docs/_docset.yml
@@ -232,7 +232,7 @@ toc:
   - folder: testing
     children:
       - file: index.md
-      - folder: hubs
+      - folder: products
         children:
           - folder: elasticsearch
             children:
diff --git a/docs/testing/hubs/elasticsearch/9.0.md b/docs/testing/products/elasticsearch/9.0.md
similarity index 100%
rename from docs/testing/hubs/elasticsearch/9.0.md
rename to docs/testing/products/elasticsearch/9.0.md
diff --git a/docs/testing/hubs/kibana/9.0.md b/docs/testing/products/kibana/9.0.md
similarity index 100%
rename from docs/testing/hubs/kibana/9.0.md
rename to docs/testing/products/kibana/9.0.md

From 40538efa27a4a920aaee90cc0467b5cd5c2e239b Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 22:05:24 +0200
Subject: [PATCH 101/226] docs(hubs): add reference pages for the hub-page
 directives

Adds one syntax/ doc per new directive plus a hub-pages.md overview:

- syntax/hub-pages.md  -- enables the layout, lists the directive set,
  shows a full skeleton, documents the product-badge mapping.
- syntax/hero.md       -- :icon:, :version:, :versions:, :quick-links:,
  :releases:, :search:; version dropdown shape.
- syntax/whats-new.md  -- centralized lookup via :product: + the inline
  YAML override schema.
- syntax/intro.md      -- markdown body, when to use vs. admonitions.
- syntax/on-this-page.md -- auto-collection rules and item ordering.
- syntax/card-group.md -- :title:, :intro:, :id:, fence-depth tip for
  nested cards, grid layout note.
- syntax/link-card.md  -- full YAML schema, variants, aside, errors.

All seven pages registered alphabetically under docs/syntax/ in
_docset.yml.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docs/_docset.yml            |  7 ++++
 docs/syntax/card-group.md   | 40 ++++++++++++++++++
 docs/syntax/hero.md         | 59 ++++++++++++++++++++++++++
 docs/syntax/hub-pages.md    | 83 +++++++++++++++++++++++++++++++++++++
 docs/syntax/intro.md        | 19 +++++++++
 docs/syntax/link-card.md    | 74 +++++++++++++++++++++++++++++++++
 docs/syntax/on-this-page.md | 25 +++++++++++
 docs/syntax/whats-new.md    | 60 +++++++++++++++++++++++++++
 8 files changed, 367 insertions(+)
 create mode 100644 docs/syntax/card-group.md
 create mode 100644 docs/syntax/hero.md
 create mode 100644 docs/syntax/hub-pages.md
 create mode 100644 docs/syntax/intro.md
 create mode 100644 docs/syntax/link-card.md
 create mode 100644 docs/syntax/on-this-page.md
 create mode 100644 docs/syntax/whats-new.md

diff --git a/docs/_docset.yml b/docs/_docset.yml
index ae7ceba2b2..bd2d6c9980 100644
--- a/docs/_docset.yml
+++ b/docs/_docset.yml
@@ -128,6 +128,7 @@ toc:
       - file: applies-switch.md
       - file: automated_settings.md
       - file: buttons.md
+      - file: card-group.md
       - file: changelog.md
       - file: code.md
       - file: comments.md
@@ -140,15 +141,20 @@ toc:
       - file: file_inclusion.md
       - file: footnotes.md
       - file: frontmatter.md
+      - file: hero.md
+      - file: hub-pages.md
       - file: icons.md
+      - file: intro.md
       - file: images.md
       - file: kbd.md
+      - file: link-card.md
       - file: math.md
       - file: diagrams.md
       - file: lists.md
       - file: line_breaks.md
       - file: links.md
       - file: list-sub-pages.md
+      - file: on-this-page.md
       - file: passthrough.md
       - file: sidebars.md
       - file: stepper.md
@@ -159,6 +165,7 @@ toc:
       - file: tabs.md
       - file: tagged_regions.md
       - file: titles.md
+      - file: whats-new.md
   - folder: cli
     children:
       - file: index.md
diff --git a/docs/syntax/card-group.md b/docs/syntax/card-group.md
new file mode 100644
index 0000000000..bf44068c45
--- /dev/null
+++ b/docs/syntax/card-group.md
@@ -0,0 +1,40 @@
+# Card group
+
+A section heading + a card grid container. Wraps one or more [`{link-card}`](link-card.md) directives.
+
+## Basic
+
+```markdown
+::::{card-group}
+:title: Install and administer
+:id: install
+
+:::{link-card}
+title: Self-managed
+link: /deploy/self-managed
+description: Run on your own infrastructure.
+links:
+  - { label: Docker, url: /deploy/docker }
+:::
+
+:::{link-card}
+title: Elastic Cloud Hosted
+link: /deploy/cloud
+description: Managed deployments on AWS, GCP, or Azure.
+:::
+::::
+```
+
+The outer fence uses **four** colons (`::::`) so the inner three-colon `:::` fences for the cards aren't interpreted as a closing fence. Use as many extra colons on the outer fence as you need to nest cleanly.
+
+## Options
+
+| Option | Notes |
+|---|---|
+| `:title:` | H2 heading. Optional — without it, only the grid renders. |
+| `:intro:` | Optional intro paragraph below the heading. |
+| `:id:` | Section anchor. Picked up by [`{on-this-page}`](on-this-page.md). |
+
+## Layout
+
+The grid auto-fills 1, 2, or 3 columns based on viewport width using `grid-template-columns: repeat(auto-fill, minmax(310px, 1fr))`. Card heights match within a row.
diff --git a/docs/syntax/hero.md b/docs/syntax/hero.md
new file mode 100644
index 0000000000..aebb94df8e
--- /dev/null
+++ b/docs/syntax/hero.md
@@ -0,0 +1,59 @@
+# Hero
+
+A full-bleed hero band with a product icon, page title, description, fake search box, version dropdown, quick-action pills, and an optional release-status line. Designed for the [hub layout](hub-pages.md) but reusable on any page.
+
+## Basic hero
+
+```markdown
+:::{hero}
+:icon: kibana
+:version: v9 / Serverless (current)
+
+# Kibana
+
+The UI for the Elasticsearch platform.
+:::
+```
+
+The first H1 inside the body is the page title. Subsequent paragraphs render as the description below the title.
+
+## Options
+
+| Option | Type | Notes |
+|---|---|---|
+| `:icon:` | string | Product key. Resolves to an inline SVG via the product-icon lookup. Known keys: `elasticsearch`, `kibana`, `observability`, `security`. Unknown keys fall back to a single-letter chip. |
+| `:version:` | string | Label inside the version chip (e.g. `v9 / Serverless (current)`). |
+| `:versions:` | comma list | When set, the chip becomes a `<details>` dropdown listing other versions. Items use `Label` (greyed, "soon") or `Label=URL` (clickable). |
+| `:quick-links:` | comma list, `Label=URL` | Pill bar below the version chip. |
+| `:releases:` | inline markdown | Small status line under the pills, supports inline links and bold/italic. |
+| `:search:` | bool, default `true` | Show the placeholder search box. |
+
+## Version dropdown
+
+```markdown
+:::{hero}
+:icon: kibana
+:version: v9 / Serverless (current)
+:versions: v8=https://www.elastic.co/docs/products/kibana/8.x,v7
+
+# Kibana
+:::
+```
+
+`v8=...` is a clickable link. `v7` (no `=URL`) renders greyed out with a "soon" badge.
+
+## Quick links and releases
+
+```markdown
+:::{hero}
+:icon: elasticsearch
+:version: v9 / Serverless (current)
+:quick-links: Install=/install,API reference=/api,Release notes=/release-notes
+:releases: Latest&#58; [Stack 9.4.1](/rn) (Mar 28, 2026) · [Serverless deployed](/srn) Apr 1, 2026
+
+# Elasticsearch
+The distributed search and analytics engine.
+:::
+```
+
+The `releases` option is inline markdown — it supports the same syntax as a single line of body markdown. Use `&#58;` for a literal colon when you don't want YAML to parse the value as a key/value pair.
diff --git a/docs/syntax/hub-pages.md b/docs/syntax/hub-pages.md
new file mode 100644
index 0000000000..66465b6321
--- /dev/null
+++ b/docs/syntax/hub-pages.md
@@ -0,0 +1,83 @@
+# Hub pages
+
+Hub pages are product-scoped landing pages — a 360° overview of one product across versions, deployment types, and surfaces. They're enabled by setting `layout: hub` in the page's frontmatter and composed from a small set of dedicated directives.
+
+## Enable the layout
+
+```yaml
+---
+layout: hub
+---
+```
+
+The `hub` layout drops the right-rail "On this page" TOC and the prev/next nav. The body owns the full width of the content column so directives can render full-bleed sections.
+
+## Directives
+
+| Directive | Purpose |
+|-----------|---------|
+| [`{hero}`](hero.md) | Full-bleed page hero with product icon, title, search, version dropdown, and quick-action pills. |
+| [`{on-this-page}`](on-this-page.md) | Auto-generated inline TOC linking each section anchor on the page. |
+| [`{intro}`](intro.md) | Small "getting started" callout panel with a teal accent bar. |
+| [`{whats-new}`](whats-new.md) | "What's new" panel populated from `config/whats-new.yml`. |
+| [`{card-group}`](card-group.md) | Section heading + card grid container. |
+| [`{link-card}`](link-card.md) | Rich card with title, description, primary link list, and optional aside. |
+
+## Page skeleton
+
+```markdown
+---
+layout: hub
+---
+
+:::{hero}
+:icon: kibana
+:version: v9 / Serverless (current)
+:versions: v8,v7
+:quick-links: Install=/install,Tutorial=/tutorial
+:releases: Latest&#58; [Stack 9.4.1](/rn) (Mar 28, 2026)
+
+# Kibana
+
+The UI for the Elasticsearch platform.
+:::
+
+:::{on-this-page}
+:::
+
+:::{intro}
+**New to Kibana?** [Take the tutorial](/tutorial) — 30 minutes, hands-on.
+:::
+
+:::{whats-new}
+:product: kibana
+:::
+
+::::{card-group}
+:title: Install and administer
+:id: install
+
+:::{link-card}
+title: Self-managed
+link: /deploy-manage/deploy/self-managed
+description: Run Kibana on your own infrastructure.
+links:
+  - { label: Docker, url: /deploy/docker }
+  - { label: Configure, url: /deploy/configure }
+:::
+::::
+```
+
+## Product badges
+
+Every regular (non-hub) page that declares one or more `products:` in its frontmatter automatically gets a clickable badge above its H1, linking to that product's hub page. The badge → hub URL mapping is set per product in [`config/products.yml`](../configure/site/products.md):
+
+```yaml
+products:
+  kibana:
+    display: 'Kibana'
+    versioning: 'stack'
+    hub: 'products/kibana/9.0'   # path slug -- relative to site root
+```
+
+When `hub:` is null, no badge renders for that product.
diff --git a/docs/syntax/intro.md b/docs/syntax/intro.md
new file mode 100644
index 0000000000..9d4ca14cf3
--- /dev/null
+++ b/docs/syntax/intro.md
@@ -0,0 +1,19 @@
+# Intro callout
+
+A small white panel with a teal accent bar — used for "getting started" callouts directly under the hero.
+
+## Basic
+
+```markdown
+:::{intro}
+**New to Kibana?** [Take the tutorial](/tutorial) — a 30-minute, hands-on walk-through of Discover, dashboards, and ES|QL.
+:::
+```
+
+Body is rendered as inline markdown. Use bold, links, and emphasis freely; keep it to one or two short paragraphs.
+
+## When to use
+
+`{intro}` is the standard "front door" panel between the [`{hero}`](hero.md) and the [`{on-this-page}`](on-this-page.md) chip. It's optional — skip it when the hero already says what readers need to know next.
+
+It is **not** an admonition. For caution / note / tip-style callouts inside body content, use the existing [admonitions](admonitions.md).
diff --git a/docs/syntax/link-card.md b/docs/syntax/link-card.md
new file mode 100644
index 0000000000..5b815522bf
--- /dev/null
+++ b/docs/syntax/link-card.md
@@ -0,0 +1,74 @@
+# Link card
+
+A rich card with a title, description, primary link list, and an optional aside.  Designed to live inside a [`{card-group}`](card-group.md), but renders standalone too.
+
+## Basic
+
+```markdown
+:::{link-card}
+title: Discover
+link: /discover
+description: Browse documents, filter, and query your indices in real time.
+links:
+  - label: Get started with Discover
+    url: /discover/get-started
+  - label: Use ES|QL in Kibana
+    url: /esql
+:::
+```
+
+The card body is **YAML, not markdown** — the directive expects a fixed schema and renders it. Authors don't write HTML, fences, or any directive options; they fill in fields.
+
+## Schema
+
+```yaml
+title: Discover                    # required -- card heading
+link: /discover/                   # optional -- makes the title clickable
+description: One-paragraph blurb.  # optional
+icon: elasticsearch                # optional -- product-keyed inline SVG
+variant: es                        # optional accent: es | obs | sec
+links:                             # optional -- primary link list
+  - label: Get started
+    url: /discover/get-started
+  - label: Use ES|QL
+    url: /esql
+aside:                             # optional bottom rail
+  label: Panel types
+  links:
+    - { label: Visualizations, url: /viz }
+    - { label: Maps, url: /maps }
+    - { label: Text, url: /text }
+```
+
+## Variants
+
+`variant: es | obs | sec` adds a left-border accent in the corresponding solution color (yellow / pink / teal). Use for solution cards.
+
+```markdown
+:::{link-card}
+title: Elasticsearch
+link: /solutions/elasticsearch
+icon: elasticsearch
+variant: es
+description: Build powerful search and RAG applications.
+links:
+  - { label: Solution overview, url: /solutions/elasticsearch }
+  - { label: Get started, url: /solutions/elasticsearch/get-started }
+aside:
+  label: Key features
+  links:
+    - { label: Vector search, url: /solutions/search/vector }
+    - { label: Semantic search, url: /solutions/search/semantic }
+:::
+```
+
+## Aside
+
+The optional `aside` adds a separator line and a small label + dot-separated inline link list. Use it for supplementary references that don't fit the primary link list (e.g. "Panel types", "Chart types", "Key features").
+
+## Errors
+
+The directive emits build errors when:
+
+- The body isn't valid YAML.
+- `title` is missing or empty.
diff --git a/docs/syntax/on-this-page.md b/docs/syntax/on-this-page.md
new file mode 100644
index 0000000000..1674608297
--- /dev/null
+++ b/docs/syntax/on-this-page.md
@@ -0,0 +1,25 @@
+# On this page
+
+Inline TOC chip. Auto-collects every [`{card-group}`](card-group.md) and [`{whats-new}`](whats-new.md) on the same page that has both an `id` and a `title`, and renders them as middle-dot-separated anchor links inside a single rounded panel.
+
+## Basic
+
+```markdown
+:::{on-this-page}
+:::
+```
+
+That's the whole directive — no options, no body. Drop it once on a hub page (typically right after the [`{hero}`](hero.md)) and it stays in sync as you add or remove sections.
+
+## How items are collected
+
+For each section directive on the page, an item is added to the chip when:
+
+- The directive declares an `id` (becomes the anchor — `#install`).
+- The directive declares a `title` (becomes the link label).
+
+`{card-group}`s with no `:title:` are skipped. `{whats-new}` panels populated from `config/whats-new.yml` get their `id` and `title` from that file; if the entry sets neither, the `{whats-new}` block is skipped.
+
+## Order
+
+Items appear in document order — top to bottom of the page.
diff --git a/docs/syntax/whats-new.md b/docs/syntax/whats-new.md
new file mode 100644
index 0000000000..e13a1c1b0b
--- /dev/null
+++ b/docs/syntax/whats-new.md
@@ -0,0 +1,60 @@
+# What's new
+
+A panel with a "New" badge, section title, optional release-notes link list on the right, and rows of recent highlights. Each row has a title, description, and right-aligned meta pill (e.g. `9.4 preview`, `Mar 2026`).
+
+## Centralized lookup (recommended)
+
+Edit content in one place — [`config/whats-new.yml`](../configure/site/products.md) — and any page can render a product's panel with a one-line directive:
+
+```markdown
+:::{whats-new}
+:product: kibana
+:::
+```
+
+`config/whats-new.yml` schema:
+
+```yaml
+products:
+  kibana:
+    title: What's new in Kibana
+    id: whats-new                     # used as the section anchor
+    badge: New                        # optional, default 'New'
+    release-links:
+      - { label: '9.4', url: /release-notes/kibana }
+      - { label: Serverless, url: /release-notes/serverless }
+    items:
+      - title: Dashboards APIs
+        description: Programmatically create and manage dashboards
+        link: /api/dashboards
+        meta: 9.4 preview
+      - title: AI agent skills
+        description: Teach AI coding agents to work with the Elastic stack
+        link: /ai/agent-skills
+        meta: Mar 2026
+```
+
+## Inline override
+
+If `:product:` is omitted, the directive expects the same schema as a YAML body. Useful when the page needs a one-off feed that doesn't belong in the central file:
+
+```markdown
+:::{whats-new}
+title: What's new in this release
+items:
+  - title: Custom feature A
+    description: Details
+    link: /feature-a
+    meta: 9.4
+:::
+```
+
+## Options
+
+| Option | Notes |
+|---|---|
+| `:product:` | Product key from `config/whats-new.yml`. When set, the body is ignored. |
+
+## Anchor
+
+`{whats-new}` registers its `id` as a section anchor — `{on-this-page}` automatically picks it up alongside `{card-group}` sections.

From 171b72ae3eee6174b5e7ad29c0aadc8762e21043 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 30 Apr 2026 22:14:30 +0200
Subject: [PATCH 102/226] feat(hubs): make hero title and description explicit
 options

The hero directive's body convention (first H1 = title, paragraphs =
description) was not intuitive. This commit replaces it with explicit
:title: (required) and :description: (inline markdown) options.

- HeroBlock parses :title: and :description: from options; the body is
  now ignored.
- HeroView renders <h1>@Title</h1> and <p>@DescriptionHtml</p> directly,
  no nested heading-wrapper. CSS targets .hub-hero-title h1 instead of
  .heading-wrapper.
- DescriptionHtml is rendered as inline markdown so links/bold/italic
  inside the description still work.
- MarkdownFile.cs falls back to the first {hero} block's :title: when no
  document H1 is present, preserving page-title detection.

Both hub markdowns are updated. The hero.md and hub-pages.md syntax
docs show the new shape.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docs/syntax/hero.md                           | 25 ++++++++++---------
 docs/syntax/hub-pages.md                      |  6 ++---
 docs/testing/products/elasticsearch/9.0.md    |  6 ++---
 docs/testing/products/kibana/9.0.md           |  6 ++---
 .../Assets/markdown/hub.css                   |  3 +--
 src/Elastic.Markdown/IO/MarkdownFile.cs       | 12 +++++++++
 .../Myst/Directives/DirectiveHtmlRenderer.cs  |  6 +++++
 .../Myst/Directives/Hub/HeroBlock.cs          | 25 ++++++++++++-------
 .../Myst/Directives/Hub/HeroView.cshtml       |  6 ++++-
 .../Myst/Directives/Hub/HeroViewModel.cs      |  2 ++
 10 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/docs/syntax/hero.md b/docs/syntax/hero.md
index aebb94df8e..4c245b4c66 100644
--- a/docs/syntax/hero.md
+++ b/docs/syntax/hero.md
@@ -2,25 +2,27 @@
 
 A full-bleed hero band with a product icon, page title, description, fake search box, version dropdown, quick-action pills, and an optional release-status line. Designed for the [hub layout](hub-pages.md) but reusable on any page.
 
-## Basic hero
+All hero content is supplied via options. The directive body is not used.
+
+## Basic
 
 ```markdown
 :::{hero}
 :icon: kibana
+:title: Kibana
+:description: The UI for the Elasticsearch platform.
 :version: v9 / Serverless (current)
-
-# Kibana
-
-The UI for the Elasticsearch platform.
 :::
 ```
 
-The first H1 inside the body is the page title. Subsequent paragraphs render as the description below the title.
+The `:title:` option doubles as the page title (no body H1 needed). `:description:` supports inline markdown — links, bold, emphasis.
 
 ## Options
 
 | Option | Type | Notes |
 |---|---|---|
+| `:title:` | string | **Required.** Page heading shown next to the icon. Also picked up as the document's page title. |
+| `:description:` | inline markdown | One-line summary shown below the title. Supports bold, italics, and links. |
 | `:icon:` | string | Product key. Resolves to an inline SVG via the product-icon lookup. Known keys: `elasticsearch`, `kibana`, `observability`, `security`. Unknown keys fall back to a single-letter chip. |
 | `:version:` | string | Label inside the version chip (e.g. `v9 / Serverless (current)`). |
 | `:versions:` | comma list | When set, the chip becomes a `<details>` dropdown listing other versions. Items use `Label` (greyed, "soon") or `Label=URL` (clickable). |
@@ -33,10 +35,10 @@ The first H1 inside the body is the page title. Subsequent paragraphs render as
 ```markdown
 :::{hero}
 :icon: kibana
+:title: Kibana
+:description: The UI for the Elasticsearch platform.
 :version: v9 / Serverless (current)
 :versions: v8=https://www.elastic.co/docs/products/kibana/8.x,v7
-
-# Kibana
 :::
 ```
 
@@ -47,13 +49,12 @@ The first H1 inside the body is the page title. Subsequent paragraphs render as
 ```markdown
 :::{hero}
 :icon: elasticsearch
+:title: Elasticsearch
+:description: The distributed search and analytics engine.
 :version: v9 / Serverless (current)
 :quick-links: Install=/install,API reference=/api,Release notes=/release-notes
 :releases: Latest&#58; [Stack 9.4.1](/rn) (Mar 28, 2026) · [Serverless deployed](/srn) Apr 1, 2026
-
-# Elasticsearch
-The distributed search and analytics engine.
 :::
 ```
 
-The `releases` option is inline markdown — it supports the same syntax as a single line of body markdown. Use `&#58;` for a literal colon when you don't want YAML to parse the value as a key/value pair.
+The `:releases:` option is inline markdown — same syntax as a single line of body markdown. Use `&#58;` for a literal colon when you don't want YAML to parse the value as a key/value pair.
diff --git a/docs/syntax/hub-pages.md b/docs/syntax/hub-pages.md
index 66465b6321..f4a405b5f9 100644
--- a/docs/syntax/hub-pages.md
+++ b/docs/syntax/hub-pages.md
@@ -32,14 +32,12 @@ layout: hub
 
 :::{hero}
 :icon: kibana
+:title: Kibana
+:description: The UI for the Elasticsearch platform.
 :version: v9 / Serverless (current)
 :versions: v8,v7
 :quick-links: Install=/install,Tutorial=/tutorial
 :releases: Latest&#58; [Stack 9.4.1](/rn) (Mar 28, 2026)
-
-# Kibana
-
-The UI for the Elasticsearch platform.
 :::
 
 :::{on-this-page}
diff --git a/docs/testing/products/elasticsearch/9.0.md b/docs/testing/products/elasticsearch/9.0.md
index ecf192ba34..8c0caa1aca 100644
--- a/docs/testing/products/elasticsearch/9.0.md
+++ b/docs/testing/products/elasticsearch/9.0.md
@@ -4,14 +4,12 @@ layout: hub
 
 :::{hero}
 :icon: elasticsearch
+:title: Elasticsearch
+:description: The distributed search and analytics engine. Store, search, and analyze data at any scale, with vector search, AI toolkits, and a high-performance retrieval engine.
 :version: v9 / Serverless (current)
 :versions: v8,v7
 :quick-links: Install=https://www.elastic.co/docs/deploy-manage/deploy/self-managed/installing-elasticsearch,Quick start=https://www.elastic.co/docs/reference/elasticsearch/rest-apis/api-examples,API reference=https://www.elastic.co/docs/api/doc/elasticsearch,Release notes=https://www.elastic.co/docs/release-notes/elasticsearch
 :releases: Latest&#58; [Stack 9.4.1](https://www.elastic.co/docs/release-notes/elasticsearch) (Mar 28, 2026) · [Serverless deployed](https://www.elastic.co/docs/release-notes/serverless) Apr 1, 2026
-
-# Elasticsearch
-
-The distributed search and analytics engine. Store, search, and analyze data at any scale, with vector search, AI toolkits, and a high-performance retrieval engine.
 :::
 
 :::{on-this-page}
diff --git a/docs/testing/products/kibana/9.0.md b/docs/testing/products/kibana/9.0.md
index 8d16f4d737..360edb2f7e 100644
--- a/docs/testing/products/kibana/9.0.md
+++ b/docs/testing/products/kibana/9.0.md
@@ -4,14 +4,12 @@ layout: hub
 
 :::{hero}
 :icon: kibana
+:title: Kibana
+:description: The UI for the Elasticsearch platform. Explore and visualize your data, build dashboards, set up alerts, automate tasks with AI, and use purpose-built solutions for Search, Observability, and Security.
 :version: v9 / Serverless (current)
 :versions: v8,v7
 :quick-links: Install=/install,Tutorial=/tutorial,API reference=/api,Release notes=/release-notes
 :releases: Latest&#58; [Stack 9.4.1](/release-notes/kibana) (Mar 28, 2026) · [Serverless deployed](/release-notes/serverless) Apr 1, 2026
-
-# Kibana
-
-The UI for the Elasticsearch platform. Explore and visualize your data, build dashboards, set up alerts, automate tasks with AI, and use purpose-built solutions for Search, Observability, and Security.
 :::
 
 :::{on-this-page}
diff --git a/src/Elastic.Documentation.Site/Assets/markdown/hub.css b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
index b2c65e46c5..453f5a09bc 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/hub.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
@@ -50,10 +50,9 @@
 	.hub-hero .hub-hero-title {
 		display: contents;
 	}
-	.hub-hero .hub-hero-title .heading-wrapper {
+	.hub-hero .hub-hero-title h1 {
 		grid-column: 2;
 		grid-row: 1;
-		margin: 0;
 	}
 	.hub-hero .hub-hero-title p {
 		grid-column: 1 / -1;
diff --git a/src/Elastic.Markdown/IO/MarkdownFile.cs b/src/Elastic.Markdown/IO/MarkdownFile.cs
index 8fdb7835ce..e38d448879 100644
--- a/src/Elastic.Markdown/IO/MarkdownFile.cs
+++ b/src/Elastic.Markdown/IO/MarkdownFile.cs
@@ -166,6 +166,18 @@ protected void ReadDocumentInstructions(MarkdownDocument document, Func<string,
 				.GetData("header") as string ?? Title;
 		}
 
+		// Fall back to a {hero} directive's :title: option -- hero pages express
+		// the title declaratively rather than via a body H1.
+		if (Title == RelativePath)
+		{
+			var heroTitle = document
+				.Descendants<Elastic.Markdown.Myst.Directives.Hub.HeroBlock>()
+				.FirstOrDefault()?
+				.Title;
+			if (!string.IsNullOrWhiteSpace(heroTitle))
+				Title = heroTitle!;
+		}
+
 		var yamlFrontMatter = ProcessYamlFrontMatter(document);
 		YamlFrontMatter = yamlFrontMatter;
 		if (yamlFrontMatter.NavigationTitle is not null)
diff --git a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
index 3e234c9072..68341d7069 100644
--- a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
@@ -357,11 +357,17 @@ private static void WriteHero(HtmlRenderer renderer, HeroBlock block)
 			? null
 			: RenderInlineMarkdown(block.Releases!);
 
+		var descriptionHtml = string.IsNullOrWhiteSpace(block.Description)
+			? null
+			: RenderInlineMarkdown(block.Description!);
+
 		var slice = HeroView.Create(new HeroViewModel
 		{
 			DirectiveBlock = block,
 			IconKey = block.Icon,
 			IconSvg = block.IconSvg,
+			Title = block.Title,
+			DescriptionHtml = descriptionHtml,
 			Version = block.Version,
 			ShowSearch = block.ShowSearch,
 			QuickLinks = block.QuickLinks,
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
index 529f8d8f4a..8787ad312f 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
@@ -2,24 +2,24 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using Elastic.Markdown.Diagnostics;
+
 namespace Elastic.Markdown.Myst.Directives.Hub;
 
 /// <summary>
-/// Renders a full-bleed page hero with product icon, title (from inner H1),
-/// description, search box, version chip, quick-link pills, and an optional
-/// release-status line. Designed for landing-style pages such as product hubs.
+/// Renders a full-bleed page hero with product icon, title, description,
+/// search box, version chip, quick-link pills, and an optional release-status
+/// line. All content is supplied via options -- the body is unused.
 /// </summary>
 /// <example>
 /// <code>
 /// :::{hero}
 /// :icon: kibana
+/// :title: Kibana
+/// :description: The UI for the Elasticsearch platform.
 /// :version: v9 / Serverless (current)
-/// :quick-links: Install=/install,Tutorial=/tutorial,API reference=/api,Release notes=/release-notes
-/// :releases: Latest&#58; [Stack 9.4.1](/rn) (Mar 28, 2026) · [Serverless deployed](/srn) Apr 1, 2026
-///
-/// # Kibana
-///
-/// The UI for the Elasticsearch platform.
+/// :quick-links: Install=/install,Tutorial=/tutorial
+/// :releases: Latest&#58; [Stack 9.4.1](/rn) (Mar 28, 2026)
 /// :::
 /// </code>
 /// </example>
@@ -30,6 +30,8 @@ public class HeroBlock(DirectiveBlockParser parser, ParserContext context)
 
 	public string? Icon { get; private set; }
 	public string? IconSvg { get; private set; }
+	public string? Title { get; private set; }
+	public string? Description { get; private set; }
 	public string? Version { get; private set; }
 	public bool ShowSearch { get; private set; }
 	public IReadOnlyList<HeroQuickLink> QuickLinks { get; private set; } = [];
@@ -40,6 +42,8 @@ public override void FinalizeAndValidate(ParserContext context)
 	{
 		Icon = Prop("icon");
 		IconSvg = ProductIcons.Get(Icon);
+		Title = Prop("title");
+		Description = Prop("description");
 		Version = Prop("version");
 		// search defaults to true; explicit ":search: false" hides it
 		ShowSearch = TryPropBool("search") ?? true;
@@ -48,6 +52,9 @@ public override void FinalizeAndValidate(ParserContext context)
 		OtherVersions = ParsePairs(Prop("versions"), allowEmptyUrl: true)
 			.Select(p => new HeroVersion(p.Label, p.Url)).ToList();
 		Releases = Prop("releases");
+
+		if (string.IsNullOrWhiteSpace(Title))
+			this.EmitError("{hero} requires a `:title:` option.");
 	}
 
 	private static IReadOnlyList<(string Label, string? Url)> ParsePairs(string? raw, bool allowEmptyUrl)
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
index 3080d703fa..d25284d072 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
@@ -14,7 +14,11 @@
 				<span class="hub-hero-icon" aria-hidden="true">@Elastic.Markdown.Myst.Directives.Hub.ProductIcons.Initials(Model.IconKey)</span>
 			}
 			<div class="hub-hero-title">
-				@Model.RenderBlock()
+				<h1>@Model.Title</h1>
+				@if (!string.IsNullOrWhiteSpace(Model.DescriptionHtml))
+				{
+					<p>@(new HtmlString(Model.DescriptionHtml))</p>
+				}
 			</div>
 		</div>
 
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs
index 6f69430990..7c971bdd02 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs
@@ -8,6 +8,8 @@ public class HeroViewModel : DirectiveViewModel
 {
 	public required string? IconKey { get; init; }
 	public required string? IconSvg { get; init; }
+	public required string? Title { get; init; }
+	public required string? DescriptionHtml { get; init; }
 	public required string? Version { get; init; }
 	public required bool ShowSearch { get; init; }
 	public required IReadOnlyList<HeroQuickLink> QuickLinks { get; init; }

From 9979af74ae52c724f009616d744ac5be390f8564 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 1 May 2026 10:46:37 +0200
Subject: [PATCH 103/226] fix(hubs): make Product hubs section an external link
 to the gist
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The assembler can't yet route through the V2 nav for our hub pages
(known limitation -- AssembleSources still wires file output via the V1
toc chain), so the previous in-repo page: references caused
'Could not find ... in navigation' errors during assembler builds.

Replace the section's internal /products/ URL + nested page references
with a single external URL pointing at the Kibana gist preview. The
secondary nav already renders any section whose URL starts with http
as an external link with the ↗ icon (see _SecondaryNav.cshtml).

Effect:
- Assembler build: 0 errors. Top-bar now shows 'Product hubs ↗'.
- Isolated build: unchanged. The real hub pages still render at
  /testing/products/{elasticsearch,kibana}/9.0/ in docs-builder's own
  meta-docs, which is how reviewers preview them today.

Once the V2 nav-wiring lands upstream, this will revert to internal
section + page references.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/navigation-v2.yml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 8570c6c1fd..cd6b18f288 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -2871,20 +2871,13 @@ nav:
     children:
     - toc: docs-content://release-notes/intro
 
+  # Until hub pages are produced through the V1 navigation/toc chain so the
+  # assembler can resolve them, this section is an external link to the
+  # Kibana gist preview -- the visual reference for the prototype, with its
+  # own island-style nav and stubs already wired up.
+  # https://gist.github.com/florent-leborgne/c9075416b50ec111a09897b7be4462cc
   - section: Product hubs
-    url: /products/
-    children:
-    - label: Stack products
-      children:
-      - page: docs-builder://testing/products/elasticsearch/9.0.md
-      - page: docs-builder://testing/products/kibana/9.0.md
-      - title: Observability
-      - title: Security
-    - label: Deployment runbooks
-      children:
-      - title: Elastic Cloud Hosted
-      - title: Elastic Cloud Serverless
-      - title: Self-managed
+    url: https://htmlpreview.github.io/?https://gist.github.com/florent-leborgne/c9075416b50ec111a09897b7be4462cc/raw/kibana-hub.html
 
   - section: Extension points
     url: /extend/

From 35aa23b60f3011a27b63f3c457ceeb098e9fd6a0 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 1 May 2026 11:35:28 +0200
Subject: [PATCH 104/226] feat(hubs): redesign product badges as
 inline-with-title pills

Old badges were small underlined pills above the H1 with default <li>
bullets leaking through and ambiguous semantics ('Applies to' clashed
with the existing applies_to lifecycle/version system).

New design:
- Sit inline with the page H1 (.page-title-row flex container, align
  baseline + translateY(-0.45em) to land at the H1 x-height).
- Per pill: brand-color accent dot, product name, right-arrow chevron
  that slides on hover.
- Hover state: border picks up the brand color, faint background tint,
  arrow color and position shift -- reads clearly as 'click to navigate
  there'.
- No more SVG product icons in the chip (Elasticsearch tricolor read
  like a tiny flag at 14px). The accent dot carries the identity at
  any size.

Per-product accents reuse the solution-card brand colors:
elasticsearch=#FEC514, kibana=#F04E98, observability=#0077CC,
security=#00BFB3.

The hub-pages syntax doc now declares products: [elasticsearch, kibana]
in its frontmatter so the new rendering is visible in the docs-builder
docs build.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docs/syntax/hub-pages.md                      |   6 +
 .../Assets/markdown/hub.css                   | 120 ++++++++++++++++--
 src/Elastic.Markdown/Page/Index.cshtml        |   8 +-
 .../Page/ProductBadges.cshtml                 |  14 +-
 4 files changed, 129 insertions(+), 19 deletions(-)

diff --git a/docs/syntax/hub-pages.md b/docs/syntax/hub-pages.md
index f4a405b5f9..71d3a9aaee 100644
--- a/docs/syntax/hub-pages.md
+++ b/docs/syntax/hub-pages.md
@@ -1,3 +1,9 @@
+---
+products:
+  - id: elasticsearch
+  - id: kibana
+---
+
 # Hub pages
 
 Hub pages are product-scoped landing pages — a 360° overview of one product across versions, deployment types, and surfaces. They're enabled by setting `layout: hub` in the page's frontmatter and composed from a small set of dedicated directives.
diff --git a/src/Elastic.Documentation.Site/Assets/markdown/hub.css b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
index 453f5a09bc..eadafc1468 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/hub.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
@@ -653,24 +653,122 @@
 		border-left-color: #00bfb3;
 	}
 
-	/* Product badges shown above the H1 of a regular page. */
-	.product-badges {
-		@apply mb-3 flex list-none flex-wrap gap-2 p-0;
+	/* Page title row -- wraps the H1 and the product badges so they sit
+	   on the same baseline when there's room and stack on narrow screens. */
+	.page-title-row {
+		display: flex;
+		align-items: baseline;
+		flex-wrap: wrap;
+		gap: 8px 14px;
+		margin-bottom: 0.5em;
 	}
-	.product-badges li {
-		@apply m-0 p-0;
+	.page-title-row > .heading-wrapper,
+	.page-title-row > h1 {
+		margin-bottom: 0;
+	}
+
+	/* Product badges -- the inline-with-title pills that point at the
+	   matching product hub. Each pill has the product's accent dot, the
+	   product name, and a right-arrow chevron to read as clickable.
+	   The translateY offset lifts the pill so it sits at the H1's
+	   x-height rather than below its baseline. */
+	.product-badges {
+		display: inline-flex;
+		flex-wrap: wrap;
+		gap: 6px;
+		align-items: center;
+		margin: 0;
+		padding: 0;
+		transform: translateY(-0.45em);
 	}
+
 	.product-badge {
-		@apply inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-semibold tracking-wide no-underline;
-		background: var(--color-grey-10);
-		color: var(--color-ink-light);
+		display: inline-flex;
+		align-items: center;
+		gap: 7px;
+		padding: 3px 10px;
+		border-radius: 999px;
+		background: var(--color-white);
 		border: 1px solid var(--color-grey-20);
+		color: var(--color-ink-dark);
+		font-size: 12px;
+		font-weight: 500;
+		text-decoration: none;
+		line-height: 1.2;
+		transition:
+			border-color 0.15s ease,
+			background-color 0.15s ease,
+			color 0.15s ease,
+			box-shadow 0.15s ease,
+			transform 0.15s ease;
 	}
 	.product-badge:hover {
-		background: var(--color-blue-elastic-10);
-		color: var(--color-blue-elastic-100);
-		border-color: var(--color-blue-elastic);
 		text-decoration: none;
+		color: var(--color-ink-dark);
+		box-shadow: 0 1px 3px rgb(0 0 0 / 0.08);
+		transform: translateY(-1px);
+	}
+	.product-badge:focus-visible {
+		outline: 2px solid var(--color-blue-elastic);
+		outline-offset: 2px;
+	}
+
+	/* Brand-color dot leading the pill. Every product gets its accent
+	   here -- recognizable at any size, no logo distortion. */
+	.product-badge-dot {
+		display: inline-block;
+		width: 7px;
+		height: 7px;
+		border-radius: 999px;
+		background: var(--color-grey-40);
+		flex-shrink: 0;
+	}
+	.product-badge-label {
+		display: inline-block;
+		white-space: nowrap;
+	}
+	.product-badge-arrow {
+		flex-shrink: 0;
+		color: var(--color-grey-40);
+		transition:
+			transform 0.15s ease,
+			color 0.15s ease;
+		margin-left: 1px;
+	}
+	.product-badge:hover .product-badge-arrow {
+		color: var(--color-ink-light);
+		transform: translateX(2px);
+	}
+
+	/* Per-product accents -- dot color, hover border, hover background tint.
+	   Brand colors mirror the solution-card border-left accents. */
+	.product-badge-elasticsearch .product-badge-dot {
+		background: #fec514;
+	}
+	.product-badge-elasticsearch:hover {
+		border-color: #fec514;
+		background: rgb(254 197 20 / 0.06);
+	}
+	.product-badge-kibana .product-badge-dot {
+		background: #f04e98;
+	}
+	.product-badge-kibana:hover {
+		border-color: #f04e98;
+		background: rgb(240 78 152 / 0.05);
+	}
+	.product-badge-observability .product-badge-dot {
+		background: #0077cc;
+	}
+	.product-badge-observability:hover {
+		border-color: #0077cc;
+		background: rgb(0 119 204 / 0.05);
+	}
+	.product-badge-security .product-badge-dot {
+		background: #00bfb3;
+	}
+	.product-badge-security:hover {
+		border-color: #00bfb3;
+		background: rgb(0 191 179 / 0.06);
 	}
 
 	@media (max-width: 768px) {
diff --git a/src/Elastic.Markdown/Page/Index.cshtml b/src/Elastic.Markdown/Page/Index.cshtml
index d1ad409c34..ecb424eb54 100644
--- a/src/Elastic.Markdown/Page/Index.cshtml
+++ b/src/Elastic.Markdown/Page/Index.cshtml
@@ -92,9 +92,11 @@
 <section id="elastic-docs-v3">
 	@if (Model.CurrentDocument.YamlFrontMatter?.Layout != MarkdownPageLayout.Hub)
 	{
-		@* This way it's correctly rendered as <h1>text</h1> instead of <h1><p>text</p></h1> *@
-		@(new HtmlString(Markdown.ToHtml("# " + Model.TitleRaw)))
-		@await RenderPartialAsync(ProductBadges.Create(Model))
+		<div class="page-title-row">
+			@* This way it's correctly rendered as <h1>text</h1> instead of <h1><p>text</p></h1> *@
+			@(new HtmlString(Markdown.ToHtml("# " + Model.TitleRaw)))
+			@await RenderPartialAsync(ProductBadges.Create(Model))
+		</div>
 		@if (Model.AppliesTo is not null)
 		{
 			<p class="applies applies-block">
diff --git a/src/Elastic.Markdown/Page/ProductBadges.cshtml b/src/Elastic.Markdown/Page/ProductBadges.cshtml
index bc3066f2f1..0068712950 100644
--- a/src/Elastic.Markdown/Page/ProductBadges.cshtml
+++ b/src/Elastic.Markdown/Page/ProductBadges.cshtml
@@ -13,12 +13,16 @@
 }
 @if (withHubs.Count > 0)
 {
-	<ul class="product-badges" aria-label="Related product hubs">
+	<div class="product-badges" role="navigation" aria-label="Product hubs related to this page">
 		@foreach (var product in withHubs)
 		{
-			<li>
-				<a class="product-badge" href="@($"{prefix}/{product.Hub!.Trim('/')}/")">@product.DisplayName</a>
-			</li>
+			<a class="product-badge product-badge-@product.Id" href="@($"{prefix}/{product.Hub!.Trim('/')}/")">
+				<span class="product-badge-dot" aria-hidden="true"></span>
+				<span class="product-badge-label">@product.DisplayName</span>
+				<svg class="product-badge-arrow" width="11" height="11" viewBox="0 0 16 16" fill="none" aria-hidden="true">
+					<path d="M5 3l5 5-5 5" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+				</svg>
+			</a>
 		}
-	</ul>
+	</div>
 }

From 44810515918174866563db300eca0636be2d2791 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 1 May 2026 12:44:57 +0200
Subject: [PATCH 105/226] feat(hubs): point product badge URLs at the gist
 previews
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Until hub pages render through the assembler, product badges now link
to the rendered gist previews (htmlpreview.github.io). The gists are
the visual reference for the prototype anyway, so badges land on a
representative page even when the assembler can't yet wire in our own
hub markdown.

ProductBadges.cshtml detects absolute URLs (http(s)://) and:
- Opens them in a new tab (target=_blank rel=noopener)
- Renders an external-link arrow (↗) instead of the chevron
- Otherwise keeps the existing internal-pill rendering

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/products.yml                           |  4 +--
 .../Assets/markdown/hub.css                   | 27 ++++---------------
 src/Elastic.Markdown/Page/Index.cshtml        |  8 +++---
 .../Page/ProductBadges.cshtml                 | 24 ++++++++++++++---
 4 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/config/products.yml b/config/products.yml
index 7c0068ca81..da1fcb230a 100644
--- a/config/products.yml
+++ b/config/products.yml
@@ -147,7 +147,7 @@ products:
   elasticsearch:
     display: 'Elasticsearch'
     versioning: 'stack'
-    hub: 'testing/products/elasticsearch/9.0'
+    hub: 'https://htmlpreview.github.io/?https://gist.github.com/florent-leborgne/b2ddb83d7b849980d1668aef600d0139/raw/elasticsearch-hub.html'
   elasticsearch-client:
     display: 'Elasticsearch Client'
     versioning: 'stack'
@@ -208,7 +208,7 @@ products:
   kibana:
     display: 'Kibana'
     versioning: 'stack'
-    hub: 'testing/products/kibana/9.0'
+    hub: 'https://htmlpreview.github.io/?https://gist.github.com/florent-leborgne/c9075416b50ec111a09897b7be4462cc/raw/kibana-hub.html'
   logstash:
     display: 'Logstash'
     versioning: 'stack'
diff --git a/src/Elastic.Documentation.Site/Assets/markdown/hub.css b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
index eadafc1468..fad8a53880 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/hub.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
@@ -653,33 +653,16 @@
 		border-left-color: #00bfb3;
 	}
 
-	/* Page title row -- wraps the H1 and the product badges so they sit
-	   on the same baseline when there's room and stack on narrow screens. */
-	.page-title-row {
-		display: flex;
-		align-items: baseline;
-		flex-wrap: wrap;
-		gap: 8px 14px;
-		margin-bottom: 0.5em;
-	}
-	.page-title-row > .heading-wrapper,
-	.page-title-row > h1 {
-		margin-bottom: 0;
-	}
-
-	/* Product badges -- the inline-with-title pills that point at the
-	   matching product hub. Each pill has the product's accent dot, the
-	   product name, and a right-arrow chevron to read as clickable.
-	   The translateY offset lifts the pill so it sits at the H1's
-	   x-height rather than below its baseline. */
+	/* Product badges -- shown as a small meta strip between the
+	   breadcrumb and the H1. The negative top margin pulls the strip
+	   up tight against the breadcrumb's bottom padding (py-6 there). */
 	.product-badges {
-		display: inline-flex;
+		display: flex;
 		flex-wrap: wrap;
 		gap: 6px;
 		align-items: center;
-		margin: 0;
+		margin: -16px 0 14px 0;
 		padding: 0;
-		transform: translateY(-0.45em);
 	}
 
 	.product-badge {
diff --git a/src/Elastic.Markdown/Page/Index.cshtml b/src/Elastic.Markdown/Page/Index.cshtml
index ecb424eb54..0f9a650c4f 100644
--- a/src/Elastic.Markdown/Page/Index.cshtml
+++ b/src/Elastic.Markdown/Page/Index.cshtml
@@ -92,11 +92,9 @@
 <section id="elastic-docs-v3">
 	@if (Model.CurrentDocument.YamlFrontMatter?.Layout != MarkdownPageLayout.Hub)
 	{
-		<div class="page-title-row">
-			@* This way it's correctly rendered as <h1>text</h1> instead of <h1><p>text</p></h1> *@
-			@(new HtmlString(Markdown.ToHtml("# " + Model.TitleRaw)))
-			@await RenderPartialAsync(ProductBadges.Create(Model))
-		</div>
+		@await RenderPartialAsync(ProductBadges.Create(Model))
+		@* This way it's correctly rendered as <h1>text</h1> instead of <h1><p>text</p></h1> *@
+		@(new HtmlString(Markdown.ToHtml("# " + Model.TitleRaw)))
 		@if (Model.AppliesTo is not null)
 		{
 			<p class="applies applies-block">
diff --git a/src/Elastic.Markdown/Page/ProductBadges.cshtml b/src/Elastic.Markdown/Page/ProductBadges.cshtml
index 0068712950..1e0c972f16 100644
--- a/src/Elastic.Markdown/Page/ProductBadges.cshtml
+++ b/src/Elastic.Markdown/Page/ProductBadges.cshtml
@@ -16,12 +16,28 @@
 	<div class="product-badges" role="navigation" aria-label="Product hubs related to this page">
 		@foreach (var product in withHubs)
 		{
-			<a class="product-badge product-badge-@product.Id" href="@($"{prefix}/{product.Hub!.Trim('/')}/")">
+			var hub = product.Hub!;
+			var isExternal = hub.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
+				|| hub.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
+			var href = isExternal ? hub : $"{prefix}/{hub.Trim('/')}/";
+			<a class="product-badge product-badge-@product.Id"
+				href="@href"
+				@(isExternal ? new HtmlString("target=\"_blank\" rel=\"noopener\"") : HtmlString.Empty)>
 				<span class="product-badge-dot" aria-hidden="true"></span>
 				<span class="product-badge-label">@product.DisplayName</span>
-				<svg class="product-badge-arrow" width="11" height="11" viewBox="0 0 16 16" fill="none" aria-hidden="true">
-					<path d="M5 3l5 5-5 5" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-				</svg>
+				@if (isExternal)
+				{
+					<svg class="product-badge-arrow" width="11" height="11" viewBox="0 0 16 16" fill="currentColor" aria-hidden="true">
+						<path d="M8.75 1a.75.75 0 0 0 0 1.5h3.69L6.72 8.22a.75.75 0 0 0 1.06 1.06l5.72-5.72v3.69a.75.75 0 0 0 1.5 0v-5.5a.75.75 0 0 0-.75-.75h-5.5Z"/>
+						<path d="M3.5 3A1.5 1.5 0 0 0 2 4.5v8A1.5 1.5 0 0 0 3.5 14h8a1.5 1.5 0 0 0 1.5-1.5V10a.75.75 0 0 0-1.5 0v2.5h-8v-8H6A.75.75 0 0 0 6 3H3.5Z"/>
+					</svg>
+				}
+				else
+				{
+					<svg class="product-badge-arrow" width="11" height="11" viewBox="0 0 16 16" fill="none" aria-hidden="true">
+						<path d="M5 3l5 5-5 5" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+					</svg>
+				}
 			</a>
 		}
 	</div>

From 39fb863387b2c43f875dbf8b492a1f61379c6b2f Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 1 May 2026 15:06:58 +0200
Subject: [PATCH 106/226] =?UTF-8?q?Rename=20hub=20markdown=209.0.md=20?=
 =?UTF-8?q?=E2=86=92=20v9.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Aligns with the v9/v8 URL convention (v9+ is cumulative for v9 minors and
Serverless; older majors are only worth a single 8.19 / 7.17 entry).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docs/_docset.yml                                      | 4 ++--
 docs/testing/products/elasticsearch/{9.0.md => v9.md} | 0
 docs/testing/products/kibana/{9.0.md => v9.md}        | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename docs/testing/products/elasticsearch/{9.0.md => v9.md} (100%)
 rename docs/testing/products/kibana/{9.0.md => v9.md} (100%)

diff --git a/docs/_docset.yml b/docs/_docset.yml
index bd2d6c9980..d3a1f2db56 100644
--- a/docs/_docset.yml
+++ b/docs/_docset.yml
@@ -243,10 +243,10 @@ toc:
         children:
           - folder: elasticsearch
             children:
-              - file: 9.0.md
+              - file: v9.md
           - folder: kibana
             children:
-              - file: 9.0.md
+              - file: v9.md
       - file: kibana-settings-yaml-samples.md
       - file: security-settings.md
       - file: req.md
diff --git a/docs/testing/products/elasticsearch/9.0.md b/docs/testing/products/elasticsearch/v9.md
similarity index 100%
rename from docs/testing/products/elasticsearch/9.0.md
rename to docs/testing/products/elasticsearch/v9.md
diff --git a/docs/testing/products/kibana/9.0.md b/docs/testing/products/kibana/v9.md
similarity index 100%
rename from docs/testing/products/kibana/9.0.md
rename to docs/testing/products/kibana/v9.md

From 57ea08ed9827dc08b539b0e48c52fd361dbd9f6d Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 1 May 2026 15:21:17 +0200
Subject: [PATCH 107/226] Replace page-top product badges + applies-block with
 a metadata box

A single white card with a thin grey outline sits below the H1 and renders
up to four labeled rows, hidden when empty:

- Stack products: hub pills for products with `hub:` set in products.yml.
- Stack versions: applies_to.stack badges, plus applies_to.serverless when
  no deployment is specified.
- Deployments: applies_to.deployment badges, plus applies_to.serverless
  when a deployment is specified (so serverless lands in only one row).
- Other products: applies_to.product and per-component applicabilities
  (EDOT, APM agents, ECCTL, etc.).

Three new ApplicabilityBadgePlacement values drive the row-specific
collection logic; the existing renderer handles the rest. The hub layout
opts out via the Layout frontmatter check, same as before.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Assets/markdown/hub.css                   | 101 -------------
 .../Assets/markdown/metadata-box.css          | 134 ++++++++++++++++++
 .../Assets/styles.css                         |   1 +
 .../Myst/Components/ApplicableToViewModel.cs  |  60 +++++++-
 src/Elastic.Markdown/Page/Index.cshtml        |  13 +-
 src/Elastic.Markdown/Page/MetadataBox.cshtml  |  97 +++++++++++++
 .../Page/ProductBadges.cshtml                 |  44 ------
 7 files changed, 292 insertions(+), 158 deletions(-)
 create mode 100644 src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css
 create mode 100644 src/Elastic.Markdown/Page/MetadataBox.cshtml
 delete mode 100644 src/Elastic.Markdown/Page/ProductBadges.cshtml

diff --git a/src/Elastic.Documentation.Site/Assets/markdown/hub.css b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
index fad8a53880..8ea07978b8 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/hub.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
@@ -653,107 +653,6 @@
 		border-left-color: #00bfb3;
 	}
 
-	/* Product badges -- shown as a small meta strip between the
-	   breadcrumb and the H1. The negative top margin pulls the strip
-	   up tight against the breadcrumb's bottom padding (py-6 there). */
-	.product-badges {
-		display: flex;
-		flex-wrap: wrap;
-		gap: 6px;
-		align-items: center;
-		margin: -16px 0 14px 0;
-		padding: 0;
-	}
-
-	.product-badge {
-		display: inline-flex;
-		align-items: center;
-		gap: 7px;
-		padding: 3px 10px;
-		border-radius: 999px;
-		background: var(--color-white);
-		border: 1px solid var(--color-grey-20);
-		color: var(--color-ink-dark);
-		font-size: 12px;
-		font-weight: 500;
-		text-decoration: none;
-		line-height: 1.2;
-		transition:
-			border-color 0.15s ease,
-			background-color 0.15s ease,
-			color 0.15s ease,
-			box-shadow 0.15s ease,
-			transform 0.15s ease;
-	}
-	.product-badge:hover {
-		text-decoration: none;
-		color: var(--color-ink-dark);
-		box-shadow: 0 1px 3px rgb(0 0 0 / 0.08);
-		transform: translateY(-1px);
-	}
-	.product-badge:focus-visible {
-		outline: 2px solid var(--color-blue-elastic);
-		outline-offset: 2px;
-	}
-
-	/* Brand-color dot leading the pill. Every product gets its accent
-	   here -- recognizable at any size, no logo distortion. */
-	.product-badge-dot {
-		display: inline-block;
-		width: 7px;
-		height: 7px;
-		border-radius: 999px;
-		background: var(--color-grey-40);
-		flex-shrink: 0;
-	}
-	.product-badge-label {
-		display: inline-block;
-		white-space: nowrap;
-	}
-	.product-badge-arrow {
-		flex-shrink: 0;
-		color: var(--color-grey-40);
-		transition:
-			transform 0.15s ease,
-			color 0.15s ease;
-		margin-left: 1px;
-	}
-	.product-badge:hover .product-badge-arrow {
-		color: var(--color-ink-light);
-		transform: translateX(2px);
-	}
-
-	/* Per-product accents -- dot color, hover border, hover background tint.
-	   Brand colors mirror the solution-card border-left accents. */
-	.product-badge-elasticsearch .product-badge-dot {
-		background: #fec514;
-	}
-	.product-badge-elasticsearch:hover {
-		border-color: #fec514;
-		background: rgb(254 197 20 / 0.06);
-	}
-	.product-badge-kibana .product-badge-dot {
-		background: #f04e98;
-	}
-	.product-badge-kibana:hover {
-		border-color: #f04e98;
-		background: rgb(240 78 152 / 0.05);
-	}
-	.product-badge-observability .product-badge-dot {
-		background: #0077cc;
-	}
-	.product-badge-observability:hover {
-		border-color: #0077cc;
-		background: rgb(0 119 204 / 0.05);
-	}
-	.product-badge-security .product-badge-dot {
-		background: #00bfb3;
-	}
-	.product-badge-security:hover {
-		border-color: #00bfb3;
-		background: rgb(0 191 179 / 0.06);
-	}
-
 	@media (max-width: 768px) {
 		.hub-hero h1 {
 			font-size: 2rem;
diff --git a/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css b/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css
new file mode 100644
index 0000000000..c460c4926c
--- /dev/null
+++ b/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css
@@ -0,0 +1,134 @@
+/*
+ * Page-top metadata box. Sits below the H1 and above the body content.
+ * Up to four labeled rows: Stack products / Stack versions / Deployments /
+ * Other products. Hidden when no row has content. Hub layout opts out
+ * (the partial returns early when YamlFrontMatter.Layout is set).
+ */
+
+@layer components {
+	.metadata-box {
+		display: flex;
+		flex-direction: column;
+		gap: 6px;
+		margin: 0 0 24px 0;
+		padding: 10px 14px;
+		background: var(--color-white);
+		border: 1px solid var(--color-grey-20);
+		border-radius: 6px;
+		font-size: 13px;
+		line-height: 1.4;
+	}
+
+	.metadata-row {
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		gap: 6px 10px;
+		min-height: 24px;
+	}
+
+	.metadata-label {
+		flex: 0 0 auto;
+		min-width: 110px;
+		font-weight: 600;
+		color: var(--color-ink-dark);
+	}
+
+	.metadata-values {
+		display: inline-flex;
+		flex-wrap: wrap;
+		align-items: center;
+		gap: 6px;
+		min-width: 0;
+	}
+
+	@media (max-width: 640px) {
+		.metadata-row {
+			flex-direction: column;
+			align-items: flex-start;
+			gap: 4px;
+		}
+		.metadata-label {
+			min-width: 0;
+		}
+	}
+
+	/*
+	 * Product hub pills (used in the "Stack products" row of the metadata
+	 * box, and reusable elsewhere). Each pill is a brand-color dot + the
+	 * product display name.
+	 */
+	.product-badge {
+		display: inline-flex;
+		align-items: center;
+		gap: 7px;
+		padding: 2px 10px;
+		border-radius: 999px;
+		background: var(--color-white);
+		border: 1px solid var(--color-grey-20);
+		color: var(--color-ink-dark);
+		font-size: 12px;
+		font-weight: 500;
+		text-decoration: none;
+		line-height: 1.3;
+		transition:
+			border-color 0.15s ease,
+			background-color 0.15s ease,
+			color 0.15s ease,
+			box-shadow 0.15s ease,
+			transform 0.15s ease;
+	}
+	.product-badge:hover {
+		text-decoration: none;
+		color: var(--color-ink-dark);
+		box-shadow: 0 1px 3px rgb(0 0 0 / 0.08);
+		transform: translateY(-1px);
+	}
+	.product-badge:focus-visible {
+		outline: 2px solid var(--color-blue-elastic);
+		outline-offset: 2px;
+	}
+
+	.product-badge-dot {
+		display: inline-block;
+		width: 7px;
+		height: 7px;
+		border-radius: 999px;
+		background: var(--color-grey-40);
+		flex-shrink: 0;
+	}
+	.product-badge-label {
+		display: inline-block;
+		white-space: nowrap;
+	}
+
+	/* Per-product accents -- mirrors hub solution-card border colors. */
+	.product-badge-elasticsearch .product-badge-dot {
+		background: #fec514;
+	}
+	.product-badge-elasticsearch:hover {
+		border-color: #fec514;
+		background: rgb(254 197 20 / 0.06);
+	}
+	.product-badge-kibana .product-badge-dot {
+		background: #f04e98;
+	}
+	.product-badge-kibana:hover {
+		border-color: #f04e98;
+		background: rgb(240 78 152 / 0.05);
+	}
+	.product-badge-observability .product-badge-dot {
+		background: #0077cc;
+	}
+	.product-badge-observability:hover {
+		border-color: #0077cc;
+		background: rgb(0 119 204 / 0.05);
+	}
+	.product-badge-security .product-badge-dot {
+		background: #00bfb3;
+	}
+	.product-badge-security:hover {
+		border-color: #00bfb3;
+		background: rgb(0 191 179 / 0.06);
+	}
+}
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 6ce8ef6141..e3f115e1d8 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -28,6 +28,7 @@
 @import './markdown/button.css';
 @import './markdown/agent-skill.css';
 @import './markdown/hub.css';
+@import './markdown/metadata-box.css';
 @import './markdown/contributors.css';
 @import './api-docs.css';
 @import 'tippy.js/dist/tippy.css';
diff --git a/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs b/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs
index 82afa2ce5f..7dffae80ea 100644
--- a/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs
+++ b/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs
@@ -16,7 +16,13 @@ public enum ApplicabilityBadgePlacement
 	/// <summary>Elastic Stack (and generic product) availability next to the setting name.</summary>
 	StackRow,
 	/// <summary>Deployment, serverless, and product-specific agents on a &quot;Supported on&quot; line.</summary>
-	SupportedOnRow
+	SupportedOnRow,
+	/// <summary>Stack versions row of the page-top metadata box: <c>applies_to.stack</c> + <c>applies_to.serverless</c> when no deployment is specified.</summary>
+	StackVersionsRow,
+	/// <summary>Deployments row of the page-top metadata box: <c>applies_to.deployment</c> + <c>applies_to.serverless</c> when a deployment is specified.</summary>
+	DeploymentsRow,
+	/// <summary>Other products row of the page-top metadata box: <c>applies_to.product</c> and per-product applicabilities (agents, EDOT, etc.).</summary>
+	OtherProductsRow
 }
 
 public class ApplicableToViewModel
@@ -79,6 +85,9 @@ public IReadOnlyCollection<ApplicabilityItem> GetApplicabilityItems()
 		{
 			ApplicabilityBadgePlacement.StackRow => CollectStackRowRaw(),
 			ApplicabilityBadgePlacement.SupportedOnRow => CollectSupportedOnRaw(),
+			ApplicabilityBadgePlacement.StackVersionsRow => CollectStackVersionsRowRaw(),
+			ApplicabilityBadgePlacement.DeploymentsRow => CollectDeploymentsRowRaw(),
+			ApplicabilityBadgePlacement.OtherProductsRow => CollectOtherProductsRowRaw(),
 			_ => CollectCombinedRaw()
 		};
 
@@ -154,6 +163,55 @@ AppliesTo.Serverless is null &&
 			.ToList();
 	}
 
+	private List<RawApplicabilityItem> CollectStackVersionsRowRaw()
+	{
+		var rawItems = new List<RawApplicabilityItem>();
+
+		if (AppliesTo.Stack is not null)
+			rawItems.AddRange(CollectFromCollection(AppliesTo.Stack, ApplicabilityMappings.Stack));
+
+		if (AppliesTo.Deployment is null && AppliesTo.Serverless is not null)
+		{
+			rawItems.AddRange(AppliesTo.Serverless.AllProjects is not null
+				? CollectFromCollection(AppliesTo.Serverless.AllProjects, ApplicabilityMappings.Serverless)
+				: CollectFromMappings(AppliesTo.Serverless, ServerlessMappings));
+		}
+
+		return rawItems;
+	}
+
+	private List<RawApplicabilityItem> CollectDeploymentsRowRaw()
+	{
+		var rawItems = new List<RawApplicabilityItem>();
+
+		if (AppliesTo.Deployment is not null)
+		{
+			rawItems.AddRange(CollectFromMappings(AppliesTo.Deployment, DeploymentMappings));
+
+			if (AppliesTo.Serverless is not null)
+			{
+				rawItems.AddRange(AppliesTo.Serverless.AllProjects is not null
+					? CollectFromCollection(AppliesTo.Serverless.AllProjects, ApplicabilityMappings.Serverless)
+					: CollectFromMappings(AppliesTo.Serverless, ServerlessMappings));
+			}
+		}
+
+		return rawItems;
+	}
+
+	private List<RawApplicabilityItem> CollectOtherProductsRowRaw()
+	{
+		var rawItems = new List<RawApplicabilityItem>();
+
+		if (AppliesTo.ProductApplicability is not null)
+			rawItems.AddRange(CollectFromMappings(AppliesTo.ProductApplicability, ProductMappings));
+
+		if (AppliesTo.Product is not null)
+			rawItems.AddRange(CollectFromCollection(AppliesTo.Product, ApplicabilityMappings.Product));
+
+		return rawItems;
+	}
+
 	private static bool IsGenericGa(AppliesCollection collection)
 	{
 		if (collection.Count != 1)
diff --git a/src/Elastic.Markdown/Page/Index.cshtml b/src/Elastic.Markdown/Page/Index.cshtml
index 0f9a650c4f..70ca017a50 100644
--- a/src/Elastic.Markdown/Page/Index.cshtml
+++ b/src/Elastic.Markdown/Page/Index.cshtml
@@ -92,20 +92,9 @@
 <section id="elastic-docs-v3">
 	@if (Model.CurrentDocument.YamlFrontMatter?.Layout != MarkdownPageLayout.Hub)
 	{
-		@await RenderPartialAsync(ProductBadges.Create(Model))
 		@* This way it's correctly rendered as <h1>text</h1> instead of <h1><p>text</p></h1> *@
 		@(new HtmlString(Markdown.ToHtml("# " + Model.TitleRaw)))
-		@if (Model.AppliesTo is not null)
-		{
-			<p class="applies applies-block">
-			@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
-			{
-				AppliesTo = Model.AppliesTo,
-				Inline = false,
-				VersionsConfig = Model.VersionsConfig
-			}))
-			</p>
-		}
+		@await RenderPartialAsync(MetadataBox.Create(Model))
 	}
 	@(new HtmlString(Model.MarkdownHtml))
 </section>
diff --git a/src/Elastic.Markdown/Page/MetadataBox.cshtml b/src/Elastic.Markdown/Page/MetadataBox.cshtml
new file mode 100644
index 0000000000..02b5b3107e
--- /dev/null
+++ b/src/Elastic.Markdown/Page/MetadataBox.cshtml
@@ -0,0 +1,97 @@
+@inherits RazorSlice<Elastic.Markdown.Page.IndexViewModel>
+@using Elastic.Markdown.Myst.Components
+@{
+	var layout = Model.CurrentDocument.YamlFrontMatter?.Layout;
+	if (layout is not null)
+		return;
+
+	var prefix = Model.UrlPathPrefix?.TrimEnd('/') ?? string.Empty;
+	var productHubs = Model.Products
+		.Where(p => !string.IsNullOrWhiteSpace(p.Hub))
+		.OrderBy(p => p.DisplayName, StringComparer.Ordinal)
+		.ToList();
+
+	var hasStackVersions = false;
+	var hasDeployments = false;
+	var hasOtherProducts = false;
+	if (Model.AppliesTo is not null)
+	{
+		hasStackVersions = Model.AppliesTo.Stack is not null
+			|| (Model.AppliesTo.Deployment is null && Model.AppliesTo.Serverless is not null);
+		hasDeployments = Model.AppliesTo.Deployment is not null;
+		hasOtherProducts = Model.AppliesTo.ProductApplicability is not null
+			|| Model.AppliesTo.Product is not null;
+	}
+
+	var hasProducts = productHubs.Count > 0;
+	if (!hasProducts && !hasStackVersions && !hasDeployments && !hasOtherProducts)
+		return;
+}
+<aside class="metadata-box" aria-label="Page metadata">
+	@if (hasProducts)
+	{
+		<div class="metadata-row metadata-row-products">
+			<span class="metadata-label">Stack products</span>
+			<div class="metadata-values">
+				@foreach (var product in productHubs)
+				{
+					var hub = product.Hub!;
+					var isExternal = hub.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
+						|| hub.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
+					var href = isExternal ? hub : $"{prefix}/{hub.Trim('/')}/";
+					<a class="product-badge product-badge-@product.Id"
+						href="@href"
+						@(isExternal ? new HtmlString("target=\"_blank\" rel=\"noopener\"") : HtmlString.Empty)>
+						<span class="product-badge-dot" aria-hidden="true"></span>
+						<span class="product-badge-label">@product.DisplayName</span>
+					</a>
+				}
+			</div>
+		</div>
+	}
+	@if (hasStackVersions)
+	{
+		<div class="metadata-row metadata-row-versions">
+			<span class="metadata-label">Stack versions</span>
+			<div class="metadata-values">
+				@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
+				{
+					AppliesTo = Model.AppliesTo!,
+					Inline = true,
+					VersionsConfig = Model.VersionsConfig,
+					BadgePlacement = ApplicabilityBadgePlacement.StackVersionsRow
+				}))
+			</div>
+		</div>
+	}
+	@if (hasDeployments)
+	{
+		<div class="metadata-row metadata-row-deployments">
+			<span class="metadata-label">Deployments</span>
+			<div class="metadata-values">
+				@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
+				{
+					AppliesTo = Model.AppliesTo!,
+					Inline = true,
+					VersionsConfig = Model.VersionsConfig,
+					BadgePlacement = ApplicabilityBadgePlacement.DeploymentsRow
+				}))
+			</div>
+		</div>
+	}
+	@if (hasOtherProducts)
+	{
+		<div class="metadata-row metadata-row-other-products">
+			<span class="metadata-label">Other products</span>
+			<div class="metadata-values">
+				@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
+				{
+					AppliesTo = Model.AppliesTo!,
+					Inline = true,
+					VersionsConfig = Model.VersionsConfig,
+					BadgePlacement = ApplicabilityBadgePlacement.OtherProductsRow
+				}))
+			</div>
+		</div>
+	}
+</aside>
diff --git a/src/Elastic.Markdown/Page/ProductBadges.cshtml b/src/Elastic.Markdown/Page/ProductBadges.cshtml
deleted file mode 100644
index 1e0c972f16..0000000000
--- a/src/Elastic.Markdown/Page/ProductBadges.cshtml
+++ /dev/null
@@ -1,44 +0,0 @@
-@inherits RazorSlice<Elastic.Markdown.Page.IndexViewModel>
-@{
-	// Hide on layouts that own the page chrome themselves (hub, landing, archive, search).
-	var layout = Model.CurrentDocument.YamlFrontMatter?.Layout;
-	var skip = layout is not null;
-	var withHubs = skip
-		? []
-		: Model.Products
-			.Where(p => !string.IsNullOrWhiteSpace(p.Hub))
-			.OrderBy(p => p.DisplayName, StringComparer.Ordinal)
-			.ToList();
-	var prefix = Model.UrlPathPrefix?.TrimEnd('/') ?? string.Empty;
-}
-@if (withHubs.Count > 0)
-{
-	<div class="product-badges" role="navigation" aria-label="Product hubs related to this page">
-		@foreach (var product in withHubs)
-		{
-			var hub = product.Hub!;
-			var isExternal = hub.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
-				|| hub.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
-			var href = isExternal ? hub : $"{prefix}/{hub.Trim('/')}/";
-			<a class="product-badge product-badge-@product.Id"
-				href="@href"
-				@(isExternal ? new HtmlString("target=\"_blank\" rel=\"noopener\"") : HtmlString.Empty)>
-				<span class="product-badge-dot" aria-hidden="true"></span>
-				<span class="product-badge-label">@product.DisplayName</span>
-				@if (isExternal)
-				{
-					<svg class="product-badge-arrow" width="11" height="11" viewBox="0 0 16 16" fill="currentColor" aria-hidden="true">
-						<path d="M8.75 1a.75.75 0 0 0 0 1.5h3.69L6.72 8.22a.75.75 0 0 0 1.06 1.06l5.72-5.72v3.69a.75.75 0 0 0 1.5 0v-5.5a.75.75 0 0 0-.75-.75h-5.5Z"/>
-						<path d="M3.5 3A1.5 1.5 0 0 0 2 4.5v8A1.5 1.5 0 0 0 3.5 14h8a1.5 1.5 0 0 0 1.5-1.5V10a.75.75 0 0 0-1.5 0v2.5h-8v-8H6A.75.75 0 0 0 6 3H3.5Z"/>
-					</svg>
-				}
-				else
-				{
-					<svg class="product-badge-arrow" width="11" height="11" viewBox="0 0 16 16" fill="none" aria-hidden="true">
-						<path d="M5 3l5 5-5 5" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-					</svg>
-				}
-			</a>
-		}
-	</div>
-}

From d0c449715648d2c98186a0adbcbed88962f2fe3c Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 1 May 2026 16:44:41 +0200
Subject: [PATCH 108/226] Restructure page-top metadata: product pills above
 H1, Requirements box below
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The previous metadata box mixed product pills (navigation) with applies_to
badges (metadata) in one container, which conflated two distinct concerns.
Splitting them gives each a clear role:

- ProductPills.cshtml renders the brand-dotted hub pills above the H1,
  styled as nav affordances (dark-grey label, → arrow, no link underline).
- MetadataBox.cshtml renders applies_to data below the H1 in a collapsible
  "Requirements" box (Versions / Deployments / Subscription rows). The
  Subscription row is a placeholder ("Enterprise") until that metadata
  exists. Multiple values within a row are separated by an italic "or".
- A thin divider sits between the H1 and the box to mark the page-top
  chrome boundary.

Final styling and placement are a working baseline; refinement is for the
design pass. The structural split is the part that matters and unblocks
adding more page-level metadata systems (e.g. licensing) without piling
loose badges at the page top.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Assets/markdown/metadata-box.css          | 228 +++++++++++++-----
 src/Elastic.Markdown/Page/Index.cshtml        |   2 +
 src/Elastic.Markdown/Page/MetadataBox.cshtml  | 120 ++++-----
 src/Elastic.Markdown/Page/ProductPills.cshtml |  29 +++
 4 files changed, 249 insertions(+), 130 deletions(-)
 create mode 100644 src/Elastic.Markdown/Page/ProductPills.cshtml

diff --git a/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css b/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css
index c460c4926c..08e6357a16 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css
@@ -1,64 +1,41 @@
 /*
- * Page-top metadata box. Sits below the H1 and above the body content.
- * Up to four labeled rows: Stack products / Stack versions / Deployments /
- * Other products. Hidden when no row has content. Hub layout opts out
- * (the partial returns early when YamlFrontMatter.Layout is set).
+ * Page-top product pills + Requirements box. The pills sit just below the
+ * H1 (one per `products:` frontmatter entry whose product has `hub:` set);
+ * the box sits below the pills and surfaces applies_to-driven metadata in
+ * a labeled two-column layout. Hub layout opts out (the partials return
+ * early when YamlFrontMatter.Layout is set).
  */
 
 @layer components {
-	.metadata-box {
-		display: flex;
-		flex-direction: column;
-		gap: 6px;
-		margin: 0 0 24px 0;
-		padding: 10px 14px;
-		background: var(--color-white);
-		border: 1px solid var(--color-grey-20);
-		border-radius: 6px;
-		font-size: 13px;
-		line-height: 1.4;
+	/*
+	 * Product hub pills below the H1. Brand-color dot + display name.
+	 */
+	/* Thin separator that sits between the H1 and the Requirements box,
+	   carrying the visual weight the old applies-to summary line used to
+	   provide. Keeps the page-top chrome anchored. */
+	.page-meta-divider {
+		height: 0;
+		margin: 18px 0;
+		border: none;
+		border-top: 1px solid var(--color-grey-20);
 	}
 
-	.metadata-row {
+	.product-pills {
 		display: flex;
 		flex-wrap: wrap;
-		align-items: center;
-		gap: 6px 10px;
-		min-height: 24px;
-	}
-
-	.metadata-label {
-		flex: 0 0 auto;
-		min-width: 110px;
-		font-weight: 600;
-		color: var(--color-ink-dark);
-	}
-
-	.metadata-values {
-		display: inline-flex;
-		flex-wrap: wrap;
-		align-items: center;
 		gap: 6px;
-		min-width: 0;
-	}
-
-	@media (max-width: 640px) {
-		.metadata-row {
-			flex-direction: column;
-			align-items: flex-start;
-			gap: 4px;
-		}
-		.metadata-label {
-			min-width: 0;
-		}
+		align-items: center;
+		/* Pull tight against the breadcrumb's bottom padding so the pills
+		   read as part of the breadcrumb strip, not a separate row. */
+		margin: -16px 0 14px 0;
 	}
 
-	/*
-	 * Product hub pills (used in the "Stack products" row of the metadata
-	 * box, and reusable elsewhere). Each pill is a brand-color dot + the
-	 * product display name.
-	 */
-	.product-badge {
+	/* Override `.markdown-content a` (blue + underline) with a more
+	   specific selector. Pills are nav affordances, not body links.
+	   `!important` on color + decoration is a safety net against any
+	   utility-layer rules that beat us on cascade order. */
+	.markdown-content a.product-badge,
+	a.product-badge {
 		display: inline-flex;
 		align-items: center;
 		gap: 7px;
@@ -66,10 +43,10 @@
 		border-radius: 999px;
 		background: var(--color-white);
 		border: 1px solid var(--color-grey-20);
-		color: var(--color-ink-dark);
+		color: var(--color-ink-dark) !important;
 		font-size: 12px;
-		font-weight: 500;
-		text-decoration: none;
+		font-weight: 600;
+		text-decoration: none !important;
 		line-height: 1.3;
 		transition:
 			border-color 0.15s ease,
@@ -78,12 +55,28 @@
 			box-shadow 0.15s ease,
 			transform 0.15s ease;
 	}
-	.product-badge:hover {
-		text-decoration: none;
-		color: var(--color-ink-dark);
+	.markdown-content a.product-badge:hover,
+	a.product-badge:hover {
+		text-decoration: none !important;
+		color: var(--color-ink-dark) !important;
 		box-shadow: 0 1px 3px rgb(0 0 0 / 0.08);
 		transform: translateY(-1px);
 	}
+
+	.product-badge-arrow {
+		flex-shrink: 0;
+		color: var(--color-grey-50);
+		font-size: 13px;
+		line-height: 1;
+		margin-left: 1px;
+		transition:
+			transform 0.15s ease,
+			color 0.15s ease;
+	}
+	.product-badge:hover .product-badge-arrow {
+		color: var(--color-ink-light);
+		transform: translateX(2px);
+	}
 	.product-badge:focus-visible {
 		outline: 2px solid var(--color-blue-elastic);
 		outline-offset: 2px;
@@ -131,4 +124,127 @@
 		border-color: #00bfb3;
 		background: rgb(0 191 179 / 0.06);
 	}
+
+	/*
+	 * Requirements box. Two columns: a heading on the left that titles the
+	 * whole box, and a stack of labeled rows on the right. Hidden when no
+	 * applies_to-driven row would render.
+	 */
+	.metadata-box {
+		margin: 16px 0 24px 0;
+		padding: 8px 14px;
+		background: var(--color-grey-10);
+		border: 1px solid var(--color-grey-20);
+		border-radius: 6px;
+		font-size: 13px;
+		line-height: 1.4;
+	}
+
+	.metadata-box-heading {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 12px;
+		cursor: pointer;
+		list-style: none;
+		padding: 4px 0;
+		font-size: 14px;
+		font-weight: 600;
+		color: var(--color-ink-dark);
+		user-select: none;
+	}
+	.metadata-box-heading::-webkit-details-marker {
+		display: none;
+	}
+	.metadata-box-heading:focus-visible {
+		outline: 2px solid var(--color-blue-elastic);
+		outline-offset: 2px;
+		border-radius: 3px;
+	}
+
+	.metadata-box-chevron {
+		flex-shrink: 0;
+		color: var(--color-grey-60);
+		transition: transform 0.15s ease;
+	}
+	.metadata-box[open] .metadata-box-chevron {
+		transform: rotate(180deg);
+	}
+
+	.metadata-box-rows {
+		display: flex;
+		flex-direction: column;
+		gap: 4px;
+		margin-top: 8px;
+		padding-top: 10px;
+		border-top: 1px solid var(--color-grey-20);
+	}
+
+	.metadata-row {
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		gap: 6px 10px;
+		min-height: 24px;
+	}
+
+	.metadata-label {
+		flex: 0 0 auto;
+		min-width: 100px;
+		font-weight: 600;
+		color: var(--color-ink-dark);
+	}
+
+	.metadata-values {
+		display: inline-flex;
+		flex-wrap: wrap;
+		align-items: center;
+		row-gap: 4px;
+		min-width: 0;
+	}
+
+	/*
+	 * When the row has multiple entries, separate them with "or". Override
+	 * the global `.applies applies-to-popover { display: contents }` so the
+	 * popover's ::before generates a real separator inline.
+	 */
+	.metadata-values.applies applies-to-popover {
+		display: inline-flex;
+		align-items: center;
+	}
+	.metadata-values > * + *::before {
+		content: 'or';
+		margin: 0 8px;
+		color: var(--color-ink-light);
+		font-size: 12px;
+		font-style: italic;
+	}
+
+	/*
+	 * Plain pill for placeholder values like the Subscription row, until
+	 * real metadata replaces it. Visually quieter than the applies_to
+	 * popover badges so it reads as informational, not interactive.
+	 */
+	.metadata-pill {
+		display: inline-flex;
+		align-items: center;
+		padding: 2px 10px;
+		border-radius: 999px;
+		background: var(--color-white);
+		border: 1px solid var(--color-grey-20);
+		color: var(--color-ink-dark);
+		font-size: 12px;
+		line-height: 1.3;
+	}
+
+	@media (max-width: 640px) {
+		.metadata-row {
+			flex-direction: column;
+			align-items: flex-start;
+			gap: 4px;
+		}
+		.metadata-label {
+			min-width: 0;
+		}
+	}
 }
diff --git a/src/Elastic.Markdown/Page/Index.cshtml b/src/Elastic.Markdown/Page/Index.cshtml
index 70ca017a50..4f89660c1c 100644
--- a/src/Elastic.Markdown/Page/Index.cshtml
+++ b/src/Elastic.Markdown/Page/Index.cshtml
@@ -92,8 +92,10 @@
 <section id="elastic-docs-v3">
 	@if (Model.CurrentDocument.YamlFrontMatter?.Layout != MarkdownPageLayout.Hub)
 	{
+		@await RenderPartialAsync(ProductPills.Create(Model))
 		@* This way it's correctly rendered as <h1>text</h1> instead of <h1><p>text</p></h1> *@
 		@(new HtmlString(Markdown.ToHtml("# " + Model.TitleRaw)))
+		<hr class="page-meta-divider" />
 		@await RenderPartialAsync(MetadataBox.Create(Model))
 	}
 	@(new HtmlString(Model.MarkdownHtml))
diff --git a/src/Elastic.Markdown/Page/MetadataBox.cshtml b/src/Elastic.Markdown/Page/MetadataBox.cshtml
index 02b5b3107e..0b49d8dffd 100644
--- a/src/Elastic.Markdown/Page/MetadataBox.cshtml
+++ b/src/Elastic.Markdown/Page/MetadataBox.cshtml
@@ -5,93 +5,65 @@
 	if (layout is not null)
 		return;
 
-	var prefix = Model.UrlPathPrefix?.TrimEnd('/') ?? string.Empty;
-	var productHubs = Model.Products
-		.Where(p => !string.IsNullOrWhiteSpace(p.Hub))
-		.OrderBy(p => p.DisplayName, StringComparer.Ordinal)
-		.ToList();
-
 	var hasStackVersions = false;
 	var hasDeployments = false;
-	var hasOtherProducts = false;
 	if (Model.AppliesTo is not null)
 	{
 		hasStackVersions = Model.AppliesTo.Stack is not null
 			|| (Model.AppliesTo.Deployment is null && Model.AppliesTo.Serverless is not null);
 		hasDeployments = Model.AppliesTo.Deployment is not null;
-		hasOtherProducts = Model.AppliesTo.ProductApplicability is not null
-			|| Model.AppliesTo.Product is not null;
 	}
 
-	var hasProducts = productHubs.Count > 0;
-	if (!hasProducts && !hasStackVersions && !hasDeployments && !hasOtherProducts)
+	// Subscription is a placeholder until the metadata exists. Hardcoded so the
+	// row is always visible alongside the real applies_to data.
+	const string subscriptionPlaceholder = "Enterprise";
+
+	if (!hasStackVersions && !hasDeployments)
 		return;
 }
-<aside class="metadata-box" aria-label="Page metadata">
-	@if (hasProducts)
-	{
-		<div class="metadata-row metadata-row-products">
-			<span class="metadata-label">Stack products</span>
-			<div class="metadata-values">
-				@foreach (var product in productHubs)
-				{
-					var hub = product.Hub!;
-					var isExternal = hub.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
-						|| hub.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
-					var href = isExternal ? hub : $"{prefix}/{hub.Trim('/')}/";
-					<a class="product-badge product-badge-@product.Id"
-						href="@href"
-						@(isExternal ? new HtmlString("target=\"_blank\" rel=\"noopener\"") : HtmlString.Empty)>
-						<span class="product-badge-dot" aria-hidden="true"></span>
-						<span class="product-badge-label">@product.DisplayName</span>
-					</a>
-				}
+<details class="metadata-box" open aria-label="Page requirements">
+	<summary class="metadata-box-heading">
+		<span class="metadata-box-title">Requirements</span>
+		<svg class="metadata-box-chevron" width="14" height="14" viewBox="0 0 16 16" fill="none" aria-hidden="true">
+			<path d="M4 6l4 4 4-4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+		</svg>
+	</summary>
+	<div class="metadata-box-rows">
+		@if (hasStackVersions)
+		{
+			<div class="metadata-row metadata-row-versions">
+				<span class="metadata-label">Versions</span>
+				<div class="metadata-values applies">
+					@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
+					{
+						AppliesTo = Model.AppliesTo!,
+						Inline = false,
+						VersionsConfig = Model.VersionsConfig,
+						BadgePlacement = ApplicabilityBadgePlacement.StackVersionsRow
+					}))
+				</div>
 			</div>
-		</div>
-	}
-	@if (hasStackVersions)
-	{
-		<div class="metadata-row metadata-row-versions">
-			<span class="metadata-label">Stack versions</span>
-			<div class="metadata-values">
-				@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
-				{
-					AppliesTo = Model.AppliesTo!,
-					Inline = true,
-					VersionsConfig = Model.VersionsConfig,
-					BadgePlacement = ApplicabilityBadgePlacement.StackVersionsRow
-				}))
+		}
+		@if (hasDeployments)
+		{
+			<div class="metadata-row metadata-row-deployments">
+				<span class="metadata-label">Deployments</span>
+				<div class="metadata-values applies">
+					@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
+					{
+						AppliesTo = Model.AppliesTo!,
+						Inline = false,
+						VersionsConfig = Model.VersionsConfig,
+						BadgePlacement = ApplicabilityBadgePlacement.DeploymentsRow
+					}))
+				</div>
 			</div>
-		</div>
-	}
-	@if (hasDeployments)
-	{
-		<div class="metadata-row metadata-row-deployments">
-			<span class="metadata-label">Deployments</span>
-			<div class="metadata-values">
-				@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
-				{
-					AppliesTo = Model.AppliesTo!,
-					Inline = true,
-					VersionsConfig = Model.VersionsConfig,
-					BadgePlacement = ApplicabilityBadgePlacement.DeploymentsRow
-				}))
-			</div>
-		</div>
-	}
-	@if (hasOtherProducts)
-	{
-		<div class="metadata-row metadata-row-other-products">
-			<span class="metadata-label">Other products</span>
+		}
+		<div class="metadata-row metadata-row-subscription">
+			<span class="metadata-label">Subscription</span>
 			<div class="metadata-values">
-				@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
-				{
-					AppliesTo = Model.AppliesTo!,
-					Inline = true,
-					VersionsConfig = Model.VersionsConfig,
-					BadgePlacement = ApplicabilityBadgePlacement.OtherProductsRow
-				}))
+				<span class="metadata-pill">@subscriptionPlaceholder</span>
 			</div>
 		</div>
-	}
-</aside>
+	</div>
+</details>
diff --git a/src/Elastic.Markdown/Page/ProductPills.cshtml b/src/Elastic.Markdown/Page/ProductPills.cshtml
new file mode 100644
index 0000000000..f601189ff6
--- /dev/null
+++ b/src/Elastic.Markdown/Page/ProductPills.cshtml
@@ -0,0 +1,29 @@
+@inherits RazorSlice<Elastic.Markdown.Page.IndexViewModel>
+@{
+	var layout = Model.CurrentDocument.YamlFrontMatter?.Layout;
+	if (layout is not null)
+		return;
+
+	var prefix = Model.UrlPathPrefix?.TrimEnd('/') ?? string.Empty;
+	var productHubs = Model.Products
+		.Where(p => !string.IsNullOrWhiteSpace(p.Hub))
+		.OrderBy(p => p.DisplayName, StringComparer.Ordinal)
+		.ToList();
+
+	if (productHubs.Count == 0)
+		return;
+}
+<div class="product-pills" role="navigation" aria-label="Product hubs related to this page">
+	@foreach (var product in productHubs)
+	{
+		var hub = product.Hub!;
+		var isAbsolute = hub.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
+			|| hub.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
+		var href = isAbsolute ? hub : $"{prefix}/{hub.Trim('/')}/";
+		<a class="product-badge product-badge-@product.Id" href="@href">
+			<span class="product-badge-dot" aria-hidden="true"></span>
+			<span class="product-badge-label">@product.DisplayName</span>
+			<span class="product-badge-arrow" aria-hidden="true">&rarr;</span>
+		</a>
+	}
+</div>

From f5fea776f24cbd9c49f96c9a1415751ec4369cd4 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 4 May 2026 14:03:46 +0200
Subject: [PATCH 109/226] fix: remove unnecessary null-forgiving operators
 flagged as IDE0370

The compiler already proves non-null via the IsNullOrWhiteSpace guards,
so the ! suppressions are redundant and treated as errors by the analyzer.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 src/Elastic.Markdown/IO/MarkdownFile.cs                       | 2 +-
 src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs | 4 ++--
 src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageBlock.cs   | 4 ++--
 src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Elastic.Markdown/IO/MarkdownFile.cs b/src/Elastic.Markdown/IO/MarkdownFile.cs
index 84edc11c79..42500c9123 100644
--- a/src/Elastic.Markdown/IO/MarkdownFile.cs
+++ b/src/Elastic.Markdown/IO/MarkdownFile.cs
@@ -175,7 +175,7 @@ protected void ReadDocumentInstructions(MarkdownDocument document, Func<string,
 				.FirstOrDefault()?
 				.Title;
 			if (!string.IsNullOrWhiteSpace(heroTitle))
-				Title = heroTitle!;
+				Title = heroTitle;
 		}
 
 		var yamlFrontMatter = ProcessYamlFrontMatter(document);
diff --git a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
index 68341d7069..182d9057df 100644
--- a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
@@ -355,11 +355,11 @@ private static void WriteHero(HtmlRenderer renderer, HeroBlock block)
 	{
 		var releasesHtml = string.IsNullOrWhiteSpace(block.Releases)
 			? null
-			: RenderInlineMarkdown(block.Releases!);
+			: RenderInlineMarkdown(block.Releases);
 
 		var descriptionHtml = string.IsNullOrWhiteSpace(block.Description)
 			? null
-			: RenderInlineMarkdown(block.Description!);
+			: RenderInlineMarkdown(block.Description);
 
 		var slice = HeroView.Create(new HeroViewModel
 		{
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageBlock.cs
index adb9fc9e04..11f6f9a382 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/OnThisPageBlock.cs
@@ -40,10 +40,10 @@ public IReadOnlyList<OnThisPageItem> CollectItems()
 			switch (descendant)
 			{
 				case CardGroupBlock g when !string.IsNullOrWhiteSpace(g.Anchor) && !string.IsNullOrWhiteSpace(g.Title):
-					items.Add(new OnThisPageItem(g.Title!, g.Anchor!));
+					items.Add(new OnThisPageItem(g.Title, g.Anchor));
 					break;
 				case WhatsNewBlock w when !string.IsNullOrWhiteSpace(w.Data.Id) && !string.IsNullOrWhiteSpace(w.Data.Title):
-					items.Add(new OnThisPageItem(w.Data.Title!, w.Data.Id!));
+					items.Add(new OnThisPageItem(w.Data.Title, w.Data.Id));
 					break;
 			}
 		}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
index 59202757cc..f61250d815 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
@@ -42,7 +42,7 @@ public override void FinalizeAndValidate(ParserContext context)
 
 		if (!string.IsNullOrWhiteSpace(product))
 		{
-			var resolved = LoadFromCentralConfig(product!);
+			var resolved = LoadFromCentralConfig(product);
 			if (resolved is null)
 			{
 				this.EmitError($"{{whats-new}} :product: '{product}' was not found in config/whats-new.yml.");
@@ -94,7 +94,7 @@ public override void FinalizeAndValidate(ParserContext context)
 	}
 
 	public override IEnumerable<string> GeneratedAnchors =>
-		string.IsNullOrWhiteSpace(Data.Id) ? [] : [Data.Id!];
+		string.IsNullOrWhiteSpace(Data.Id) ? [] : [Data.Id];
 }
 
 [YamlSerializable]

From 04f59da5b7c97688ed4b3009fcbc3f1e96b02322 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 4 May 2026 14:14:22 +0200
Subject: [PATCH 110/226] fix(tests): filter page-title-row div from HTML
 assertions

hub-pages moved the H1 title into a `div.page-title-row` wrapper
(alongside product badges). The test framework's prettyHtml filter
only stripped bare H1 as the first section child; update it to also
strip any element with class page-title-row so tests don't need to
include the title wrapper in their expected HTML snippets.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 tests/authoring/Framework/HtmlAssertions.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/authoring/Framework/HtmlAssertions.fs b/tests/authoring/Framework/HtmlAssertions.fs
index eaa648d322..0f025cfe01 100644
--- a/tests/authoring/Framework/HtmlAssertions.fs
+++ b/tests/authoring/Framework/HtmlAssertions.fs
@@ -105,7 +105,7 @@ actual: {actual}
         let formatter = PrettyMarkupFormatter()
         element.Children
         |> Seq.indexed
-        |> Seq.filter (fun (i, c) -> (not <| (i = 0 && c.TagName = "H1")))
+        |> Seq.filter (fun (i, c) -> not (c.ClassList.Contains("page-title-row")) && not (i = 0 && c.TagName = "H1"))
         |> Seq.map(fun (_, c) -> c)
         |> Seq.iter _.ToHtml(sw, formatter)
         sw.ToString().TrimStart('\n')

From 79299cbdc04b1c44494a73191d30b066d78dab4f Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 4 May 2026 16:10:04 +0200
Subject: [PATCH 111/226] fix(nav): resolve V2 page: entries into
 NavigationDocumentationFileLookup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After the main V1 toc traversal builds the url→file map, a second pass
walks the V2 nav tree and for every PageCrossLinkLeaf whose URL matches
a known file, registers (file → navItem) in NavigationDocumentationFileLookup.
This allows page: entries in navigation-v2.yml to work correctly even for
pages that have no V1 toc backing, so HtmlWriter.RenderLayout no longer
throws when trying to position them.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 config/assembler.yml                          |  1 +
 config/navigation.yml                         |  1 +
 .../NavigationItemExtensions.cs               | 44 ++++++++++++++++---
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/config/assembler.yml b/config/assembler.yml
index e8e2acd183..e8092aabf0 100644
--- a/config/assembler.yml
+++ b/config/assembler.yml
@@ -73,6 +73,7 @@ shared_configuration:
 ###
 narrative:
   checkout_strategy: full
+  current: hub-pages
 
 ###
 # 'references' defines a map of `elastic/<repository_name> * <repository_config>
diff --git a/config/navigation.yml b/config/navigation.yml
index 01d93faeec..3bf8dd5dda 100644
--- a/config/navigation.yml
+++ b/config/navigation.yml
@@ -17,6 +17,7 @@ toc:
   #############
   # NARRATIVE #
   #############
+  - toc: products
   - toc: get-started
   - toc: solutions
   - toc: manage-data
diff --git a/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs b/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs
index dbdd327796..5a10dc1183 100644
--- a/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs
+++ b/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs
@@ -6,6 +6,7 @@
 using System.Runtime.CompilerServices;
 using Elastic.Documentation.Navigation.Isolated;
 using Elastic.Documentation.Navigation.Isolated.Leaf;
+using Elastic.Documentation.Navigation.V2;
 
 namespace Elastic.Documentation.Navigation;
 
@@ -87,17 +88,21 @@ public static FrozenDictionary<int, INavigationItem> BuildNavigationLookups(
 	)
 	{
 		var navigationByOrder = new Dictionary<int, INavigationItem>();
-		BuildNavigationLookupsRecursive(rootItem, navigationDocumentationFileLookup, navigationByOrder);
+		var urlToFile = new Dictionary<string, IDocumentationFile>(StringComparer.OrdinalIgnoreCase);
+		BuildNavigationLookupsRecursive(rootItem, navigationDocumentationFileLookup, navigationByOrder, urlToFile);
+		ResolvePageCrossLinksRecursive(rootItem, navigationDocumentationFileLookup, urlToFile);
 		return navigationByOrder.ToFrozenDictionary();
 	}
 
 	/// <summary>
-	/// Recursively builds both NavigationDocumentationFileLookup and NavigationIndexedByOrder in a single traversal
+	/// Recursively builds both NavigationDocumentationFileLookup and NavigationIndexedByOrder in a single traversal,
+	/// also collecting a URL-to-file map used by the second pass to resolve V2 page: entries.
 	/// </summary>
 	private static void BuildNavigationLookupsRecursive(
 		INavigationItem item,
 		ConditionalWeakTable<IDocumentationFile, INavigationItem> navigationDocumentationFileLookup,
-		Dictionary<int, INavigationItem> navigationByOrder)
+		Dictionary<int, INavigationItem> navigationByOrder,
+		Dictionary<string, IDocumentationFile> urlToFile)
 	{
 		switch (item)
 		{
@@ -107,6 +112,7 @@ private static void BuildNavigationLookupsRecursive(
 			case ILeafNavigationItem<IDocumentationFile> documentationFileLeaf:
 				_ = navigationDocumentationFileLookup.TryAdd(documentationFileLeaf.Model, documentationFileLeaf);
 				_ = navigationByOrder.TryAdd(documentationFileLeaf.NavigationIndex, documentationFileLeaf);
+				urlToFile.TryAdd(documentationFileLeaf.Url, documentationFileLeaf.Model);
 				break;
 			case ILeafNavigationItem<INavigationModel> leaf:
 				_ = navigationByOrder.TryAdd(leaf.NavigationIndex, leaf);
@@ -115,13 +121,41 @@ private static void BuildNavigationLookupsRecursive(
 				_ = navigationDocumentationFileLookup.TryAdd(documentationFileNode.Index.Model, documentationFileNode);
 				_ = navigationByOrder.TryAdd(documentationFileNode.NavigationIndex, documentationFileNode);
 				_ = navigationByOrder.TryAdd(documentationFileNode.Index.NavigationIndex, documentationFileNode.Index);
+				urlToFile.TryAdd(documentationFileNode.Url, documentationFileNode.Index.Model);
 				foreach (var child in documentationFileNode.NavigationItems)
-					BuildNavigationLookupsRecursive(child, navigationDocumentationFileLookup, navigationByOrder);
+					BuildNavigationLookupsRecursive(child, navigationDocumentationFileLookup, navigationByOrder, urlToFile);
 				break;
 			case INodeNavigationItem<INavigationModel, INavigationItem> node:
 				_ = navigationByOrder.TryAdd(node.NavigationIndex, node);
 				foreach (var child in node.NavigationItems)
-					BuildNavigationLookupsRecursive(child, navigationDocumentationFileLookup, navigationByOrder);
+					BuildNavigationLookupsRecursive(child, navigationDocumentationFileLookup, navigationByOrder, urlToFile);
+				break;
+		}
+	}
+
+	/// <summary>
+	/// Second pass: for every V2 <c>page:</c> entry (<see cref="PageCrossLinkLeaf"/>) whose URL
+	/// matches a file already known from the V1 toc traversal, register that file in the lookup
+	/// so <c>HtmlWriter.RenderLayout</c> can position it correctly without a V1 nav backing.
+	/// </summary>
+	private static void ResolvePageCrossLinksRecursive(
+		INavigationItem item,
+		ConditionalWeakTable<IDocumentationFile, INavigationItem> navigationDocumentationFileLookup,
+		Dictionary<string, IDocumentationFile> urlToFile)
+	{
+		switch (item)
+		{
+			case PageCrossLinkLeaf pageCrossLink:
+				if (urlToFile.TryGetValue(pageCrossLink.Url, out var file))
+					_ = navigationDocumentationFileLookup.TryAdd(file, pageCrossLink);
+				break;
+			case INodeNavigationItem<INavigationModel, INavigationItem> node:
+				foreach (var child in node.NavigationItems)
+					ResolvePageCrossLinksRecursive(child, navigationDocumentationFileLookup, urlToFile);
+				break;
+			case INodeNavigationItem<IDocumentationFile, INavigationItem> node:
+				foreach (var child in node.NavigationItems)
+					ResolvePageCrossLinksRecursive(child, navigationDocumentationFileLookup, urlToFile);
 				break;
 		}
 	}

From 676566c845e4ed69b49622165134f2670856bd2f Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 4 May 2026 16:10:48 +0200
Subject: [PATCH 112/226] fix: remove hub-pages-specific config accidentally
 committed to nav-v2

assembler.yml and navigation.yml changes belong only on the hub-pages
branch, not on the base nav-v2 branch.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 config/assembler.yml  | 1 -
 config/navigation.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/config/assembler.yml b/config/assembler.yml
index e8092aabf0..e8e2acd183 100644
--- a/config/assembler.yml
+++ b/config/assembler.yml
@@ -73,7 +73,6 @@ shared_configuration:
 ###
 narrative:
   checkout_strategy: full
-  current: hub-pages
 
 ###
 # 'references' defines a map of `elastic/<repository_name> * <repository_config>
diff --git a/config/navigation.yml b/config/navigation.yml
index 3bf8dd5dda..01d93faeec 100644
--- a/config/navigation.yml
+++ b/config/navigation.yml
@@ -17,7 +17,6 @@ toc:
   #############
   # NARRATIVE #
   #############
-  - toc: products
   - toc: get-started
   - toc: solutions
   - toc: manage-data

From 20a3966d5f1dec3ee907b75faee549b12c268b50 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 4 May 2026 16:12:02 +0200
Subject: [PATCH 113/226] feat(hub-pages): wire hub pages through assembler
 preview

- assembler.yml: point narrative (docs-content) at hub-pages branch so
  the preview build checks out the branch containing the hub page files
- navigation.yml: add toc: products so the assembler builds and nav-positions
  the hub pages from docs-content://products/
- navigation-v2.yml: replace the external gist link with real page: entries
  for Kibana and Elasticsearch hub pages in docs-content

Together with the PageCrossLinkLeaf fix (already merged from nav-v2),
this wires hub pages end-to-end through the assembler preview build.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 config/assembler.yml     |  1 +
 config/navigation-v2.yml | 12 ++++++------
 config/navigation.yml    |  1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/config/assembler.yml b/config/assembler.yml
index e8e2acd183..e8092aabf0 100644
--- a/config/assembler.yml
+++ b/config/assembler.yml
@@ -73,6 +73,7 @@ shared_configuration:
 ###
 narrative:
   checkout_strategy: full
+  current: hub-pages
 
 ###
 # 'references' defines a map of `elastic/<repository_name> * <repository_config>
diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index b6704bd304..39f9aea547 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -3307,13 +3307,13 @@ nav:
     children:
     - toc: docs-content://release-notes/intro
 
-  # Until hub pages are produced through the V1 navigation/toc chain so the
-  # assembler can resolve them, this section is an external link to the
-  # Kibana gist preview -- the visual reference for the prototype, with its
-  # own island-style nav and stubs already wired up.
-  # https://gist.github.com/florent-leborgne/c9075416b50ec111a09897b7be4462cc
   - section: Product hubs
-    url: https://htmlpreview.github.io/?https://gist.github.com/florent-leborgne/c9075416b50ec111a09897b7be4462cc/raw/kibana-hub.html
+    url: /products/
+    children:
+    - page: docs-content://products/kibana/v9.md
+      title: Kibana
+    - page: docs-content://products/elasticsearch/v9.md
+      title: Elasticsearch
 
   - section: Extension points
     url: /extend/
diff --git a/config/navigation.yml b/config/navigation.yml
index 01d93faeec..3bf8dd5dda 100644
--- a/config/navigation.yml
+++ b/config/navigation.yml
@@ -17,6 +17,7 @@ toc:
   #############
   # NARRATIVE #
   #############
+  - toc: products
   - toc: get-started
   - toc: solutions
   - toc: manage-data

From 6a6097845dc0cdf786f61ee33be91e2b45032032 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Mon, 4 May 2026 16:13:07 +0200
Subject: [PATCH 114/226] fix(site): classify Nav V2 label lists as subsection
 vs folder groups

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Navigation/NavV2LabelListKind.cs          |  30 ++++
 .../Navigation/_TocTreeNavV2.cshtml           | 149 ++++++++----------
 2 files changed, 97 insertions(+), 82 deletions(-)
 create mode 100644 src/Elastic.Documentation.Site/Navigation/NavV2LabelListKind.cs

diff --git a/src/Elastic.Documentation.Site/Navigation/NavV2LabelListKind.cs b/src/Elastic.Documentation.Site/Navigation/NavV2LabelListKind.cs
new file mode 100644
index 0000000000..4665099182
--- /dev/null
+++ b/src/Elastic.Documentation.Site/Navigation/NavV2LabelListKind.cs
@@ -0,0 +1,30 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Documentation.Navigation;
+using Elastic.Documentation.Navigation.V2;
+
+namespace Elastic.Documentation.Site.Navigation;
+
+internal static class NavV2LabelListKind
+{
+	/// <summary>
+	/// True when every direct child under this label renders as a non-folder row (nested labels, plain links).
+	/// False when any child renders as <c>li.group-navigation</c> (accordion folder rows from _TocTreeNavV2).
+	/// </summary>
+	public static bool IsSubsectionList(LabelNavigationNode label) =>
+		label.NavigationItems.Count > 0 && label.NavigationItems.All(i => !RendersAsGroupNavigationRow(i));
+
+	private static bool RendersAsGroupNavigationRow(INavigationItem item)
+	{
+		if (item is PlaceholderNavigationNode)
+			return true;
+		if (item is LabelNavigationNode)
+			return false;
+		if (item is INodeNavigationItem<INavigationModel, INavigationItem> node && node.NavigationItems.Count > 0)
+			return true;
+
+		return false;
+	}
+}
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index fd695a4e01..63f263298a 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -5,7 +5,7 @@
 @using Elastic.Documentation.Site.Navigation
 @inherits RazorSlice<NavigationTreeItem>
 @{
-	var isTopLevel = Model.Level == 0;
+	var isTopLevel = Model.Level == 0 && Model.SubTree is not LabelNavigationNode;
 }
 @foreach (var item in Model.SubTree.NavigationItems)
 {
@@ -16,71 +16,32 @@
 
 	if (item is LabelNavigationNode label)
 	{
-		@* Subsection headers: spacing via CSS (li:has .label--nested:not(:first-child)) so every title matches, not a hardcoded list *@
-		<li class="@(isTopLevel ? "border-t border-[#F6F9FC] first:border-t-0 relative" : "relative")">
+		var labelBodyIsSubsection = NavV2LabelListKind.IsSubsectionList(label);
+		var labelBodyClass = labelBodyIsSubsection
+			? "docs-sidebar-nav-v2__subsection"
+			: "docs-sidebar-nav-v2__label-children";
+		@* Subsection = ul whose direct children are li.relative (nested labels/links), not li.group-navigation folders. *@
+		<li class="relative">
 			@if (isTopLevel)
 			{
-				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--top flex items-center gap-2 px-[10px] py-0 text-sm leading-5 text-[#111C2C]">
-					@if (label.NavigationTitle == "Elasticsearch fundamentals")
-					{
-						@* EUI icon: documentation *@
-						<svg class="docs-sidebar-nav-v2__label-icon" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-							<path fill="currentColor" d="M6 16H5v-3h1v3Zm3-8h1v1H7V8h1V7h-.5V6H9v2Zm-.5-4a.5.5 0 1 1 0 1 .5.5 0 0 1 0-1Z"/>
-							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M7 14h5v-2H4a1 1 0 1 0 0 2v1a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h10v11h-1v2h1v1H7v-1ZM4 2a1 1 0 0 0-1 1v8.27A1.99 1.99 0 0 1 4 11V2Zm1 9h8V2H5v9Z"/>
-						</svg>
-					}
-					else if (label.NavigationTitle == "Install, deploy, and administer")
-					{
-						@* EUI icon: storage *@
-						<svg class="docs-sidebar-nav-v2__label-icon" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-							<path fill="currentColor" d="M5 5H3V4h2v1Zm0 2H3V6h2v1Zm-1 4a1 1 0 1 0 0-2 1 1 0 0 0 0 2Zm5-7v3H8V4h1Zm4 3V4h-1v3h1Z"/>
-							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M1 3a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v9a1 1 0 0 1-1 1h-1v1h-1v-1H4v1H3v-1H2a1 1 0 0 1-1-1V3Zm5 0H2v9h4V3Zm1 0v9h3V3H7Zm4 0v9h3V3h-3Z"/>
-						</svg>
-					}
-					else if (label.NavigationTitle == "The Elasticsearch Platform")
-					{
-						@* EUI icon: layers *@
-						<svg class="docs-sidebar-nav-v2__label-icon" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M1.553 4.106a1 1 0 0 0 0 1.788l6 3a1 1 0 0 0 .894 0l6-3a1 1 0 0 0 0-1.788l-6-3a1 1 0 0 0-.894 0l-6 3ZM14 5 8 8 2 5l6-3 6 3Z"/>
-							<path fill="currentColor" d="m8 11 6.894-3.447S15 7.843 15 8a1 1 0 0 1-.553.895l-6 3a1 1 0 0 1-.894 0l-6-3A1 1 0 0 1 1 8c0-.158.106-.447.106-.447L8 11Z"/>
-							<path fill="currentColor" d="m8 14 6.894-3.447s.106.29.106.447a1 1 0 0 1-.553.895l-6 3a1 1 0 0 1-.894 0l-6-3A1 1 0 0 1 1 11c0-.158.106-.447.106-.447L8 14Z"/>
-						</svg>
-					}
-					else if (label.NavigationTitle == "Solutions and project types")
-					{
-						@* EUI icon: productDashboard *@
-						<svg class="docs-sidebar-nav-v2__label-icon" width="16" height="16" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M12 22C13.1046 22 14 22.8954 14 24V26L13.9902 26.2051C13.8876 27.2133 13.0354 28 12 28H4C2.89543 28 2 27.1046 2 26V24C2 22.8954 2.89543 22 4 22H12ZM4 26H12V24H4V26Z"/>
-							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M28 14C29.1046 14 30 14.8954 30 16V26C30 27.1046 29.1046 28 28 28H18C16.8954 28 16 27.1046 16 26V16C16 14.8954 16.8954 14 18 14H28ZM18 26H28V16H18V26Z"/>
-							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M12 14C13.1046 14 14 14.8954 14 16V18L13.9902 18.2051C13.8876 19.2133 13.0354 20 12 20H4C2.89543 20 2 19.1046 2 18V16C2 14.8954 2.89543 14 4 14H12ZM4 18H12V16H4V18Z"/>
-							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M28 4C29.0354 4 29.8876 4.78666 29.9902 5.79492L30 6V10C30 11.1046 29.1046 12 28 12H4C2.89543 12 2 11.1046 2 10V6C2 4.89543 2.89543 4 4 4H28ZM4 10H28V6H4V10Z"/>
-						</svg>
-					}
-					else
-					{
-						@* Default: EUI documentation *@
-						<svg class="docs-sidebar-nav-v2__label-icon" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-							<path fill="currentColor" d="M6 16H5v-3h1v3Zm3-8h1v1H7V8h1V7h-.5V6H9v2Zm-.5-4a.5.5 0 1 1 0 1 .5.5 0 0 1 0-1Z"/>
-							<path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M7 14h5v-2H4a1 1 0 1 0 0 2v1a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h10v11h-1v2h1v1H7v-1ZM4 2a1 1 0 0 0-1 1v8.27A1.99 1.99 0 0 1 4 11V2Zm1 9h8V2H5v9Z"/>
-						</svg>
-					}
+				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--top flex items-center px-[12px] py-0 text-sm leading-5 text-[#111C2C]">
 					<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@label.NavigationTitle</span>
 				</span>
 			}
 			else
 			{
-				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--nested docs-sidebar-nav-v2__nav-text block px-[10px] py-0 text-xs leading-4 uppercase text-[#A2B1C9]">
+				<span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--nested docs-sidebar-nav-v2__nav-text block px-[12px] py-0 text-xs leading-4 uppercase text-[#A2B1C9]">
 					@label.NavigationTitle
 				</span>
 			}
 			@if (label.NavigationItems.Count > 0)
 			{
-				<ul class="w-full">
+				<ul class="@labelBodyClass w-full">
 					@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
 					{
 						IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
 						IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
-						Level = Model.Level + 1,
+						Level = Model.Level,
 						SubTree = label,
 						RootNavigationId = Model.RootNavigationId,
 						Htmx = Model.Htmx
@@ -95,8 +56,10 @@
 			<a
 				href="@placeholder.Url"
 				@Model.Htmx.GetNavHxAttributes(true, null)
-				class="sidebar-link docs-sidebar-nav-v2__nav-text grow px-[10px] py-[6px] text-grey-40">
-				@placeholder.NavigationTitle
+				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
+				style="--nav-level:@Model.Level">
+				<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
+				<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@placeholder.NavigationTitle</span>
 			</a>
 		</li>
 	}
@@ -117,8 +80,8 @@
 				<a
 					href="@placeholderGroup.Url"
 					@Model.Htmx.GetNavHxAttributes(true, null)
-					class="sidebar-link flex w-full items-center gap-2 px-[10px] py-[6px] text-grey-40">
-					<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@placeholderGroup.NavigationTitle</span>
+					class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
+					style="--nav-level:@Model.Level">
 					@if (!allHidden)
 					{
 						<span class="nav-folder-chevron shrink-0" aria-hidden="true">
@@ -133,21 +96,30 @@
 							</svg>
 						</span>
 					}
+					else
+					{
+						<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
+					}
+					<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@placeholderGroup.NavigationTitle</span>
 				</a>
 			</div>
 			@if (placeholderGroup.NavigationItems.Count > 0)
 			{
-				<ul class="docs-sidebar-nav-v2__folder-children w-full relative pl-3">
-					@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
-					{
-						IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
-						IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
-						Level = Model.Level + 1,
-						SubTree = placeholderGroup,
-						RootNavigationId = Model.RootNavigationId,
-						Htmx = Model.Htmx
-					}))
-				</ul>
+				<div class="docs-sidebar-nav-v2__folder-clip w-full">
+					<div class="docs-sidebar-nav-v2__folder-clip-inner">
+						<ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+							@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
+							{
+								IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
+								IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
+								Level = Model.Level + 1,
+								SubTree = placeholderGroup,
+								RootNavigationId = Model.RootNavigationId,
+								Htmx = Model.Htmx
+							}))
+						</ul>
+					</div>
+				</div>
 			}
 		</li>
 	}
@@ -157,9 +129,11 @@
 			<a
 				href="@group.Url"
 				@Model.Htmx.GetNavHxAttributes(true, null)
-				class="sidebar-link docs-sidebar-nav-v2__nav-text px-[10px] py-[6px]"
+				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
+				style="--nav-level:@Model.Level"
 			>
-				@group.NavigationTitle
+				<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
+				<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@group.NavigationTitle</span>
 			</a>
 		</li>
 	}
@@ -180,8 +154,8 @@
 				<a
 					href="@(folder.Url)"
 					@Model.Htmx.GetNavHxAttributes(true, null)
-					class="sidebar-link flex w-full items-center gap-2 px-[10px] py-[6px]">
-					<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@(folder.NavigationTitle)</span>
+					class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
+					style="--nav-level:@Model.Level">
 					@if (!allHidden)
 					{
 						<span class="nav-folder-chevron shrink-0" aria-hidden="true">
@@ -196,21 +170,30 @@
 							</svg>
 						</span>
 					}
+					else
+					{
+						<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
+					}
+					<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@(folder.NavigationTitle)</span>
 				</a>
 			</div>
 			@if (folder.NavigationItems.Count > 0)
 			{
-				<ul class="docs-sidebar-nav-v2__folder-children w-full relative pl-3">
-					@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
-					{
-						IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
-						IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
-						Level = Model.Level + 1,
-						SubTree = folder,
-						RootNavigationId = Model.RootNavigationId,
-						Htmx = Model.Htmx
-					}))
-				</ul>
+				<div class="docs-sidebar-nav-v2__folder-clip w-full">
+					<div class="docs-sidebar-nav-v2__folder-clip-inner">
+						<ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+							@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
+							{
+								IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
+								IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
+								Level = Model.Level + 1,
+								SubTree = folder,
+								RootNavigationId = Model.RootNavigationId,
+								Htmx = Model.Htmx
+							}))
+						</ul>
+					</div>
+				</div>
 			}
 		</li>
 	}
@@ -220,9 +203,11 @@
 			<a
 				href="@leaf.Url"
 				@Model.Htmx.GetNavHxAttributes(true, null)
-				class="sidebar-link docs-sidebar-nav-v2__nav-text grow px-[10px] py-[6px]"
+				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
+				style="--nav-level:@Model.Level"
 			>
-				@leaf.NavigationTitle
+				<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
+				<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@leaf.NavigationTitle</span>
 			</a>
 		</li>
 	}

From c08b2b2acee317db3540bae1a0f232fbdf9dd946 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Mon, 4 May 2026 16:13:10 +0200
Subject: [PATCH 115/226] feat(site): Nav V2 search and client navigation
 behavior

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/pages-nav-v2.ts                    | 137 +++++++++++++++++-
 .../NavigationSearchComponent.tsx             |   8 +-
 .../NavigationSearch/SearchInput.tsx          |   2 +-
 3 files changed, 139 insertions(+), 8 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 6dc3df3d40..f3dd35b832 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -70,8 +70,11 @@ function linkPathMatchesCurrentPage(anchor: HTMLAnchorElement) {
 }
 
 /**
- * Primary click on a folder row link: same-URL toggles expand/collapse only (preventDefault);
- * navigating to another URL keeps the folder open (checkbox checked) and follows href.
+ * Primary click on a folder row link:
+ * - When the current page matches the folder row href, toggle expand/collapse only (preventDefault).
+ * - When the folder is already expanded but the URL does not match (typical for placeholder
+ *   groups like `/_placeholder/...`), toggle closed so a second click collapses the section.
+ * - Otherwise open the folder and allow navigation to the row href (e.g. section index).
  * Skips modified clicks (new tab, etc.). Collapsed folder ids are stored for expandToCurrentPage.
  */
 function ensureNavV2FolderLinkToggle() {
@@ -125,6 +128,15 @@ function ensureNavV2FolderLinkToggle() {
                 return
             }
 
+            if (cb.checked) {
+                cb.checked = false
+                cb.dispatchEvent(new Event('change', { bubbles: true }))
+                persistFolderCheckboxCollapsedState(cb)
+                e.preventDefault()
+                e.stopPropagation()
+                return
+            }
+
             cb.checked = true
             cb.dispatchEvent(new Event('change', { bubbles: true }))
             persistFolderCheckboxCollapsedState(cb)
@@ -259,6 +271,122 @@ function initAccordion(nav: HTMLElement) {
     })
 }
 
+function warmFolderSubtreeLayoutFromPeer(peer: HTMLElement) {
+    const li = peer.parentElement
+    if (!li?.matches('li.group-navigation')) {
+        return
+    }
+
+    const input = li.querySelector<HTMLInputElement>(
+        ':scope > .nav-folder-peer input[type=checkbox]'
+    )
+    if (input?.checked) {
+        return
+    }
+
+    const ul = li.querySelector<HTMLElement>(
+        ':scope > .docs-sidebar-nav-v2__folder-clip .docs-sidebar-nav-v2__folder-children'
+    )
+    if (ul) {
+        void ul.scrollHeight
+    }
+}
+
+function primeNavV2FolderLayoutsSync(nav: HTMLElement, maxCount: number) {
+    const uls = nav.querySelectorAll<HTMLUListElement>(
+        'ul.docs-sidebar-nav-v2__folder-children'
+    )
+    const n = Math.min(maxCount, uls.length)
+    for (let i = 0; i < n; i++) {
+        const ul = uls[i]
+        const li = ul.closest('li.group-navigation')
+        const input = li?.querySelector<HTMLInputElement>(
+            ':scope > .nav-folder-peer input[type=checkbox]'
+        )
+        if (!input?.checked) {
+            void ul.scrollHeight
+        }
+    }
+}
+
+/**
+ * Spreads first-open layout cost off the interaction path: idle batches measure collapsed
+ * folder lists; pointer events on the folder row warm right before click (see init).
+ */
+function scheduleNavV2CollapsedFolderLayoutWarmup(
+    nav: HTMLElement,
+    startIndex: number
+) {
+    const uls = nav.querySelectorAll<HTMLUListElement>(
+        'ul.docs-sidebar-nav-v2__folder-children'
+    )
+    let index = startIndex
+    const chunkSize = 6
+
+    const schedule = (cb: () => void) => {
+        if (typeof requestIdleCallback !== 'undefined') {
+            requestIdleCallback(
+                () => {
+                    cb()
+                },
+                { timeout: 2000 }
+            )
+        } else {
+            setTimeout(cb, 0)
+        }
+    }
+
+    const step = () => {
+        if (!nav.isConnected) {
+            return
+        }
+
+        const end = Math.min(index + chunkSize, uls.length)
+        for (; index < end; index++) {
+            const ul = uls[index]
+            const li = ul.closest('li.group-navigation')
+            const input = li?.querySelector<HTMLInputElement>(
+                ':scope > .nav-folder-peer input[type=checkbox]'
+            )
+            if (!input?.checked) {
+                void ul.scrollHeight
+            }
+        }
+
+        if (index < uls.length) {
+            schedule(step)
+        }
+    }
+
+    schedule(step)
+}
+
+function initNavV2FolderLayoutWarmup(nav: HTMLElement) {
+    primeNavV2FolderLayoutsSync(nav, 14)
+
+    nav.querySelectorAll<HTMLElement>('li.group-navigation > .nav-folder-peer').forEach(
+        (peer) => {
+            if (peer.dataset.navV2PointerWarmBound === 'true') {
+                return
+            }
+
+            peer.dataset.navV2PointerWarmBound = 'true'
+            const warm = () => {
+                warmFolderSubtreeLayoutFromPeer(peer)
+            }
+
+            peer.addEventListener('pointerenter', warm, { passive: true })
+            /*
+             * Runs immediately before click (after hover path): pays layout once so the grid
+             * transition is less likely to share a frame with the first full subtree measure.
+             */
+            peer.addEventListener('pointerdown', warm, { passive: true })
+        }
+    )
+
+    scheduleNavV2CollapsedFolderLayoutWarmup(nav, 14)
+}
+
 function clearActiveSubtreeHighlight(nav: HTMLElement) {
     nav.querySelectorAll(
         '.nav-v2-active-subtree, .nav-v2-active-leaf, .nav-v2-active-ancestor'
@@ -331,7 +459,9 @@ function applyActiveSubtreeHighlight(nav: HTMLElement) {
     const folderRowLink = hostLi.querySelector<HTMLAnchorElement>(
         ':scope > .nav-folder-peer > a.sidebar-link'
     )
-    const childUl = hostLi.querySelector(':scope > ul')
+    const childUl = hostLi.querySelector(
+        ':scope > .docs-sidebar-nav-v2__folder-clip .docs-sidebar-nav-v2__folder-children'
+    )
 
     if (
         hostLi.classList.contains('group-navigation') &&
@@ -541,6 +671,7 @@ export function initNavV2(nav: HTMLElement) {
     markCurrentPage(nav)
     expandToCurrentPage(nav)
     applyActiveSubtreeHighlight(nav)
+    initNavV2FolderLayoutWarmup(nav)
     requestAnimationFrame(() => {
         requestAnimationFrame(() => initNavV2TruncationTooltips(nav))
     })
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
index 28c83bf7f7..351bf07e66 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
@@ -34,10 +34,10 @@ const NavigationSearchInner = ({ placeholder }: NavigationSearchProps) => {
         <div
             className="sticky top-0"
             css={css`
-                padding-top: 24px;
-                padding-right: 24px;
-                padding-bottom: 24px;
-                border-bottom: 1px solid var(--color-grey-20, #e5e9f0);
+                padding-top: 18px;
+                padding-right: 18px;
+                padding-bottom: 16px;
+                padding-left: 0;
             `}
         >
             <NavigationSearch placeholder={placeholder} />
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchInput.tsx b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchInput.tsx
index de2a6c4699..f2ceedb077 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchInput.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchInput.tsx
@@ -119,7 +119,7 @@ export const SearchInput = ({
                             ${euiTheme.size.m}
                     );
                     border: 1px solid ${navSearchBorder};
-                    border-radius: ${euiTheme.border.radius.medium};
+                    border-radius: 8px;
                     background: #ffffff;
                     font-size: ${euiTheme.font.scale.s * euiTheme.base}px;
                     line-height: ${euiTheme.base * 1.25}px;

From c4705ecd1bb0fe39cd857d39144e66718b196f67 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Mon, 4 May 2026 16:13:13 +0200
Subject: [PATCH 116/226] fix(site): Nav V2 sidebar and layout styles

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/styles.css                         | 262 ++++++++++++++----
 1 file changed, 210 insertions(+), 52 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index fbdf6ade05..ff3e4bbd1f 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -141,6 +141,13 @@ body {
 		.sidebar-nav:not(#pages-nav) .sidebar-link:hover {
 			@apply text-black;
 		}
+
+		/* In-page TOC: padding on li; link fills row for full-width hit target. */
+		& #toc-nav .toc-progress-container a.sidebar-link {
+			display: block;
+			width: 100%;
+			box-sizing: border-box;
+		}
 	}
 }
 
@@ -160,9 +167,24 @@ body:has([data-nav-v2]) aside.sidebar {
 	max-width: 280px;
 }
 
+/* Nav V2: no motion on sidebar column (sticky offset / max-height). */
+#pages-nav:has(nav[data-nav-v2]).sidebar-nav {
+	transition: none;
+}
+
+/* Sticky header: hairline under search row when nav list is scrolled. */
+#pages-nav #pages-nav-sticky-chrome {
+	border-bottom: 1px solid transparent;
+	transition: none;
+}
+
+#pages-nav #pages-nav-sticky-chrome[data-nav-scrolled] {
+	border-bottom-color: #e3e8f2;
+}
+
 .sidebar #pages-nav .pages-nav-menu {
 	scrollbar-gutter: stable;
-	padding-right: 16px;
+	padding-right: 8px;
 }
 
 /* Nav V2: stack list items vertically */
@@ -172,13 +194,26 @@ body:has([data-nav-v2]) aside.sidebar {
 	list-style: none;
 }
 
+/*
+ * Subsection lists (see NavV2LabelListKind + _TocTreeNavV2): ul under a label when children are
+ * nested labels / links only — not li.group-navigation rows. Non-subsection uses .docs-sidebar-nav-v2__label-children.
+ */
+
 /* No gap between rows inside a subsection list (links under a nested subtitle). */
-#pages-nav nav[data-nav-v2] li > .docs-sidebar-nav-v2__label--nested + ul {
+#pages-nav
+	nav[data-nav-v2]
+	li
+	> .docs-sidebar-nav-v2__label--nested
+	+ ul.docs-sidebar-nav-v2__subsection {
 	gap: 0 !important;
 }
 
 /* Gap between sibling subsection blocks (each li: nested subtitle + its ul) under a top icon section only. */
-#pages-nav nav[data-nav-v2] li > .docs-sidebar-nav-v2__label--top + ul {
+#pages-nav
+	nav[data-nav-v2]
+	li
+	> .docs-sidebar-nav-v2__label--top
+	+ ul.docs-sidebar-nav-v2__subsection {
 	gap: 0 !important;
 }
 
@@ -186,31 +221,98 @@ body:has([data-nav-v2]) aside.sidebar {
 	nav[data-nav-v2]
 	li
 	> .docs-sidebar-nav-v2__label--top
-	+ ul:has(> li > .docs-sidebar-nav-v2__label--nested) {
+	+ ul.docs-sidebar-nav-v2__subsection:has(> li > .docs-sidebar-nav-v2__label--nested) {
 	gap: 0.5rem !important;
 }
 
-/* Folder child lists: hidden when checkbox unchecked (fixes conflict: global ul{display:flex} beat Tailwind .hidden) */
+/*
+ * Folder groups: CSS Grid 0fr → 1fr (no scrollHeight in JS). The engine interpolates the row
+ * track instead of measuring pixel height on the main thread (avoids first-open jank).
+ */
 #pages-nav
 	nav[data-nav-v2]
 	li.group-navigation
-	> ul.docs-sidebar-nav-v2__folder-children {
-	display: none;
+	> .docs-sidebar-nav-v2__folder-clip {
+	display: grid;
+	grid-template-rows: 0fr;
+	transition: grid-template-rows 220ms cubic-bezier(0.25, 0.1, 0.25, 1);
+}
+
+/* Hint row-track interpolation while the pointer is on this folder (cheap vs permanent will-change on every row). */
+#pages-nav
+	nav[data-nav-v2]
+	li.group-navigation:hover
+	> .docs-sidebar-nav-v2__folder-clip {
+	will-change: grid-template-rows;
+}
+
+/* Only this folder's checkbox opens its clip — :has() must not match nested descendants' peers or ancestor lis repeat-expand (duplicate-looking children). */
+#pages-nav
+	nav[data-nav-v2]
+	li.group-navigation:has(> .nav-folder-peer input[type='checkbox']:checked)
+	> .docs-sidebar-nav-v2__folder-clip {
+	grid-template-rows: 1fr;
+}
+
+#pages-nav nav[data-nav-v2] .docs-sidebar-nav-v2__folder-clip-inner {
+	min-height: 0;
+	overflow: hidden;
+	transform: translateZ(0);
+}
+
+/*
+ * Folder accordion body: flat/styled link rows (chevron folders, leaves). Distinct from
+ * .docs-sidebar-nav-v2__subsection (label heading + list pattern).
+ */
+#pages-nav nav[data-nav-v2] ul.docs-sidebar-nav-v2__folder-children {
+	display: flex;
 	flex-direction: column;
 	list-style: none;
 }
 
+@media (prefers-reduced-motion: reduce) {
+	#pages-nav
+		nav[data-nav-v2]
+		li.group-navigation
+		> .docs-sidebar-nav-v2__folder-clip {
+		transition: none;
+	}
+}
+
+/*
+ * Nav V2: block spacing only for root rows that start a top-level section (label--top).
+ * Leaf / folder rows without a top label do not get the 24px bottom padding.
+ */
 #pages-nav
 	nav[data-nav-v2]
-	li.group-navigation:has(.nav-folder-peer input[type='checkbox']:checked)
-	> ul.docs-sidebar-nav-v2__folder-children {
-	display: flex;
+	ul.docs-sidebar-nav-v2__tree
+	> li:has(> .docs-sidebar-nav-v2__label--top) {
+	margin-top: 0;
+	padding: 0 0 24px 0;
+}
+
+/* Breathing room when sticky chrome is empty (no search, no product dropdown). */
+#pages-nav
+	nav[data-nav-v2]
+	ul.docs-sidebar-nav-v2__tree
+	> li:first-child:has(> .docs-sidebar-nav-v2__label--top) {
+	padding-top: 12px;
 }
 
-/* Nav V2: vertical padding on top-level li under the root ul (not nested folder children). */
-#pages-nav nav[data-nav-v2] ul.docs-sidebar-nav-v2__tree > li {
-	padding-top: 16px;
-	padding-bottom: 24px;
+/* Search / dropdown already add top chrome; drop extra padding on first tree row. */
+#pages-nav
+	#pages-nav-sticky-chrome:has(navigation-search)
+	+ .pages-nav-menu
+	nav[data-nav-v2]
+	ul.docs-sidebar-nav-v2__tree
+	> li:first-child:has(> .docs-sidebar-nav-v2__label--top),
+#pages-nav
+	#pages-nav-sticky-chrome:has(#pages-dropdown)
+	+ .pages-nav-menu
+	nav[data-nav-v2]
+	ul.docs-sidebar-nav-v2__tree
+	> li:first-child:has(> .docs-sidebar-nav-v2__label--top) {
+	padding-top: 0;
 }
 
 /* Tippy mounts inside nav; clip tooltips so nothing paints outside the sidebar column */
@@ -222,30 +324,42 @@ nav.docs-sidebar-nav-v2 {
 /* Nav V2: top-level section titles (with icon) — inherit body font stack */
 nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--top {
 	font-weight: 600;
-	margin: 8px 0 12px 0;
+	margin: 12px 0 16px 0;
+}
+
+/*
+ * Label--top spacing:
+ * - Default (12px 0 16px): top sections whose body is a folder list (.docs-sidebar-nav-v2__label-children).
+ * - Tighter bottom (12px 0 8px): top sections whose body is a true subsection list (nested labels only).
+ */
+#pages-nav
+	nav[data-nav-v2]
+	.docs-sidebar-nav-v2__label--top:has(+ ul.docs-sidebar-nav-v2__subsection) {
+	margin: 12px 0 8px 0;
 }
 
 /* Nav V2: nested subgroup section titles (non-clickable; color never overridden by active path) */
 nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--nested {
 	font-weight: 500;
-	margin: 12px 0 4px 0;
+	margin: 16px 0;
 	color: #a2b1c9;
 }
 
-/* Nav V2: top-level section titles — icon 16×16, 8px gap via gap-2 on flex parent */
+/* Nav V2: top-level section title text only (icons removed). */
 nav.docs-sidebar-nav-v2
 	.docs-sidebar-nav-v2__label--top
 	.docs-sidebar-nav-v2__label-icon {
-	display: block;
+	display: none;
 	width: 16px;
 	height: 16px;
 	flex-shrink: 0;
 	color: #111c2c;
 }
 
-/* Nav V2: flex column needs min-width: 0 on li; labels wrap (truncation + Tippy disabled for now). */
+/* Nav V2: flex column needs min-width: 0 on li; labels wrap. */
 #pages-nav nav[data-nav-v2] li {
 	min-width: 0;
+	width: 100%;
 }
 
 #pages-nav nav[data-nav-v2] .docs-sidebar-nav-v2__nav-text {
@@ -269,39 +383,31 @@ nav.docs-sidebar-nav-v2
 	align-items: center;
 }
 
-/* Leaf / placeholder links (no inner flex row) */
-#pages-nav
-	nav[data-nav-v2]
-	a.sidebar-link.docs-sidebar-nav-v2__nav-text:not(.flex) {
-	display: block;
-}
-
-/* Nav V2: default link ink; placeholders keep .text-grey-40. Current = blue + semibold (600). */
+/* Nav V2: default link ink; placeholders keep .text-grey-40. Current row follows EUI-like selected state. */
 #pages-nav nav[data-nav-v2] a.sidebar-link {
 	box-sizing: border-box;
 	width: 100%;
 	max-width: 100%;
 	min-width: 0;
+	text-wrap: wrap;
 	font-weight: 400;
 	border-radius: 8px;
 	background-color: transparent;
-	transition:
-		color 0s ease,
-		background-color 0s ease,
-		border-color 0s ease,
-		text-decoration-color 0s ease,
-		fill 0s ease,
-		stroke 0s ease;
+}
+
+#pages-nav nav[data-nav-v2] a.sidebar-link.nav-v2-link {
+	padding-inline-end: 10px;
+	padding-inline-start: max(10px, calc(10px + var(--nav-level, 0) * 12px));
 }
 
 #pages-nav nav[data-nav-v2] a.sidebar-link:not(.text-grey-40) {
-	color: #1d2a3e;
+	color: #516381;
 }
 
 #pages-nav
 	nav[data-nav-v2]
 	a.sidebar-link:not(.text-grey-40):not(.current):hover {
-	background-color: #ecf1f9;
+	background-color: #f6f9fc;
 }
 
 #pages-nav nav[data-nav-v2] a.sidebar-link.text-grey-40 {
@@ -309,28 +415,45 @@ nav.docs-sidebar-nav-v2
 }
 
 #pages-nav nav[data-nav-v2] a.sidebar-link.text-grey-40:not(.current):hover {
-	background-color: #ecf1f9;
+	background-color: #f6f9fc;
 }
 
 #pages-nav nav[data-nav-v2] a.sidebar-link.current {
+	position: relative;
 	color: #0b64dd !important;
 	font-weight: 600 !important;
-	background-color: #f1f6ff !important;
+	background-color: #f6f9fc !important;
 }
 
 #pages-nav nav[data-nav-v2] a.sidebar-link.current:hover {
 	color: #0b64dd;
-	background-color: #f1f6ff !important;
+	background-color: #f6f9fc !important;
+}
+
+/* Vertical accent on the active page row (blue bar + blue title; chevron uses parent-path ink). */
+#pages-nav nav[data-nav-v2] a.sidebar-link.current::before {
+	content: '';
+	position: absolute;
+	inset-inline-start: 1px;
+	top: 50%;
+	transform: translateY(-50%);
+	width: 3px;
+	height: 1.125rem;
+	max-height: calc(100% - 10px);
+	border-radius: 9999px;
+	background-color: var(--color-blue-elastic);
+	pointer-events: none;
+	z-index: 1;
 }
 
 /* Nav V2: active section background — subtree vs leaf driven by pages-nav-v2.ts */
 #pages-nav nav[data-nav-v2] li.nav-v2-active-subtree {
-	background-color: #d9e8ff;
+	background-color: transparent;
 	border-radius: 8px;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-leaf {
-	background-color: #d9e8ff;
+	background-color: transparent;
 	border-radius: 8px;
 }
 
@@ -343,7 +466,7 @@ nav.docs-sidebar-nav-v2
 	nav[data-nav-v2]
 	li.nav-v2-active-subtree
 	a.sidebar-link:not(.current):hover {
-	background-color: #bfdbff !important;
+	background-color: #f6f9fc !important;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-subtree a.sidebar-link.current,
@@ -351,14 +474,14 @@ nav.docs-sidebar-nav-v2
 	nav[data-nav-v2]
 	li.nav-v2-active-subtree
 	a.sidebar-link.current:hover {
-	background-color: transparent !important;
+	background-color: #f6f9fc !important;
 }
 
 #pages-nav
 	nav[data-nav-v2]
 	li.nav-v2-active-leaf
 	> a.sidebar-link:not(.current):hover {
-	background-color: #ecf1f9 !important;
+	background-color: #f6f9fc !important;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-leaf > a.sidebar-link.current,
@@ -366,12 +489,12 @@ nav.docs-sidebar-nav-v2
 	nav[data-nav-v2]
 	li.nav-v2-active-leaf
 	> a.sidebar-link.current:hover {
-	background-color: transparent !important;
+	background-color: #f6f9fc !important;
 }
 
 /*
  * Ancestor folder rows (current is deeper): semibold + dark ink on the open path.
- * .current on the same row (duplicate index URL) stays blue.
+ * .current on the same row (folder index) uses blue text; chevron stays dark via scoped rule below.
  */
 #pages-nav
 	nav[data-nav-v2]
@@ -400,12 +523,22 @@ nav.docs-sidebar-nav-v2
 	font-weight: 600 !important;
 }
 
+#pages-nav nav[data-nav-v2] li > a.sidebar-link,
+#pages-nav nav[data-nav-v2] li > .nav-folder-peer > a.sidebar-link {
+	margin-bottom: 1px;
+}
+
+#pages-nav nav[data-nav-v2] li:last-child > a.sidebar-link,
+#pages-nav nav[data-nav-v2] li:last-child > .nav-folder-peer > a.sidebar-link {
+	margin-bottom: 0;
+}
+
 #pages-nav
 	nav[data-nav-v2]
 	li.nav-v2-active-ancestor
 	> .nav-folder-peer
 	> a.sidebar-link:not(.current):hover {
-	background-color: #ecf1f9;
+	background-color: #f6f9fc;
 }
 
 #pages-nav
@@ -420,7 +553,7 @@ nav.docs-sidebar-nav-v2
 	min-width: 0;
 }
 
-/* Chevrons: muted by default; match link ink when row is current or ancestor-active */
+/* Chevrons: muted by default; active folder row keeps parent-path ink on the icon, not link blue. */
 #pages-nav nav[data-nav-v2] .nav-folder-chevron {
 	color: #a2b1c9;
 }
@@ -429,24 +562,48 @@ nav.docs-sidebar-nav-v2
 	nav[data-nav-v2]
 	.nav-folder-peer
 	> a.sidebar-link.current
-	.nav-folder-chevron,
+	.nav-folder-chevron {
+	color: #1d2a3e;
+}
+
 #pages-nav
 	nav[data-nav-v2]
 	li.nav-v2-active-ancestor
 	> .nav-folder-peer
-	> a.sidebar-link
+	> a.sidebar-link:not(.current)
 	.nav-folder-chevron {
 	color: currentColor;
 }
 
+#pages-nav
+	nav[data-nav-v2]
+	.nav-folder-peer
+	> a.sidebar-link.current
+	.nav-folder-chevron
+	svg,
+#pages-nav
+	nav[data-nav-v2]
+	li.nav-v2-active-ancestor
+	> .nav-folder-peer
+	> a.sidebar-link
+	.nav-folder-chevron
+	svg {
+	stroke-width: 3.5;
+}
+
 .docs-sidebar-nav-v2 .nav-folder-peer .nav-folder-chevron svg {
 	display: block;
 	width: 12px;
 	height: 12px;
-	transition: transform 0.15s ease;
 	transform: rotate(-90deg);
 }
 
+.docs-sidebar-nav-v2 .nav-item-slot {
+	display: block;
+	width: 12px;
+	height: 12px;
+}
+
 .docs-sidebar-nav-v2
 	.nav-folder-peer:has(input[type='checkbox']:checked)
 	.nav-folder-chevron
@@ -454,6 +611,7 @@ nav.docs-sidebar-nav-v2
 	transform: rotate(0deg);
 }
 
+
 @layer components {
 	.sidebar-trial-card {
 		background: var(--color-green-30);
@@ -750,5 +908,5 @@ math {
 
 * {
 	scrollbar-width: thin;
-	scrollbar-color: rgba(113, 134, 168, 0.5) transparent;
+	scrollbar-color: #e3e8f2 transparent;
 }

From 2158decda1dae0c46140a620602f0d96bb8f32c0 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Mon, 4 May 2026 16:13:17 +0200
Subject: [PATCH 117/226] fix(layout): in-page TOC and API TOC layout

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.ApiExplorer/Layout/_ApiToc.cshtml        |  4 ++--
 .../Navigation/_TocTree.cshtml                       |  2 +-
 src/Elastic.Markdown/Layout/_TableOfContents.cshtml  | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Elastic.ApiExplorer/Layout/_ApiToc.cshtml b/src/Elastic.ApiExplorer/Layout/_ApiToc.cshtml
index 781a7eb9c2..9996eeef2e 100644
--- a/src/Elastic.ApiExplorer/Layout/_ApiToc.cshtml
+++ b/src/Elastic.ApiExplorer/Layout/_ApiToc.cshtml
@@ -11,8 +11,8 @@
 						<ul class="block w-full">
 							@foreach (var item in Model)
 							{
-								<li class="has-[:hover]:border-l-grey-80 items-center border-l-1 border-l-grey-20 has-[.current]:border-l-blue-elastic!">
-									<a class="sidebar-link inline-block px-[8px] py-[6px] @(item.Level == 3 ? "ml-4" : string.Empty)"
+								<li class="has-[:hover]:border-l-grey-80 flex w-full items-stretch border-l-1 border-l-grey-20 has-[.current]:border-l-blue-elastic! @(item.Level == 3 ? "pl-8" : "pl-4")">
+									<a class="sidebar-link py-[6px]"
 									   href="#@item.Slug">
 										@item.Heading
 									</a>
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
index 72e6c46afb..641dccd5f2 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
@@ -7,7 +7,7 @@
 	@{
 		var currentTopLevelItem = Model.TopLevelItems.FirstOrDefault(i => i.Id == Model.Tree.Id) ?? Model.Tree;
 	} 
-	<div class="sticky top-0 z-10 shrink-0 bg-white">
+	<div id="pages-nav-sticky-chrome" class="sticky top-0 z-10 shrink-0 bg-white">
 		@if (Model.BuildType != BuildType.Codex)
 		{
 			<navigation-search></navigation-search>
diff --git a/src/Elastic.Markdown/Layout/_TableOfContents.cshtml b/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
index d75a1c2f19..57b8bd11fa 100644
--- a/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
+++ b/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
@@ -30,7 +30,7 @@
 		
 		<ul class="mt-4 hidden md:flex items-center lg:block gap-4">
 			<li class="view-as-markdown hidden lg:block lg:not-first:mt-1">
-				<a href="@Model.MarkdownUrl" class="link px-[8px] py-[6px] text-sm" target="_blank">
+				<a href="@Model.MarkdownUrl" class="link text-sm" target="_blank">
 					<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 -1 24 24">
 						<path fill="currentColor" d="M22.131725 19.247H1.9386225C1.0239525 19.247 0.25 18.47305 0.25 17.558375v-11.11675c0 -0.914675 0.7739525 -1.688625 1.6886225 -1.688625H22.061375c0.914675 0 1.688625 0.77395 1.688625 1.688625v11.11675c0 0.914675 -0.7036 1.688625 -1.618275 1.688625ZM1.9386225 5.87875c-0.2814375 0 -0.562875 0.281425 -0.562875 0.562875v11.11675c0 0.3518 0.2814375 0.562875 0.562875 0.562875H22.061375c0.3518 0 0.562875 -0.281425 0.562875 -0.562875v-11.11675c0 -0.3518 -0.281425 -0.562875 -0.562875 -0.562875l-20.1227525 0ZM3.62725 15.86975V8.130225h2.2515l2.2515 2.814375 2.251475 -2.814375h2.2515V15.86975h-2.2515V11.437125L8.13025 14.2515l-2.2515 -2.814375V15.86975h-2.2515Zm14.1422 0L14.392225 12.140725h2.251475v-4.0105h2.2515v3.940125h2.2515L17.76945 15.86975Z" stroke-width="0.25"></path>
 					</svg>
@@ -40,7 +40,7 @@
 			@if (Model.Features.PrimaryNavEnabled && Model.BuildType != BuildType.Codex)
 			{
 				<li class="report-an-issue lg:not-first:mt-1">
-					<a href="@Model.ReportIssueUrl" class="link px-[8px] py-[6px] text-sm" target="_blank">
+					<a href="@Model.ReportIssueUrl" class="link text-sm" target="_blank">
 						<svg class="link-icon" viewBox="0 0 98 96" xmlns="http://www.w3.org/2000/svg">
 							<path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="currentColor"/>
 						</svg>
@@ -51,7 +51,7 @@
 			@if (!string.IsNullOrEmpty(Model.GithubEditUrl))
 			{
 				<li class="edit-this-page lg:not-first:mt-1 @(Model.HideEditThisPage ? "hidden" : string.Empty)">
-					<a href="@Model.GithubEditUrl" class="link px-[8px] py-[6px] text-sm" target="_blank">
+					<a href="@Model.GithubEditUrl" class="link text-sm" target="_blank">
 						<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
 							<path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125"/>
 						</svg>
@@ -62,7 +62,7 @@
 			@if (Model.Features.PrimaryNavEnabled && Model.BuildType != BuildType.Codex)
 			{
 				<li class="learn-how-to-contribute hidden lg:block lg:not-first:mt-1">
-					<a href="https://www.elastic.co/docs/contribute-docs/" class="link px-[8px] py-[6px] text-sm" target="_blank">
+					<a href="https://www.elastic.co/docs/contribute-docs/" class="link text-sm" target="_blank">
 						<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
 							<path fill="currentColor" d="M8.8,0 C9.074,0 9.337,0.113 9.526,0.312 L12.726,3.74 C12.902,3.926 13,4.173 13,4.429 L13,13 C13,13.552 12.552,14 12,14 L2,14 C1.448,14 1,13.552 1,13 L1,1 C1,0.448 1.448,0 2,0 L8.8,0 Z M12,5 L8.5,5 C8.224,5 8,4.776 8,4.5 L8,1 L2,1 L2,13 L12,13 L12,5 Z M4.5,11 C4.22385763,11 4,10.7761424 4,10.5 C4,10.2238576 4.22385763,10 4.5,10 L9.5,10 C9.7761424,10 10,10.2238576 10,10.5 C10,10.7761424 9.7761424,11 9.5,11 L4.5,11 Z M4.5,8 C4.22385763,8 4,7.77614237 4,7.5 C4,7.22385763 4.22385763,7 4.5,7 L9.5,7 C9.7761424,7 10,7.22385763 10,7.5 C10,7.77614237 9.7761424,8 9.5,8 L4.5,8 Z M5.5,16 C5.22385763,16 5,15.7761424 5,15.5 C5,15.2238576 5.22385763,15 5.5,15 L14,15 L14,6.5 C14,6.22385763 14.2238576,6 14.5,6 C14.7761424,6 15,6.22385763 15,6.5 L15,15 C15,15.5522847 14.5522847,16 14,16 L5.5,16 Z"/>
 						</svg>
@@ -107,9 +107,9 @@
 						<ul class="block w-full">
 							@foreach (var item in Model.PageTocItems)
 							{
-								<li class="has-[:hover]:border-l-grey-80 items-center border-l-1 border-l-grey-20 has-[.current]:border-l-blue-elastic!">
+								<li class="has-[:hover]:border-l-grey-80 flex w-full items-stretch border-l-1 border-l-grey-20 has-[.current]:border-l-blue-elastic! @(item.Level == 3 ? "pl-8" : "pl-4")">
 									<a
-										class="sidebar-link inline-block px-[8px] py-[6px] @(item.Level == 3 ? "ml-4" : string.Empty)"
+										class="sidebar-link py-[6px]"
 										href="#@item.Slug">
 										@item.Heading
 									</a>

From 0784279d13def5f8592ec3c05d677ccbc79d7cf8 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Mon, 4 May 2026 16:13:19 +0200
Subject: [PATCH 118/226] chore(svg): add transition_bottom_in and
 transition_bottom_out icons

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../svgs/transition_bottom_in.svg                          | 7 ++++++-
 .../svgs/transition_bottom_out.svg                         | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.Documentation.Svg/svgs/transition_bottom_in.svg b/src/Elastic.Documentation.Svg/svgs/transition_bottom_in.svg
index 9e039dfa6d..27ea893e60 100644
--- a/src/Elastic.Documentation.Svg/svgs/transition_bottom_in.svg
+++ b/src/Elastic.Documentation.Svg/svgs/transition_bottom_in.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M7.5 9V5.207L5.854 6.854l-.708-.708L8 3.293l2.854 2.853-.707.708L8.5 5.207V9z"/><path fill-rule="evenodd" d="M2 15a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1zM14 2H2v8h12zm0 9.793V11h-.793l-3 3h1.586zM11.793 11h-1.586l-3 3h1.586zm-3 0H7.207l-3 3h1.586zm-3 0H4.207L2 13.207V14h.793zm-3 0H2v.793zM14 13.207l-.793.793H14z" clip-rule="evenodd"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g transform="translate(0,16) scale(1,-1)">
+    <path d="M9.146 10.146a.5.5 0 0 1 .708.708l-2 2a.5.5 0 0 1-.708 0l-2-2a.5.5 0 0 1 .708-.708L7 11.293V7.5a.5.5 0 0 1 1 0v3.793l1.146-1.147Z"/>
+    <path fill-rule="evenodd" d="M15 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2Zm-1 2.707V5h-1.293l-4-4h1.586L14 4.707ZM1 6h13v7a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V6Zm1.293-1H1V3.707L2.293 5Zm3 0H3.707L1 2.293V2a1 1 0 0 1 .455-.838L5.293 5Zm3 0H6.707l-4-4h1.586l4 4Zm3 0H9.707l-4-4h1.586l4 4ZM14 3.293V2a1 1 0 0 0-1-1h-1.293L14 3.293Z"/>
+  </g>
+</svg>
diff --git a/src/Elastic.Documentation.Svg/svgs/transition_bottom_out.svg b/src/Elastic.Documentation.Svg/svgs/transition_bottom_out.svg
index cc22af9376..943543d380 100644
--- a/src/Elastic.Documentation.Svg/svgs/transition_bottom_out.svg
+++ b/src/Elastic.Documentation.Svg/svgs/transition_bottom_out.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M8.5 3.293v3.793l1.646-1.647.707.707L8 9 5.146 6.146l.708-.707L7.5 7.086V3.293z"/><path fill-rule="evenodd" d="M2 15a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1zM14 2H2v8h12zm0 9.793V11h-.793l-3 3h1.586zM11.793 11h-1.586l-3 3h1.586zm-3 0H7.207l-3 3h1.586zm-3 0H4.207L2 13.207V14h.793zm-3 0H2v.793zM14 13.207l-.793.793H14z" clip-rule="evenodd"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g transform="translate(0,16) scale(1,-1)">
+    <path d="M9.146 9.854a.5.5 0 0 0 .708-.708l-2-2a.5.5 0 0 0-.708 0l-2 2a.5.5 0 1 0 .708.708L7 8.707V12.5a.5.5 0 0 0 1 0V8.707l1.146 1.147Z"/>
+    <path fill-rule="evenodd" d="M15 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2Zm-1 2.707V5h-1.293l-4-4h1.586L14 4.707ZM1 6h13v7a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V6Zm1.293-1H1V3.707L2.293 5Zm3 0H3.707L1 2.293V2a1 1 0 0 1 .455-.838L5.293 5Zm3 0H6.707l-4-4h1.586l4 4Zm3 0H9.707l-4-4h1.586l4 4ZM14 3.293V2a1 1 0 0 0-1-1h-1.293L14 3.293Z"/>
+  </g>
+</svg>

From 8c7d3fa03aba18f4cb92b2775bfee0a2df2cbc7a Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 4 May 2026 16:16:30 +0200
Subject: [PATCH 119/226] fix(nav): fix CS8120 unreachable case and IDE0058
 unused TryAdd returns
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Remove the INodeNavigationItem<IDocumentationFile,INavigationItem> case
  from ResolvePageCrossLinksRecursive — it is always caught by the
  INodeNavigationItem<INavigationModel,INavigationItem> case above it
- Discard TryAdd bool returns with _ = to satisfy IDE0058

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 .../NavigationItemExtensions.cs                           | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs b/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs
index 5a10dc1183..9c6e7cf815 100644
--- a/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs
+++ b/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs
@@ -112,7 +112,7 @@ private static void BuildNavigationLookupsRecursive(
 			case ILeafNavigationItem<IDocumentationFile> documentationFileLeaf:
 				_ = navigationDocumentationFileLookup.TryAdd(documentationFileLeaf.Model, documentationFileLeaf);
 				_ = navigationByOrder.TryAdd(documentationFileLeaf.NavigationIndex, documentationFileLeaf);
-				urlToFile.TryAdd(documentationFileLeaf.Url, documentationFileLeaf.Model);
+				_ = urlToFile.TryAdd(documentationFileLeaf.Url, documentationFileLeaf.Model);
 				break;
 			case ILeafNavigationItem<INavigationModel> leaf:
 				_ = navigationByOrder.TryAdd(leaf.NavigationIndex, leaf);
@@ -121,7 +121,7 @@ private static void BuildNavigationLookupsRecursive(
 				_ = navigationDocumentationFileLookup.TryAdd(documentationFileNode.Index.Model, documentationFileNode);
 				_ = navigationByOrder.TryAdd(documentationFileNode.NavigationIndex, documentationFileNode);
 				_ = navigationByOrder.TryAdd(documentationFileNode.Index.NavigationIndex, documentationFileNode.Index);
-				urlToFile.TryAdd(documentationFileNode.Url, documentationFileNode.Index.Model);
+				_ = urlToFile.TryAdd(documentationFileNode.Url, documentationFileNode.Index.Model);
 				foreach (var child in documentationFileNode.NavigationItems)
 					BuildNavigationLookupsRecursive(child, navigationDocumentationFileLookup, navigationByOrder, urlToFile);
 				break;
@@ -153,10 +153,6 @@ private static void ResolvePageCrossLinksRecursive(
 				foreach (var child in node.NavigationItems)
 					ResolvePageCrossLinksRecursive(child, navigationDocumentationFileLookup, urlToFile);
 				break;
-			case INodeNavigationItem<IDocumentationFile, INavigationItem> node:
-				foreach (var child in node.NavigationItems)
-					ResolvePageCrossLinksRecursive(child, navigationDocumentationFileLookup, urlToFile);
-				break;
 		}
 	}
 }

From ca9489ea1a1a9073c46d128c28f2e5187eb865a5 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 4 May 2026 16:27:29 +0200
Subject: [PATCH 120/226] style: fix Prettier formatting in pages-nav-v2.ts and
 styles.css

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 .../Assets/pages-nav-v2.ts                    | 34 +++++++++----------
 .../Assets/styles.css                         |  5 +--
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 6f49ca75cc..7582c5e01b 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -381,25 +381,25 @@ function scheduleNavV2CollapsedFolderLayoutWarmup(
 function initNavV2FolderLayoutWarmup(nav: HTMLElement) {
     primeNavV2FolderLayoutsSync(nav, 14)
 
-    nav.querySelectorAll<HTMLElement>('li.group-navigation > .nav-folder-peer').forEach(
-        (peer) => {
-            if (peer.dataset.navV2PointerWarmBound === 'true') {
-                return
-            }
-
-            peer.dataset.navV2PointerWarmBound = 'true'
-            const warm = () => {
-                warmFolderSubtreeLayoutFromPeer(peer)
-            }
+    nav.querySelectorAll<HTMLElement>(
+        'li.group-navigation > .nav-folder-peer'
+    ).forEach((peer) => {
+        if (peer.dataset.navV2PointerWarmBound === 'true') {
+            return
+        }
 
-            peer.addEventListener('pointerenter', warm, { passive: true })
-            /*
-             * Runs immediately before click (after hover path): pays layout once so the grid
-             * transition is less likely to share a frame with the first full subtree measure.
-             */
-            peer.addEventListener('pointerdown', warm, { passive: true })
+        peer.dataset.navV2PointerWarmBound = 'true'
+        const warm = () => {
+            warmFolderSubtreeLayoutFromPeer(peer)
         }
-    )
+
+        peer.addEventListener('pointerenter', warm, { passive: true })
+        /*
+         * Runs immediately before click (after hover path): pays layout once so the grid
+         * transition is less likely to share a frame with the first full subtree measure.
+         */
+        peer.addEventListener('pointerdown', warm, { passive: true })
+    })
 
     scheduleNavV2CollapsedFolderLayoutWarmup(nav, 14)
 }
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 1c651b0a35..c29f5ea3e6 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -222,7 +222,9 @@ body:has([data-nav-v2]) aside.sidebar {
 	nav[data-nav-v2]
 	li
 	> .docs-sidebar-nav-v2__label--top
-	+ ul.docs-sidebar-nav-v2__subsection:has(> li > .docs-sidebar-nav-v2__label--nested) {
+	+ ul.docs-sidebar-nav-v2__subsection:has(
+		> li > .docs-sidebar-nav-v2__label--nested
+	) {
 	gap: 0.5rem !important;
 }
 
@@ -612,7 +614,6 @@ nav.docs-sidebar-nav-v2
 	transform: rotate(0deg);
 }
 
-
 @layer components {
 	.sidebar-trial-card {
 		background: var(--color-green-30);

From ce968d5e71a948879efce920eb3de0ddd723fb81 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Mon, 4 May 2026 16:29:23 +0200
Subject: [PATCH 121/226] style(site): apply Prettier to Nav V2 assets

Fix CI npm fmt:check on pages-nav-v2.ts and styles.css.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/pages-nav-v2.ts                    | 34 +++++++++----------
 .../Assets/styles.css                         |  5 +--
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index f3dd35b832..4dd13f6c51 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -364,25 +364,25 @@ function scheduleNavV2CollapsedFolderLayoutWarmup(
 function initNavV2FolderLayoutWarmup(nav: HTMLElement) {
     primeNavV2FolderLayoutsSync(nav, 14)
 
-    nav.querySelectorAll<HTMLElement>('li.group-navigation > .nav-folder-peer').forEach(
-        (peer) => {
-            if (peer.dataset.navV2PointerWarmBound === 'true') {
-                return
-            }
-
-            peer.dataset.navV2PointerWarmBound = 'true'
-            const warm = () => {
-                warmFolderSubtreeLayoutFromPeer(peer)
-            }
+    nav.querySelectorAll<HTMLElement>(
+        'li.group-navigation > .nav-folder-peer'
+    ).forEach((peer) => {
+        if (peer.dataset.navV2PointerWarmBound === 'true') {
+            return
+        }
 
-            peer.addEventListener('pointerenter', warm, { passive: true })
-            /*
-             * Runs immediately before click (after hover path): pays layout once so the grid
-             * transition is less likely to share a frame with the first full subtree measure.
-             */
-            peer.addEventListener('pointerdown', warm, { passive: true })
+        peer.dataset.navV2PointerWarmBound = 'true'
+        const warm = () => {
+            warmFolderSubtreeLayoutFromPeer(peer)
         }
-    )
+
+        peer.addEventListener('pointerenter', warm, { passive: true })
+        /*
+         * Runs immediately before click (after hover path): pays layout once so the grid
+         * transition is less likely to share a frame with the first full subtree measure.
+         */
+        peer.addEventListener('pointerdown', warm, { passive: true })
+    })
 
     scheduleNavV2CollapsedFolderLayoutWarmup(nav, 14)
 }
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index ff3e4bbd1f..ea2fb59acd 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -221,7 +221,9 @@ body:has([data-nav-v2]) aside.sidebar {
 	nav[data-nav-v2]
 	li
 	> .docs-sidebar-nav-v2__label--top
-	+ ul.docs-sidebar-nav-v2__subsection:has(> li > .docs-sidebar-nav-v2__label--nested) {
+	+ ul.docs-sidebar-nav-v2__subsection:has(
+		> li > .docs-sidebar-nav-v2__label--nested
+	) {
 	gap: 0.5rem !important;
 }
 
@@ -611,7 +613,6 @@ nav.docs-sidebar-nav-v2
 	transform: rotate(0deg);
 }
 
-
 @layer components {
 	.sidebar-trial-card {
 		background: var(--color-green-30);

From 6dde4427d0cfdffe3f869267b23c702f86d1a174 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 4 May 2026 16:30:48 +0200
Subject: [PATCH 122/226] style: fix Prettier formatting in pages-nav-v2.ts and
 styles.css

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 .../Assets/pages-nav-v2.ts                    | 34 +++++++++----------
 .../Assets/styles.css                         |  5 +--
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 6f49ca75cc..7582c5e01b 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -381,25 +381,25 @@ function scheduleNavV2CollapsedFolderLayoutWarmup(
 function initNavV2FolderLayoutWarmup(nav: HTMLElement) {
     primeNavV2FolderLayoutsSync(nav, 14)
 
-    nav.querySelectorAll<HTMLElement>('li.group-navigation > .nav-folder-peer').forEach(
-        (peer) => {
-            if (peer.dataset.navV2PointerWarmBound === 'true') {
-                return
-            }
-
-            peer.dataset.navV2PointerWarmBound = 'true'
-            const warm = () => {
-                warmFolderSubtreeLayoutFromPeer(peer)
-            }
+    nav.querySelectorAll<HTMLElement>(
+        'li.group-navigation > .nav-folder-peer'
+    ).forEach((peer) => {
+        if (peer.dataset.navV2PointerWarmBound === 'true') {
+            return
+        }
 
-            peer.addEventListener('pointerenter', warm, { passive: true })
-            /*
-             * Runs immediately before click (after hover path): pays layout once so the grid
-             * transition is less likely to share a frame with the first full subtree measure.
-             */
-            peer.addEventListener('pointerdown', warm, { passive: true })
+        peer.dataset.navV2PointerWarmBound = 'true'
+        const warm = () => {
+            warmFolderSubtreeLayoutFromPeer(peer)
         }
-    )
+
+        peer.addEventListener('pointerenter', warm, { passive: true })
+        /*
+         * Runs immediately before click (after hover path): pays layout once so the grid
+         * transition is less likely to share a frame with the first full subtree measure.
+         */
+        peer.addEventListener('pointerdown', warm, { passive: true })
+    })
 
     scheduleNavV2CollapsedFolderLayoutWarmup(nav, 14)
 }
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index ff3e4bbd1f..ea2fb59acd 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -221,7 +221,9 @@ body:has([data-nav-v2]) aside.sidebar {
 	nav[data-nav-v2]
 	li
 	> .docs-sidebar-nav-v2__label--top
-	+ ul.docs-sidebar-nav-v2__subsection:has(> li > .docs-sidebar-nav-v2__label--nested) {
+	+ ul.docs-sidebar-nav-v2__subsection:has(
+		> li > .docs-sidebar-nav-v2__label--nested
+	) {
 	gap: 0.5rem !important;
 }
 
@@ -611,7 +613,6 @@ nav.docs-sidebar-nav-v2
 	transform: rotate(0deg);
 }
 
-
 @layer components {
 	.sidebar-trial-card {
 		background: var(--color-green-30);

From 10330f7158edea9a0568bc5e8fe61fe0f9c96dc4 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 4 May 2026 16:34:27 +0200
Subject: [PATCH 123/226] fix(assembler): warn instead of error when branch has
 no link index entry

When the configured branch (e.g. a prototype/dev branch) has never been
published, it won't have a link index entry. Fall back to checking out
the branch directly by name rather than blocking the entire build with
an error. Cross-link resolution will use whatever entries are available.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 .../Sourcing/RepositorySourcesFetcher.cs                 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/services/Elastic.Documentation.Assembler/Sourcing/RepositorySourcesFetcher.cs b/src/services/Elastic.Documentation.Assembler/Sourcing/RepositorySourcesFetcher.cs
index f53f37c40d..d2b01e5b61 100644
--- a/src/services/Elastic.Documentation.Assembler/Sourcing/RepositorySourcesFetcher.cs
+++ b/src/services/Elastic.Documentation.Assembler/Sourcing/RepositorySourcesFetcher.cs
@@ -97,10 +97,13 @@ await Task.Run(() =>
 					{
 						if (!entry.TryGetValue(branch, out var entryInfo))
 						{
-							context.Collector.EmitError("", $"'{repo.Key}' does not have a '{branch}' entry in link index");
-							return;
+							// Branch has no published link index (e.g. a prototype or dev branch).
+							// Warn and check out the branch directly without a pinned git ref;
+							// cross-link resolution will use whatever index entries are available.
+							context.Collector.EmitWarning("", $"'{repo.Key}' does not have a '{branch}' entry in link index, checking out branch directly");
 						}
-						gitRef = entryInfo.GitReference;
+						else
+							gitRef = entryInfo.GitReference;
 					}
 
 					var cloneInformation = RepositorySourcer.CloneRef(repo.Value, gitRef, fetchLatest, assumeCloned: assumeCloned);

From a1262cdec1141103d005ed2778e2f7c27f156feb Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 4 May 2026 16:42:16 +0200
Subject: [PATCH 124/226] fix(assembler): gracefully handle unpublished
 branches in cross-link fetching

For prototype/dev branches (e.g. hub-pages) that have never been deployed
and therefore have no link index entry:

- RepositoryPublishValidationService: emit warnings instead of errors so
  validate-assembler doesn't block the build
- CrossLinkFetcher.FetchCrossLinks: fall back to main/master cross-link
  data rather than throwing when the requested branch isn't in the index

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 .../CrossLinks/CrossLinkFetcher.cs                         | 7 +++++++
 .../ContentSources/RepositoryPublishValidationService.cs   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.Documentation.Links/CrossLinks/CrossLinkFetcher.cs b/src/Elastic.Documentation.Links/CrossLinks/CrossLinkFetcher.cs
index 893754c2d0..a6f00f9d9c 100644
--- a/src/Elastic.Documentation.Links/CrossLinks/CrossLinkFetcher.cs
+++ b/src/Elastic.Documentation.Links/CrossLinks/CrossLinkFetcher.cs
@@ -107,6 +107,13 @@ protected async Task<RepositoryLinks> FetchCrossLinks(string repository, string[
 				return await FetchLinkIndexEntry(repository, linkIndexEntry, ctx);
 		}
 
+		// Branch not published yet (e.g. a prototype/dev branch) — fall back to main or master.
+		foreach (var fallback in new[] { "main", "master" })
+		{
+			if (repositoryLinks.TryGetValue(fallback, out var fallbackEntry))
+				return await FetchLinkIndexEntry(repository, fallbackEntry, ctx);
+		}
+
 		throw new Exception($"Repository found in link index however none of: '{string.Join(", ", keys)}' branches found");
 	}
 
diff --git a/src/services/Elastic.Documentation.Assembler/ContentSources/RepositoryPublishValidationService.cs b/src/services/Elastic.Documentation.Assembler/ContentSources/RepositoryPublishValidationService.cs
index 8f11b65b68..0c67cc354d 100644
--- a/src/services/Elastic.Documentation.Assembler/ContentSources/RepositoryPublishValidationService.cs
+++ b/src/services/Elastic.Documentation.Assembler/ContentSources/RepositoryPublishValidationService.cs
@@ -47,13 +47,13 @@ public async Task<bool> ValidatePublishStatus(IDiagnosticsCollector collector, C
 			var next = repository.GetBranch(ContentSource.Next);
 			if (!registryMapping.TryGetValue(next, out _))
 			{
-				collector.EmitError(reportPath,
+				collector.EmitWarning(reportPath,
 					$"'{repository.Name}' has not yet published links.json for configured 'next' content source: '{next}' see  {linkIndexReader.RegistryUrl}");
 			}
 
 			if (!registryMapping.TryGetValue(current, out _))
 			{
-				collector.EmitError(reportPath,
+				collector.EmitWarning(reportPath,
 					$"'{repository.Name}' has not yet published links.json for configured 'current' content source: '{current}' see  {linkIndexReader.RegistryUrl}");
 			}
 		}

From c6b9d67beca99a5b4ac16a91e99e93a7a08769c3 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 4 May 2026 17:09:40 +0200
Subject: [PATCH 125/226] fix(nav): resolve V2 page entries from nested TOCs

V2 page links need to register their source files after the V2 tree is built so assembler layouts can position pages that are only surfaced through navigation-v2.yml.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../NavigationItemExtensions.cs               |   1 +
 .../V2/PageCrossLinkLeaf.cs                   |   2 +
 .../V2/PageFolderNavigationNode.cs            |   3 +
 .../V2/SiteNavigationV2.cs                    | 171 ++++++++++++++++++
 .../Assembler/SiteNavigationTests.cs          |  76 ++++++++
 5 files changed, 253 insertions(+)

diff --git a/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs b/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs
index 9c6e7cf815..762561469d 100644
--- a/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs
+++ b/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs
@@ -122,6 +122,7 @@ private static void BuildNavigationLookupsRecursive(
 				_ = navigationByOrder.TryAdd(documentationFileNode.NavigationIndex, documentationFileNode);
 				_ = navigationByOrder.TryAdd(documentationFileNode.Index.NavigationIndex, documentationFileNode.Index);
 				_ = urlToFile.TryAdd(documentationFileNode.Url, documentationFileNode.Index.Model);
+				_ = urlToFile.TryAdd(documentationFileNode.Index.Url, documentationFileNode.Index.Model);
 				foreach (var child in documentationFileNode.NavigationItems)
 					BuildNavigationLookupsRecursive(child, navigationDocumentationFileLookup, navigationByOrder, urlToFile);
 				break;
diff --git a/src/Elastic.Documentation.Navigation/V2/PageCrossLinkLeaf.cs b/src/Elastic.Documentation.Navigation/V2/PageCrossLinkLeaf.cs
index f1210849db..51927aaf14 100644
--- a/src/Elastic.Documentation.Navigation/V2/PageCrossLinkLeaf.cs
+++ b/src/Elastic.Documentation.Navigation/V2/PageCrossLinkLeaf.cs
@@ -15,6 +15,8 @@ public class PageCrossLinkLeaf(
 	INodeNavigationItem<INavigationModel, INavigationItem>? parent
 ) : ILeafNavigationItem<INavigationModel>, INavigationModel
 {
+	public Uri Page { get; } = page;
+
 	/// <inheritdoc />
 	public INavigationModel Model => this;
 
diff --git a/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs
index a610f70a4b..b19b2994b4 100644
--- a/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs
+++ b/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs
@@ -25,6 +25,7 @@ public PageFolderNavigationNode(
 	{
 		Id = ShortId.Create("page-folder", title);
 		NavigationTitle = title;
+		Page = page;
 		Url = ResolveUrl(page, sitePrefix);
 		NavigationItems = children;
 		Parent = parent;
@@ -35,6 +36,8 @@ public PageFolderNavigationNode(
 	/// <inheritdoc />
 	public string Id { get; }
 
+	public Uri Page { get; }
+
 	/// <inheritdoc />
 	public string Url { get; }
 
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 1f6057df51..4b9cf4f5a7 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -34,6 +34,7 @@ public SiteNavigationV2(
 	{
 		var prefix = sitePrefix ?? string.Empty;
 		V2NavigationItems = BuildV2Items(v2File.Nav, Nodes, this, prefix);
+		RegisterV2PageLookups();
 		Sections = BuildSections(V2NavigationItems);
 		Islands = BuildIslands(Sections);
 		BuildUrlToSectionLookup();
@@ -153,6 +154,176 @@ private void BuildTocRootToIslandLookup()
 			_ = _tocRootToIsland.TryAdd(island.SourceTocRootId, island);
 	}
 
+	private void RegisterV2PageLookups()
+	{
+		var urlToFile = new Dictionary<string, IDocumentationFile>(StringComparer.OrdinalIgnoreCase);
+		foreach (var node in Nodes.Values)
+			CollectDocumentationFilesByUrl(node, urlToFile, Url);
+
+		RegisterV2PageLookups(V2NavigationItems, urlToFile);
+	}
+
+	private void RegisterV2PageLookups(
+		IEnumerable<INavigationItem> items,
+		IReadOnlyDictionary<string, IDocumentationFile> urlToFile
+	)
+	{
+		foreach (var item in items)
+		{
+			switch (item)
+			{
+				case PageCrossLinkLeaf pageCrossLink:
+					RegisterV2PageLookup(pageCrossLink.Page, pageCrossLink, urlToFile);
+					break;
+				case PageFolderNavigationNode pageFolder:
+					RegisterV2PageLookup(pageFolder.Page, pageFolder, urlToFile);
+					break;
+			}
+
+			if (item is INodeNavigationItem<INavigationModel, INavigationItem> node)
+				RegisterV2PageLookups(node.NavigationItems, urlToFile);
+		}
+	}
+
+	private void RegisterV2PageLookup(
+		Uri page,
+		INavigationItem item,
+		IReadOnlyDictionary<string, IDocumentationFile> urlToFile
+	)
+	{
+		if (TryResolvePageSource(page, out var file) || urlToFile.TryGetValue(item.Url, out file))
+			_ = NavigationDocumentationFileLookup.TryAdd(file, item);
+	}
+
+	private bool TryResolvePageSource(Uri page, out IDocumentationFile file)
+	{
+		file = null!;
+		var pagePath = GetUriPath(page);
+		if (string.IsNullOrEmpty(pagePath))
+			return false;
+
+		var segments = pagePath.Split('/', StringSplitOptions.RemoveEmptyEntries);
+		for (var length = segments.Length; length > 0; length--)
+		{
+			var tocPath = string.Join('/', segments.Take(length));
+			if (!Nodes.TryGetValue(CreateTocUri(page.Scheme, tocPath), out var node))
+				continue;
+
+			var remainingPath = string.Join('/', segments.Skip(length));
+			if (string.IsNullOrEmpty(remainingPath))
+			{
+				file = node.Index.Model;
+				return true;
+			}
+
+			if (TryFindDocumentationFile(node, remainingPath, out file))
+				return true;
+		}
+
+		return false;
+	}
+
+	private static bool TryFindDocumentationFile(
+		INavigationItem item,
+		string remainingPath,
+		out IDocumentationFile file
+	)
+	{
+		switch (item)
+		{
+			case ILeafNavigationItem<IDocumentationFile> leaf when MatchesRemainingPath(leaf.Url, remainingPath):
+				file = leaf.Model;
+				return true;
+			case INodeNavigationItem<IDocumentationFile, INavigationItem> node:
+				if (MatchesRemainingPath(node.Index.Url, remainingPath))
+				{
+					file = node.Index.Model;
+					return true;
+				}
+				foreach (var child in node.NavigationItems)
+				{
+					if (TryFindDocumentationFile(child, remainingPath, out file))
+						return true;
+				}
+				break;
+			case INodeNavigationItem<INavigationModel, INavigationItem> node:
+				foreach (var child in node.NavigationItems)
+				{
+					if (TryFindDocumentationFile(child, remainingPath, out file))
+						return true;
+				}
+				break;
+		}
+
+		file = null!;
+		return false;
+	}
+
+	private static bool MatchesRemainingPath(string url, string remainingPath)
+	{
+		var normalizedPath = NormalizePagePath(remainingPath);
+		return url.TrimEnd('/').EndsWith($"/{normalizedPath}", StringComparison.OrdinalIgnoreCase);
+	}
+
+	private static string NormalizePagePath(string path)
+	{
+		var normalized = path.Trim('/');
+		if (normalized.EndsWith(".md", StringComparison.OrdinalIgnoreCase))
+			normalized = normalized[..^3];
+		if (normalized.EndsWith("/index", StringComparison.OrdinalIgnoreCase))
+			normalized = normalized[..^6];
+		return normalized;
+	}
+
+	private static Uri CreateTocUri(string scheme, string path)
+	{
+		var slash = path.IndexOf('/');
+		return slash < 0
+			? new Uri($"{scheme}://{path}")
+			: new Uri($"{scheme}://{path[..slash]}/{path[(slash + 1)..]}");
+	}
+
+	private static string GetUriPath(Uri uri) => (uri.Host + uri.AbsolutePath).Trim('/');
+
+	private static void CollectDocumentationFilesByUrl(
+		INavigationItem item,
+		Dictionary<string, IDocumentationFile> urlToFile,
+		string sitePrefix
+	)
+	{
+		switch (item)
+		{
+			case ILeafNavigationItem<IDocumentationFile> leaf:
+				AddDocumentationFileUrl(urlToFile, leaf.Url, leaf.Model, sitePrefix);
+				break;
+			case INodeNavigationItem<IDocumentationFile, INavigationItem> node:
+				AddDocumentationFileUrl(urlToFile, node.Url, node.Index.Model, sitePrefix);
+				AddDocumentationFileUrl(urlToFile, node.Index.Url, node.Index.Model, sitePrefix);
+				foreach (var child in node.NavigationItems)
+					CollectDocumentationFilesByUrl(child, urlToFile, sitePrefix);
+				break;
+			case INodeNavigationItem<INavigationModel, INavigationItem> node:
+				foreach (var child in node.NavigationItems)
+					CollectDocumentationFilesByUrl(child, urlToFile, sitePrefix);
+				break;
+		}
+	}
+
+	private static void AddDocumentationFileUrl(
+		Dictionary<string, IDocumentationFile> urlToFile,
+		string url,
+		IDocumentationFile file,
+		string sitePrefix
+	)
+	{
+		_ = urlToFile.TryAdd(url, file);
+
+		if (sitePrefix == "/" || string.IsNullOrEmpty(url) || !url.StartsWith('/'))
+			return;
+
+		_ = urlToFile.TryAdd($"{sitePrefix.TrimEnd('/')}{url}", file);
+	}
+
 	private static IReadOnlyList<INavigationItem> BuildV2Items(
 		IReadOnlyList<INavV2Item> v2Items,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,
diff --git a/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs b/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs
index c79316636d..89bf6a0914 100644
--- a/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs
+++ b/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs
@@ -10,6 +10,7 @@
 using Elastic.Documentation.Navigation.Isolated;
 using Elastic.Documentation.Navigation.Isolated.Node;
 using Elastic.Documentation.Navigation.Tests.Isolation;
+using Elastic.Documentation.Navigation.V2;
 
 namespace Elastic.Documentation.Navigation.Tests.Assembler;
 
@@ -305,4 +306,79 @@ public void SitePrefixAppliedToMultipleNavigationItems(string? sitePrefix, strin
 		var searchItem = navigation.NavigationItems.Skip(1).First();
 		searchItem.Url.Should().Be(expectedSearchUrl, $"search URL should be '{expectedSearchUrl}' with sitePrefix '{sitePrefix}'");
 	}
+
+	[Fact]
+	public void SiteNavigationV2PageEntriesResolveFilesFromUnseenChildTocs()
+	{
+		var fileSystem = new MockFileSystem();
+		var docsContentDir = "/checkouts/current/docs-content";
+
+		// language=yaml
+		var docsetYaml = """
+		                 project: Docs content
+		                 toc:
+		                   - file: index.md
+		                   - toc: products
+		                 """;
+		fileSystem.AddFile($"{docsContentDir}/docs/docset.yml", new MockFileData(docsetYaml));
+		fileSystem.AddFile($"{docsContentDir}/docs/index.md", new MockFileData("# Docs content"));
+
+		// language=yaml
+		var productsTocYaml = """
+		                      toc:
+		                        - file: index.md
+		                        - toc: elasticsearch
+		                      """;
+		fileSystem.AddFile($"{docsContentDir}/docs/products/toc.yml", new MockFileData(productsTocYaml));
+		fileSystem.AddFile($"{docsContentDir}/docs/products/index.md", new MockFileData("# Product hubs"));
+
+		// language=yaml
+		var elasticsearchTocYaml = """
+		                           toc:
+		                             - file: v9.md
+		                           """;
+		fileSystem.AddFile($"{docsContentDir}/docs/products/elasticsearch/toc.yml", new MockFileData(elasticsearchTocYaml));
+		fileSystem.AddFile($"{docsContentDir}/docs/products/elasticsearch/v9.md", new MockFileData("# Elasticsearch"));
+
+		// language=yaml
+		var siteNavYaml = """
+		                  toc:
+		                    - toc: products
+		                  """;
+		var siteNavFile = SiteNavigationFile.Deserialize(siteNavYaml);
+
+		// language=yaml
+		var v2NavYaml = """
+		                nav:
+		                  - section: Product hubs
+		                    url: /products/
+		                    children:
+		                      - page: docs-content://products/elasticsearch/v9.md
+		                        title: Elasticsearch
+		                """;
+		var v2File = NavigationV2File.Deserialize(v2NavYaml);
+
+		var docsContentContext = SiteNavigationTestFixture.CreateAssemblerContext(fileSystem, docsContentDir, output);
+		var docset = DocumentationSetFile.LoadAndResolve(
+			docsContentContext.Collector,
+			fileSystem.FileInfo.New($"{docsContentDir}/docs/docset.yml"),
+			FileSystemFactory.ScopeSourceDirectory(fileSystem, "/checkouts")
+		);
+		var docsContentNav = new DocumentationSetNavigation<IDocumentationFile>(
+			docset,
+			docsContentContext,
+			GenericDocumentationFileFactory.Instance
+		);
+
+		var siteContext = SiteNavigationTestFixture.CreateAssemblerContext(fileSystem, docsContentDir, output);
+		var navigation = new SiteNavigationV2(v2File, siteNavFile, siteContext, [docsContentNav], sitePrefix: "docs");
+
+		var elasticsearchToc = navigation.Nodes[new Uri("docs-content://products/elasticsearch")];
+		var elasticsearchFile = elasticsearchToc.Index.Model;
+
+		navigation.NavigationDocumentationFileLookup.TryGetValue(elasticsearchFile, out var navigationItem)
+			.Should().BeTrue("V2 page entries should map docs files even when their child TOC is not declared in navigation.yml");
+		navigationItem.Should().BeOfType<PageCrossLinkLeaf>();
+		navigationItem.Url.Should().Be("/docs/products/elasticsearch/v9");
+	}
 }

From d556dff3c9f26911e00af4f4c2d3a264e869429e Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 4 May 2026 17:20:59 +0200
Subject: [PATCH 126/226] fix(nav): register files from unseen child TOCs

Assembler builds can process pages from nested TOCs that are not explicitly declared in global navigation, so register those files for positional lookup and let V2 page entries replace them when present.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assembler/SiteNavigation.cs               |  5 ++
 .../NavigationItemExtensions.cs               | 29 +++++++++
 .../V2/SiteNavigationV2.cs                    |  5 +-
 .../Assembler/SiteNavigationTests.cs          | 63 +++++++++++++++++++
 4 files changed, 101 insertions(+), 1 deletion(-)

diff --git a/src/Elastic.Documentation.Navigation/Assembler/SiteNavigation.cs b/src/Elastic.Documentation.Navigation/Assembler/SiteNavigation.cs
index 291c80bed3..0e59fb4cd6 100644
--- a/src/Elastic.Documentation.Navigation/Assembler/SiteNavigation.cs
+++ b/src/Elastic.Documentation.Navigation/Assembler/SiteNavigation.cs
@@ -104,6 +104,11 @@ public SiteNavigation(
 		// Build positional navigation lookup tables from all navigation items in a single traversal
 		NavigationDocumentationFileLookup = [];
 		NavigationIndexedByOrder = this.BuildNavigationLookups(NavigationDocumentationFileLookup);
+		foreach (var node in UnseenNodes)
+		{
+			if (_nodes.TryGetValue(node, out var value))
+				value.AddNavigationFileLookups(NavigationDocumentationFileLookup);
+		}
 	}
 
 	public HashSet<Uri> DeclaredPhantoms { get; }
diff --git a/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs b/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs
index 762561469d..c851904805 100644
--- a/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs
+++ b/src/Elastic.Documentation.Navigation/NavigationItemExtensions.cs
@@ -94,6 +94,12 @@ public static FrozenDictionary<int, INavigationItem> BuildNavigationLookups(
 		return navigationByOrder.ToFrozenDictionary();
 	}
 
+	public static void AddNavigationFileLookups(
+		this INavigationItem rootItem,
+		ConditionalWeakTable<IDocumentationFile, INavigationItem> navigationDocumentationFileLookup
+	) =>
+		AddNavigationFileLookupsRecursive(rootItem, navigationDocumentationFileLookup);
+
 	/// <summary>
 	/// Recursively builds both NavigationDocumentationFileLookup and NavigationIndexedByOrder in a single traversal,
 	/// also collecting a URL-to-file map used by the second pass to resolve V2 page: entries.
@@ -134,6 +140,29 @@ private static void BuildNavigationLookupsRecursive(
 		}
 	}
 
+	private static void AddNavigationFileLookupsRecursive(
+		INavigationItem item,
+		ConditionalWeakTable<IDocumentationFile, INavigationItem> navigationDocumentationFileLookup)
+	{
+		switch (item)
+		{
+			case CrossLinkNavigationLeaf:
+				break;
+			case ILeafNavigationItem<IDocumentationFile> documentationFileLeaf:
+				_ = navigationDocumentationFileLookup.TryAdd(documentationFileLeaf.Model, documentationFileLeaf);
+				break;
+			case INodeNavigationItem<IDocumentationFile, INavigationItem> documentationFileNode:
+				_ = navigationDocumentationFileLookup.TryAdd(documentationFileNode.Index.Model, documentationFileNode);
+				foreach (var child in documentationFileNode.NavigationItems)
+					AddNavigationFileLookupsRecursive(child, navigationDocumentationFileLookup);
+				break;
+			case INodeNavigationItem<INavigationModel, INavigationItem> node:
+				foreach (var child in node.NavigationItems)
+					AddNavigationFileLookupsRecursive(child, navigationDocumentationFileLookup);
+				break;
+		}
+	}
+
 	/// <summary>
 	/// Second pass: for every V2 <c>page:</c> entry (<see cref="PageCrossLinkLeaf"/>) whose URL
 	/// matches a file already known from the V1 toc traversal, register that file in the lookup
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 4b9cf4f5a7..7d9f1aa8ff 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -192,7 +192,10 @@ IReadOnlyDictionary<string, IDocumentationFile> urlToFile
 	)
 	{
 		if (TryResolvePageSource(page, out var file) || urlToFile.TryGetValue(item.Url, out file))
-			_ = NavigationDocumentationFileLookup.TryAdd(file, item);
+		{
+			_ = NavigationDocumentationFileLookup.Remove(file);
+			NavigationDocumentationFileLookup.Add(file, item);
+		}
 	}
 
 	private bool TryResolvePageSource(Uri page, out IDocumentationFile file)
diff --git a/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs b/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs
index 89bf6a0914..27daf3f7cb 100644
--- a/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs
+++ b/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs
@@ -381,4 +381,67 @@ public void SiteNavigationV2PageEntriesResolveFilesFromUnseenChildTocs()
 		navigationItem.Should().BeOfType<PageCrossLinkLeaf>();
 		navigationItem.Url.Should().Be("/docs/products/elasticsearch/v9");
 	}
+
+	[Fact]
+	public void SiteNavigationResolvesFilesFromUnseenChildTocs()
+	{
+		var fileSystem = new MockFileSystem();
+		var docsContentDir = "/checkouts/current/docs-content";
+
+		// language=yaml
+		var docsetYaml = """
+		                 project: Docs content
+		                 toc:
+		                   - file: index.md
+		                   - toc: products
+		                 """;
+		fileSystem.AddFile($"{docsContentDir}/docs/docset.yml", new MockFileData(docsetYaml));
+		fileSystem.AddFile($"{docsContentDir}/docs/index.md", new MockFileData("# Docs content"));
+
+		// language=yaml
+		var productsTocYaml = """
+		                      toc:
+		                        - file: index.md
+		                        - toc: elasticsearch
+		                      """;
+		fileSystem.AddFile($"{docsContentDir}/docs/products/toc.yml", new MockFileData(productsTocYaml));
+		fileSystem.AddFile($"{docsContentDir}/docs/products/index.md", new MockFileData("# Product hubs"));
+
+		// language=yaml
+		var elasticsearchTocYaml = """
+		                           toc:
+		                             - file: v9.md
+		                           """;
+		fileSystem.AddFile($"{docsContentDir}/docs/products/elasticsearch/toc.yml", new MockFileData(elasticsearchTocYaml));
+		fileSystem.AddFile($"{docsContentDir}/docs/products/elasticsearch/v9.md", new MockFileData("# Elasticsearch"));
+
+		// language=yaml
+		var siteNavYaml = """
+		                  toc:
+		                    - toc: products
+		                  """;
+		var siteNavFile = SiteNavigationFile.Deserialize(siteNavYaml);
+
+		var docsContentContext = SiteNavigationTestFixture.CreateAssemblerContext(fileSystem, docsContentDir, output);
+		var docset = DocumentationSetFile.LoadAndResolve(
+			docsContentContext.Collector,
+			fileSystem.FileInfo.New($"{docsContentDir}/docs/docset.yml"),
+			FileSystemFactory.ScopeSourceDirectory(fileSystem, "/checkouts")
+		);
+		var docsContentNav = new DocumentationSetNavigation<IDocumentationFile>(
+			docset,
+			docsContentContext,
+			GenericDocumentationFileFactory.Instance
+		);
+
+		var siteContext = SiteNavigationTestFixture.CreateAssemblerContext(fileSystem, docsContentDir, output);
+		var navigation = new SiteNavigation(siteNavFile, siteContext, [docsContentNav], sitePrefix: "docs");
+
+		var elasticsearchToc = navigation.Nodes[new Uri("docs-content://products/elasticsearch")];
+		var elasticsearchFile = elasticsearchToc.Index.Model;
+
+		navigation.NavigationDocumentationFileLookup.TryGetValue(elasticsearchFile, out var navigationItem)
+			.Should().BeTrue("unseen child TOCs can still own files that the assembler processes");
+		navigationItem.Should().BeSameAs(elasticsearchToc);
+	}
 }

From 65bc6de90ab1068f506661063d4212d699df44b4 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Mon, 4 May 2026 19:28:30 +0200
Subject: [PATCH 127/226] Refine page-top metadata: pills inside Availability
 box, text+? tooltips

Successive refinements after the initial restructure:

- Move product pills from above the H1 into the box's title row, alongside
  the "This page applies to" label. Drops ProductPills.cshtml partial and
  the page-meta divider; the box is now the single page-top metadata zone.
- Drop the Subscription placeholder row and its CSS.
- Render applies_to entries as plain text + a small "?" icon (CSS-only
  reskin of the existing applies-to-popover), comma-separated. The "?"
  still triggers the rich tooltip on hover/click. No more "or" separator.
- Sort items so Serverless lands first, then other available items, with
  unavailable items at the end (struck-through + dimmed).
- Title typography lifts the row above the rest of the box without
  shouting (15px / 700 / ink-dark vs 13px / 600 / grey-80 row labels).
- Stack tooltip description now substitutes {base}/{current}/{base-major}
  from the VersioningSystem so the tooltip surfaces the actual range
  ("Elastic Stack 9.0.0 to 9.4.0...") instead of a static blurb.
- All four Serverless tooltip descriptions append a sentence noting that
  Serverless UI/capabilities can differ from versioned Elastic Stack.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Assets/markdown/metadata-box.css          | 303 ++++++++++--------
 .../Myst/Components/ApplicabilityRenderer.cs  |  20 +-
 .../Myst/Components/ApplicableToViewModel.cs  |  19 +-
 .../Myst/Components/ProductDescriptions.cs    |  13 +-
 src/Elastic.Markdown/Page/Index.cshtml        |   2 -
 src/Elastic.Markdown/Page/MetadataBox.cshtml  | 107 ++++---
 src/Elastic.Markdown/Page/ProductPills.cshtml |  29 --
 7 files changed, 276 insertions(+), 217 deletions(-)
 delete mode 100644 src/Elastic.Markdown/Page/ProductPills.cshtml

diff --git a/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css b/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css
index 08e6357a16..7d90dca7fc 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css
@@ -1,39 +1,184 @@
 /*
- * Page-top product pills + Requirements box. The pills sit just below the
- * H1 (one per `products:` frontmatter entry whose product has `hub:` set);
- * the box sits below the pills and surfaces applies_to-driven metadata in
- * a labeled two-column layout. Hub layout opts out (the partials return
- * early when YamlFrontMatter.Layout is set).
+ * Page-top "Availability" box. Sits below the H1 and consolidates two
+ * page-level metadata systems in a single container:
+ *
+ *   - Product hub pills, in the summary row alongside the "Availability"
+ *     label, for navigation to each product's hub page.
+ *   - applies_to-driven rows (Versions / Deployments) below the summary,
+ *     collapsible via native <details>, expanded by default.
+ *
+ * Hub layout (and any frontmatter Layout) opts out -- the partial returns
+ * early. The box only renders when at least one of pills or rows exists.
  */
 
 @layer components {
-	/*
-	 * Product hub pills below the H1. Brand-color dot + display name.
-	 */
-	/* Thin separator that sits between the H1 and the Requirements box,
-	   carrying the visual weight the old applies-to summary line used to
-	   provide. Keeps the page-top chrome anchored. */
-	.page-meta-divider {
-		height: 0;
-		margin: 18px 0;
-		border: none;
+	.metadata-box {
+		margin: 16px 0 24px 0;
+		padding: 8px 14px;
+		background: var(--color-grey-10);
+		border: 1px solid var(--color-grey-20);
+		border-radius: 6px;
+		font-size: 13px;
+		line-height: 1.4;
+	}
+
+	.metadata-box-heading {
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		gap: 6px 12px;
+		cursor: pointer;
+		list-style: none;
+		padding: 2px 0 6px 0;
+		user-select: none;
+	}
+	.metadata-box-heading::-webkit-details-marker {
+		display: none;
+	}
+	.metadata-box-heading:focus-visible {
+		outline: 2px solid var(--color-blue-elastic);
+		outline-offset: 2px;
+		border-radius: 3px;
+	}
+
+	.metadata-box-summary-only .metadata-box-heading {
+		cursor: default;
+	}
+
+	/* Title sits one step above the row labels in the visual hierarchy:
+	   slightly larger, heavier weight, full ink color. Row labels stay
+	   smaller and lighter, so the title reads as the box's heading and
+	   the pills next to it become the headlined entries. */
+	.metadata-box-title {
+		flex: 0 0 auto;
+		font-size: 15px;
+		font-weight: 700;
+		color: var(--color-ink-dark);
+	}
+
+	.metadata-box-pills {
+		display: inline-flex;
+		flex-wrap: wrap;
+		align-items: center;
+		gap: 6px;
+		flex: 1 1 auto;
+	}
+
+	.metadata-box-chevron {
+		flex-shrink: 0;
+		margin-left: auto;
+		color: var(--color-grey-60);
+		transition: transform 0.15s ease;
+	}
+	.metadata-box[open] .metadata-box-chevron {
+		transform: rotate(180deg);
+	}
+
+	.metadata-box-rows {
+		display: flex;
+		flex-direction: column;
+		gap: 4px;
+		margin-top: 6px;
+		padding-top: 10px;
 		border-top: 1px solid var(--color-grey-20);
 	}
 
-	.product-pills {
+	.metadata-row {
 		display: flex;
 		flex-wrap: wrap;
+		align-items: center;
+		gap: 6px 10px;
+		min-height: 24px;
+	}
+
+	.metadata-label {
+		flex: 0 0 auto;
+		min-width: 100px;
+		font-weight: 600;
+		color: var(--color-grey-80);
+	}
+
+	.metadata-values {
+		display: inline-flex;
+		flex-wrap: wrap;
+		align-items: center;
 		gap: 6px;
+		min-width: 0;
+	}
+
+	/*
+	 * Render applies_to entries as plain comma-separated text + a small
+	 * "?" icon that carries the existing popover tooltip. Implemented in
+	 * CSS so we don't touch the popover web component:
+	 *   - Override the global `display: contents` on the popover host so
+	 *     it has its own box (and ::before content can render).
+	 *   - Use ::before with `attr(badge-key)` to print the entry's name.
+	 *   - Reskin the visible `.applicable-info` pill into a 16px "?"
+	 *     circle that still triggers the tooltip on hover/click.
+	 */
+	.metadata-values.applies applies-to-popover {
+		display: inline-flex;
+		align-items: center;
+		color: var(--color-ink-dark);
+	}
+	.metadata-values applies-to-popover::before {
+		content: attr(badge-key);
+	}
+	.metadata-values applies-to-popover:not(:first-child)::before {
+		content: ', ' attr(badge-key);
+	}
+
+	.metadata-values .applicable-info {
+		all: unset;
+		display: inline-flex;
 		align-items: center;
-		/* Pull tight against the breadcrumb's bottom padding so the pills
-		   read as part of the breadcrumb strip, not a separate row. */
-		margin: -16px 0 14px 0;
+		justify-content: center;
+		width: 14px;
+		height: 14px;
+		margin-left: 4px;
+		border-radius: 999px;
+		background: var(--color-grey-20);
+		color: var(--color-grey-80);
+		font-size: 10px;
+		font-weight: 700;
+		line-height: 1;
+		cursor: help;
+		transition:
+			background-color 0.15s ease,
+			color 0.15s ease;
+	}
+	.metadata-values .applicable-info::before {
+		content: '?';
+	}
+	.metadata-values .applicable-info > * {
+		display: none;
+	}
+	.metadata-values .applicable-info:hover {
+		background: var(--color-grey-30);
+		color: var(--color-ink-dark);
 	}
 
-	/* Override `.markdown-content a` (blue + underline) with a more
-	   specific selector. Pills are nav affordances, not body links.
-	   `!important` on color + decoration is a safety net against any
-	   utility-layer rules that beat us on cascade order. */
+	/* Unavailable items (sorted to the end by ApplicableToViewModel) render
+	   dimmed + struck-through to read as "not in scope" rather than as a
+	   peer alternative. */
+	.metadata-values applies-to-popover[lifecycle-class='unavailable']::before {
+		text-decoration: line-through;
+		text-decoration-color: var(--color-ink-light);
+		color: var(--color-ink-light);
+	}
+	.metadata-values
+		applies-to-popover[lifecycle-class='unavailable']
+		.applicable-info {
+		opacity: 0.65;
+	}
+
+	/*
+	 * Product hub pills (used inside the metadata box's summary row).
+	 * Brand-color dot + display name + arrow. Rendered as anchors, so we
+	 * override `.markdown-content a` (blue + underline) explicitly --
+	 * `!important` is the safety net against utility-layer rules that beat
+	 * us on cascade order.
+	 */
 	.markdown-content a.product-badge,
 	a.product-badge {
 		display: inline-flex;
@@ -125,118 +270,6 @@
 		background: rgb(0 191 179 / 0.06);
 	}
 
-	/*
-	 * Requirements box. Two columns: a heading on the left that titles the
-	 * whole box, and a stack of labeled rows on the right. Hidden when no
-	 * applies_to-driven row would render.
-	 */
-	.metadata-box {
-		margin: 16px 0 24px 0;
-		padding: 8px 14px;
-		background: var(--color-grey-10);
-		border: 1px solid var(--color-grey-20);
-		border-radius: 6px;
-		font-size: 13px;
-		line-height: 1.4;
-	}
-
-	.metadata-box-heading {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		gap: 12px;
-		cursor: pointer;
-		list-style: none;
-		padding: 4px 0;
-		font-size: 14px;
-		font-weight: 600;
-		color: var(--color-ink-dark);
-		user-select: none;
-	}
-	.metadata-box-heading::-webkit-details-marker {
-		display: none;
-	}
-	.metadata-box-heading:focus-visible {
-		outline: 2px solid var(--color-blue-elastic);
-		outline-offset: 2px;
-		border-radius: 3px;
-	}
-
-	.metadata-box-chevron {
-		flex-shrink: 0;
-		color: var(--color-grey-60);
-		transition: transform 0.15s ease;
-	}
-	.metadata-box[open] .metadata-box-chevron {
-		transform: rotate(180deg);
-	}
-
-	.metadata-box-rows {
-		display: flex;
-		flex-direction: column;
-		gap: 4px;
-		margin-top: 8px;
-		padding-top: 10px;
-		border-top: 1px solid var(--color-grey-20);
-	}
-
-	.metadata-row {
-		display: flex;
-		flex-wrap: wrap;
-		align-items: center;
-		gap: 6px 10px;
-		min-height: 24px;
-	}
-
-	.metadata-label {
-		flex: 0 0 auto;
-		min-width: 100px;
-		font-weight: 600;
-		color: var(--color-ink-dark);
-	}
-
-	.metadata-values {
-		display: inline-flex;
-		flex-wrap: wrap;
-		align-items: center;
-		row-gap: 4px;
-		min-width: 0;
-	}
-
-	/*
-	 * When the row has multiple entries, separate them with "or". Override
-	 * the global `.applies applies-to-popover { display: contents }` so the
-	 * popover's ::before generates a real separator inline.
-	 */
-	.metadata-values.applies applies-to-popover {
-		display: inline-flex;
-		align-items: center;
-	}
-	.metadata-values > * + *::before {
-		content: 'or';
-		margin: 0 8px;
-		color: var(--color-ink-light);
-		font-size: 12px;
-		font-style: italic;
-	}
-
-	/*
-	 * Plain pill for placeholder values like the Subscription row, until
-	 * real metadata replaces it. Visually quieter than the applies_to
-	 * popover badges so it reads as informational, not interactive.
-	 */
-	.metadata-pill {
-		display: inline-flex;
-		align-items: center;
-		padding: 2px 10px;
-		border-radius: 999px;
-		background: var(--color-white);
-		border: 1px solid var(--color-grey-20);
-		color: var(--color-ink-dark);
-		font-size: 12px;
-		line-height: 1.3;
-	}
-
 	@media (max-width: 640px) {
 		.metadata-row {
 			flex-direction: column;
diff --git a/src/Elastic.Markdown/Myst/Components/ApplicabilityRenderer.cs b/src/Elastic.Markdown/Myst/Components/ApplicabilityRenderer.cs
index a6a3dd4a6d..14708ddaf0 100644
--- a/src/Elastic.Markdown/Myst/Components/ApplicabilityRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Components/ApplicabilityRenderer.cs
@@ -164,8 +164,10 @@ private static PopoverData BuildPopoverData(
 
 		var showVersionNote = productInfo is { IncludeVersionNote: true } && versioningSystem.IsVersioned();
 
+		var description = InterpolateVersionPlaceholders(productInfo?.Description, versioningSystem);
+
 		return new PopoverData(
-			ProductDescription: productInfo?.Description,
+			ProductDescription: description,
 			AvailabilityItems: orderedApplicabilities.Select(applicability => BuildAvailabilityItem(applicability, versioningSystem, productName, applicabilities.Count)).OfType<PopoverAvailabilityItem>().ToArray(),
 			AdditionalInfo: productInfo?.AdditionalAvailabilityInfo,
 			ShowVersionNote: showVersionNote,
@@ -173,6 +175,22 @@ private static PopoverData BuildPopoverData(
 		);
 	}
 
+	/// <summary>
+	/// Substitutes <c>{base}</c>, <c>{current}</c>, and <c>{base-major}</c> placeholders in
+	/// product descriptions with values from the versioning system, so tooltips can surface
+	/// the actual version range without hardcoding it in <c>ProductDescriptions</c>.
+	/// </summary>
+	private static string? InterpolateVersionPlaceholders(string? template, VersioningSystem versioningSystem)
+	{
+		if (string.IsNullOrEmpty(template))
+			return template;
+
+		return template
+			.Replace("{base}", versioningSystem.Base.ToString())
+			.Replace("{current}", versioningSystem.Current.ToString())
+			.Replace("{base-major}", versioningSystem.Base.Major.ToString());
+	}
+
 	/// <summary>
 	/// Builds an availability item for an applicability entry.
 	/// Returns null if the item should not be added to the availability list.
diff --git a/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs b/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs
index 7dffae80ea..1f0992f4a3 100644
--- a/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs
+++ b/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs
@@ -91,7 +91,24 @@ public IReadOnlyCollection<ApplicabilityItem> GetApplicabilityItems()
 			_ => CollectCombinedRaw()
 		};
 
-		return RenderGroupedItems(rawItems).ToArray();
+		var rendered = RenderGroupedItems(rawItems);
+
+		// In the metadata-box rows, surface Serverless first, then other available
+		// items, then unavailable items at the end. The CSS suppresses the "or"
+		// separator before unavailable items so they read as a distinct group.
+		if (BadgePlacement is ApplicabilityBadgePlacement.StackVersionsRow
+			or ApplicabilityBadgePlacement.DeploymentsRow
+			or ApplicabilityBadgePlacement.OtherProductsRow)
+		{
+			rendered = rendered
+				.Select((item, index) => (item, index))
+				.OrderBy(x => x.item.RenderData.LifecycleClass == "unavailable" ? 1 : 0)
+				.ThenBy(x => x.item.Key.StartsWith("Serverless", StringComparison.Ordinal) ? 0 : 1)
+				.ThenBy(x => x.index)
+				.Select(x => x.item);
+		}
+
+		return rendered.ToArray();
 	}
 
 	private List<RawApplicabilityItem> CollectCombinedRaw()
diff --git a/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs b/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs
index bee9e8a7c8..612fd1af87 100644
--- a/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs
+++ b/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs
@@ -34,33 +34,34 @@ bool IncludeVersionNote
 
 	private static readonly Dictionary<VersioningSystemId, ProductInfo> Descriptions = new()
 	{
-		// Stack
+		// Stack -- {base} and {current} are interpolated by ApplicabilityRenderer
+		// from the Stack VersioningSystem so the tooltip surfaces the actual range.
 		[VersioningSystemId.Stack] = new ProductInfo(
-			Description: "The <strong>Elastic Stack</strong> includes Elastic's core products such as Elasticsearch, Kibana, Logstash, and Beats.",
+			Description: "This documentation applies to <strong>Elastic Stack</strong> {base} to {current}. To know if this functionality exists in versions prior to v{base-major}, refer to the corresponding version of the documentation.",
 			AdditionalAvailabilityInfo: "Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.",
 			IncludeVersionNote: true
 		),
 
 		// Serverless
 		[VersioningSystemId.Serverless] = new ProductInfo(
-			Description: "<strong>Elastic Cloud Serverless</strong> projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud.",
+			Description: "<strong>Elastic Cloud Serverless</strong> projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud. Their UI and capabilities can differ from the traditionally versioned Elastic Stack.",
 			AdditionalAvailabilityInfo: "Serverless interfaces and procedures might differ from classic Elastic Stack deployments.",
 			IncludeVersionNote: false
 		),
 
 		// Serverless Project Types
 		[VersioningSystemId.ElasticsearchProject] = new ProductInfo(
-			Description: "<strong>Elastic Cloud Serverless</strong> projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud.",
+			Description: "<strong>Elastic Cloud Serverless</strong> projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud. Their UI and capabilities can differ from the traditionally versioned Elastic Stack.",
 			AdditionalAvailabilityInfo: null,
 			IncludeVersionNote: false
 		),
 		[VersioningSystemId.ObservabilityProject] = new ProductInfo(
-			Description: "<strong>Elastic Cloud Serverless</strong> projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud.",
+			Description: "<strong>Elastic Cloud Serverless</strong> projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud. Their UI and capabilities can differ from the traditionally versioned Elastic Stack.",
 			AdditionalAvailabilityInfo: null,
 			IncludeVersionNote: false
 		),
 		[VersioningSystemId.SecurityProject] = new ProductInfo(
-			Description: "<strong>Elastic Cloud Serverless</strong> projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud.",
+			Description: "<strong>Elastic Cloud Serverless</strong> projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud. Their UI and capabilities can differ from the traditionally versioned Elastic Stack.",
 			AdditionalAvailabilityInfo: null,
 			IncludeVersionNote: false
 		),
diff --git a/src/Elastic.Markdown/Page/Index.cshtml b/src/Elastic.Markdown/Page/Index.cshtml
index 4f89660c1c..70ca017a50 100644
--- a/src/Elastic.Markdown/Page/Index.cshtml
+++ b/src/Elastic.Markdown/Page/Index.cshtml
@@ -92,10 +92,8 @@
 <section id="elastic-docs-v3">
 	@if (Model.CurrentDocument.YamlFrontMatter?.Layout != MarkdownPageLayout.Hub)
 	{
-		@await RenderPartialAsync(ProductPills.Create(Model))
 		@* This way it's correctly rendered as <h1>text</h1> instead of <h1><p>text</p></h1> *@
 		@(new HtmlString(Markdown.ToHtml("# " + Model.TitleRaw)))
-		<hr class="page-meta-divider" />
 		@await RenderPartialAsync(MetadataBox.Create(Model))
 	}
 	@(new HtmlString(Model.MarkdownHtml))
diff --git a/src/Elastic.Markdown/Page/MetadataBox.cshtml b/src/Elastic.Markdown/Page/MetadataBox.cshtml
index 0b49d8dffd..c0ae7791fc 100644
--- a/src/Elastic.Markdown/Page/MetadataBox.cshtml
+++ b/src/Elastic.Markdown/Page/MetadataBox.cshtml
@@ -5,6 +5,12 @@
 	if (layout is not null)
 		return;
 
+	var prefix = Model.UrlPathPrefix?.TrimEnd('/') ?? string.Empty;
+	var productHubs = Model.Products
+		.Where(p => !string.IsNullOrWhiteSpace(p.Hub))
+		.OrderBy(p => p.DisplayName, StringComparer.Ordinal)
+		.ToList();
+
 	var hasStackVersions = false;
 	var hasDeployments = false;
 	if (Model.AppliesTo is not null)
@@ -14,56 +20,71 @@
 		hasDeployments = Model.AppliesTo.Deployment is not null;
 	}
 
-	// Subscription is a placeholder until the metadata exists. Hardcoded so the
-	// row is always visible alongside the real applies_to data.
-	const string subscriptionPlaceholder = "Enterprise";
-
-	if (!hasStackVersions && !hasDeployments)
+	var hasPills = productHubs.Count > 0;
+	var hasRows = hasStackVersions || hasDeployments;
+	if (!hasPills && !hasRows)
 		return;
 }
-<details class="metadata-box" open aria-label="Page requirements">
+<details class="metadata-box@(hasRows ? "" : " metadata-box-summary-only")" @(hasRows ? "open" : "") aria-label="This page applies to">
 	<summary class="metadata-box-heading">
-		<span class="metadata-box-title">Requirements</span>
-		<svg class="metadata-box-chevron" width="14" height="14" viewBox="0 0 16 16" fill="none" aria-hidden="true">
-			<path d="M4 6l4 4 4-4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-		</svg>
-	</summary>
-	<div class="metadata-box-rows">
-		@if (hasStackVersions)
+		<span class="metadata-box-title">This page applies to</span>
+		@if (hasPills)
 		{
-			<div class="metadata-row metadata-row-versions">
-				<span class="metadata-label">Versions</span>
-				<div class="metadata-values applies">
-					@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
-					{
-						AppliesTo = Model.AppliesTo!,
-						Inline = false,
-						VersionsConfig = Model.VersionsConfig,
-						BadgePlacement = ApplicabilityBadgePlacement.StackVersionsRow
-					}))
-				</div>
+			<div class="metadata-box-pills">
+				@foreach (var product in productHubs)
+				{
+					var hub = product.Hub!;
+					var isAbsolute = hub.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
+						|| hub.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
+					var href = isAbsolute ? hub : $"{prefix}/{hub.Trim('/')}/";
+					<a class="product-badge product-badge-@product.Id" href="@href">
+						<span class="product-badge-dot" aria-hidden="true"></span>
+						<span class="product-badge-label">@product.DisplayName</span>
+						<span class="product-badge-arrow" aria-hidden="true">&rarr;</span>
+					</a>
+				}
 			</div>
 		}
-		@if (hasDeployments)
+		@if (hasRows)
 		{
-			<div class="metadata-row metadata-row-deployments">
-				<span class="metadata-label">Deployments</span>
-				<div class="metadata-values applies">
-					@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
-					{
-						AppliesTo = Model.AppliesTo!,
-						Inline = false,
-						VersionsConfig = Model.VersionsConfig,
-						BadgePlacement = ApplicabilityBadgePlacement.DeploymentsRow
-					}))
-				</div>
-			</div>
+			<svg class="metadata-box-chevron" width="14" height="14" viewBox="0 0 16 16" fill="none" aria-hidden="true">
+				<path d="M4 6l4 4 4-4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+			</svg>
 		}
-		<div class="metadata-row metadata-row-subscription">
-			<span class="metadata-label">Subscription</span>
-			<div class="metadata-values">
-				<span class="metadata-pill">@subscriptionPlaceholder</span>
-			</div>
+	</summary>
+	@if (hasRows)
+	{
+		<div class="metadata-box-rows">
+			@if (hasStackVersions)
+			{
+				<div class="metadata-row metadata-row-versions">
+					<span class="metadata-label">Versions</span>
+					<div class="metadata-values applies">
+						@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
+						{
+							AppliesTo = Model.AppliesTo!,
+							Inline = false,
+							VersionsConfig = Model.VersionsConfig,
+							BadgePlacement = ApplicabilityBadgePlacement.StackVersionsRow
+						}))
+					</div>
+				</div>
+			}
+			@if (hasDeployments)
+			{
+				<div class="metadata-row metadata-row-deployments">
+					<span class="metadata-label">Deployments</span>
+					<div class="metadata-values applies">
+						@await RenderPartialAsync(ApplicableToComponent.Create(new ApplicableToViewModel
+						{
+							AppliesTo = Model.AppliesTo!,
+							Inline = false,
+							VersionsConfig = Model.VersionsConfig,
+							BadgePlacement = ApplicabilityBadgePlacement.DeploymentsRow
+						}))
+					</div>
+				</div>
+			}
 		</div>
-	</div>
+	}
 </details>
diff --git a/src/Elastic.Markdown/Page/ProductPills.cshtml b/src/Elastic.Markdown/Page/ProductPills.cshtml
deleted file mode 100644
index f601189ff6..0000000000
--- a/src/Elastic.Markdown/Page/ProductPills.cshtml
+++ /dev/null
@@ -1,29 +0,0 @@
-@inherits RazorSlice<Elastic.Markdown.Page.IndexViewModel>
-@{
-	var layout = Model.CurrentDocument.YamlFrontMatter?.Layout;
-	if (layout is not null)
-		return;
-
-	var prefix = Model.UrlPathPrefix?.TrimEnd('/') ?? string.Empty;
-	var productHubs = Model.Products
-		.Where(p => !string.IsNullOrWhiteSpace(p.Hub))
-		.OrderBy(p => p.DisplayName, StringComparer.Ordinal)
-		.ToList();
-
-	if (productHubs.Count == 0)
-		return;
-}
-<div class="product-pills" role="navigation" aria-label="Product hubs related to this page">
-	@foreach (var product in productHubs)
-	{
-		var hub = product.Hub!;
-		var isAbsolute = hub.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
-			|| hub.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
-		var href = isAbsolute ? hub : $"{prefix}/{hub.Trim('/')}/";
-		<a class="product-badge product-badge-@product.Id" href="@href">
-			<span class="product-badge-dot" aria-hidden="true"></span>
-			<span class="product-badge-label">@product.DisplayName</span>
-			<span class="product-badge-arrow" aria-hidden="true">&rarr;</span>
-		</a>
-	}
-</div>

From 63f927e9a646f67e59c8d60b5264145933ba6d16 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Mon, 4 May 2026 20:15:17 +0200
Subject: [PATCH 128/226] Repoint product hub URLs at the real
 /products/<product>/v9/ pages

The two hub gist HTML files were a stand-in while the V2 nav wiring was
unresolved. That's fixed upstream and the docs-content `hub-pages` branch
now serves the real hub markdown, so product pills should link to the
canonical URLs (`/products/elasticsearch/v9`, `/products/kibana/v9`)
instead of the gist previews.

The two visual-reference gists are no longer used by any code path. The
design handoff gist is still referenced in the PR and remains the
human-facing UX/technical write-up.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/products.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/products.yml b/config/products.yml
index da1fcb230a..874f835c70 100644
--- a/config/products.yml
+++ b/config/products.yml
@@ -147,7 +147,7 @@ products:
   elasticsearch:
     display: 'Elasticsearch'
     versioning: 'stack'
-    hub: 'https://htmlpreview.github.io/?https://gist.github.com/florent-leborgne/b2ddb83d7b849980d1668aef600d0139/raw/elasticsearch-hub.html'
+    hub: 'products/elasticsearch/v9'
   elasticsearch-client:
     display: 'Elasticsearch Client'
     versioning: 'stack'
@@ -208,7 +208,7 @@ products:
   kibana:
     display: 'Kibana'
     versioning: 'stack'
-    hub: 'https://htmlpreview.github.io/?https://gist.github.com/florent-leborgne/c9075416b50ec111a09897b7be4462cc/raw/kibana-hub.html'
+    hub: 'products/kibana/v9'
   logstash:
     display: 'Logstash'
     versioning: 'stack'

From 1fab04a8cd2dcfdf8c317d8f58b9d25153c2c033 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Mon, 4 May 2026 20:29:40 +0200
Subject: [PATCH 129/226] Add Product hubs landing page to V2 nav

References docs-content://products/index.md so /products/ resolves to
the landing page instead of 404. The landing lists Elasticsearch and
Kibana hubs alongside stubs for upcoming products and deployment
runbooks. Companion docs-content commit lands the index.md itself on
the hub-pages branch.
---
 config/navigation-v2.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 39f9aea547..6dce230cac 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -3310,6 +3310,8 @@ nav:
   - section: Product hubs
     url: /products/
     children:
+    - page: docs-content://products/index.md
+      title: Product hubs
     - page: docs-content://products/kibana/v9.md
       title: Kibana
     - page: docs-content://products/elasticsearch/v9.md

From 1c18fa145583b2df17f6e6cc076e903b9c50f33e Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Mon, 4 May 2026 20:40:15 +0200
Subject: [PATCH 130/226] Update authoring snapshot tests for new applies-to
 tooltip copy

Stack and Serverless productDescription text changed (Stack interpolates
{base}/{current}/{base-major} from the VersioningSystem; Serverless
appends a sentence about UI/capabilities differing from versioned
Stack), so the popover-data attribute in 40 snapshot fixtures across
ApplicableToComponent.fs, AppliesToRole.fs, and Admonitions.fs needed
to be updated to match. The test fixture's stack VersioningSystem has
base==current==8.0.0, so the substituted string reads "Elastic Stack
8.0.0 to 8.0.0... prior to v8".

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Applicability/ApplicableToComponent.fs    | 74 +++++++++----------
 tests/authoring/Blocks/Admonitions.fs         |  6 +-
 tests/authoring/Inline/AppliesToRole.fs       |  4 +-
 3 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/tests/authoring/Applicability/ApplicableToComponent.fs b/tests/authoring/Applicability/ApplicableToComponent.fs
index b6970a7828..c1ad9ae8ac 100644
--- a/tests/authoring/Applicability/ApplicableToComponent.fs
+++ b/tests/authoring/Applicability/ApplicableToComponent.fs
@@ -31,7 +31,7 @@ stack: ga 9.0.0
     let ``renders GA with version`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -47,7 +47,7 @@ stack: preview 9.1.0
     let ``renders preview future version as planned`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -63,7 +63,7 @@ stack: beta 8.8.0
     let ``renders beta future version`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="beta" lifecycle-name="Beta" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="beta" lifecycle-name="Beta" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -79,7 +79,7 @@ stack: deprecated 8.7.0
     let ``renders deprecation planned`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Deprecation planned" lifecycle-class="deprecated" lifecycle-name="Deprecated" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned for deprecation&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is planned to be deprecated in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Deprecation planned" lifecycle-class="deprecated" lifecycle-name="Deprecated" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned for deprecation&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is planned to be deprecated in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -95,7 +95,7 @@ stack: removed 8.6.0
     let ``renders planned for removal`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Removal planned" lifecycle-class="removed" lifecycle-name="Removed" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned for removal&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is planned to be removed in an upcoming Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Removal planned" lifecycle-class="removed" lifecycle-name="Removed" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned for removal&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is planned to be removed in an upcoming Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -111,7 +111,7 @@ stack: ga
     let ``renders ga without version in badge or popover`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -128,7 +128,7 @@ serverless: ga
     let ``renders serverless ga`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Serverless" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Serverless interfaces and procedures might differ from classic Elastic Stack deployments.&quot;,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false"></applies-to-popover>
+	<applies-to-popover badge-key="Serverless" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud. Their UI and capabilities can differ from the traditionally versioned Elastic Stack.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Serverless interfaces and procedures might differ from classic Elastic Stack deployments.&quot;,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false"></applies-to-popover>
 </p>
 """
 
@@ -146,11 +146,11 @@ serverless:
     let ``renders serverless individual projects`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Serverless Elasticsearch" badge-lifecycle-text="Planned" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Serverless Elasticsearch projects update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Serverless Elasticsearch" badge-lifecycle-text="Planned" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud. Their UI and capabilities can differ from the traditionally versioned Elastic Stack.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Serverless Elasticsearch projects update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false">
 </applies-to-popover>
-	<applies-to-popover badge-key="Serverless Observability" badge-lifecycle-text="Planned" lifecycle-class="beta" lifecycle-name="Beta" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Serverless Observability projects update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Serverless Observability" badge-lifecycle-text="Planned" lifecycle-class="beta" lifecycle-name="Beta" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud. Their UI and capabilities can differ from the traditionally versioned Elastic Stack.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Serverless Observability projects update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false">
 </applies-to-popover>
-	<applies-to-popover badge-key="Serverless Security" badge-lifecycle-text="Planned" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Serverless Security projects update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Serverless Security" badge-lifecycle-text="Planned" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud. Their UI and capabilities can differ from the traditionally versioned Elastic Stack.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Serverless Security projects update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -292,7 +292,7 @@ stack: ga 8.8.0, preview 8.1.0
     let ``renders Planned when GA and Preview are both unreleased`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="true" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="true" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -308,7 +308,7 @@ stack: deprecated 9.1.0
     let ``renders deprecation planned for future version`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Deprecation planned" lifecycle-class="deprecated" lifecycle-name="Deprecated" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned for deprecation&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is planned to be deprecated in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Deprecation planned" lifecycle-class="deprecated" lifecycle-name="Deprecated" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned for deprecation&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is planned to be deprecated in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -324,7 +324,7 @@ stack: removed 9.1.0
     let ``renders removal planned for future version`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Removal planned" lifecycle-class="removed" lifecycle-name="Removed" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned for removal&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is planned to be removed in an upcoming Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Removal planned" lifecycle-class="removed" lifecycle-name="Removed" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned for removal&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is planned to be removed in an upcoming Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -341,7 +341,7 @@ stack: unavailable
     let ``renders unavailable`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" lifecycle-class="unavailable" lifecycle-name="Unavailable" show-lifecycle-name="true" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Unavailable&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is not available in Elastic Stack.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" lifecycle-class="unavailable" lifecycle-name="Unavailable" show-lifecycle-name="true" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Unavailable&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is not available in Elastic Stack.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -398,11 +398,11 @@ apm_agent_java: beta 9.1.0
     let ``renders complex mixed scenario`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Serverless Elasticsearch" badge-lifecycle-text="Planned" lifecycle-class="beta" lifecycle-name="Beta" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Serverless Elasticsearch projects update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Serverless Elasticsearch" badge-lifecycle-text="Planned" lifecycle-class="beta" lifecycle-name="Beta" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud. Their UI and capabilities can differ from the traditionally versioned Elastic Stack.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Serverless Elasticsearch projects update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false">
 </applies-to-popover>
-	<applies-to-popover badge-key="Serverless Observability" badge-lifecycle-text="Planned" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Serverless Observability projects update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Serverless Observability" badge-lifecycle-text="Planned" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud. Their UI and capabilities can differ from the traditionally versioned Elastic Stack.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Serverless Observability projects update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false">
 </applies-to-popover>
-	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 	<applies-to-popover badge-key="ECK" badge-lifecycle-text="Planned" lifecycle-class="beta" lifecycle-name="Beta" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud on Kubernetes\u003C/strong\u003E extends Kubernetes orchestration capabilities to allow you to deploy and manage components of the Elastic Stack.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Cloud on Kubernetes update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
@@ -428,7 +428,7 @@ deployment:
     let ``renders stack and ece planned`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="beta" lifecycle-name="Beta" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="beta" lifecycle-name="Beta" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 	<applies-to-popover badge-key="ECE" badge-lifecycle-text="Planned" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Enterprise\u003C/strong\u003E is a self-managed orchestration platform for deploying and managing the Elastic Stack at scale.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Cloud Enterprise update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
@@ -446,7 +446,7 @@ stack:
     let ``no version defaults to ga`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -470,8 +470,8 @@ product: ga 9.0.0
     let ``renders VersioningSystemId coverage`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Serverless" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Serverless interfaces and procedures might differ from classic Elastic Stack deployments.&quot;,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false"></applies-to-popover>
-	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false"></applies-to-popover>
+	<applies-to-popover badge-key="Serverless" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud. Their UI and capabilities can differ from the traditionally versioned Elastic Stack.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Serverless interfaces and procedures might differ from classic Elastic Stack deployments.&quot;,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false"></applies-to-popover>
+	<applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false"></applies-to-popover>
 	<applies-to-popover badge-key="ECH" badge-lifecycle-text="Planned" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Hosted\u003C/strong\u003E lets you manage and configure one or more deployments of the versioned Elastic Stack, hosted on Elastic Cloud.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Cloud Hosted update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="false"></applies-to-popover>
 	<applies-to-popover badge-key="ECK" badge-lifecycle-text="Planned" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud on Kubernetes\u003C/strong\u003E extends Kubernetes orchestration capabilities to allow you to deploy and manage components of the Elastic Stack.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Cloud on Kubernetes update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false"></applies-to-popover>
 	<applies-to-popover badge-key="ECE" badge-lifecycle-text="Planned" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Enterprise\u003C/strong\u003E is a self-managed orchestration platform for deploying and managing the Elastic Stack at scale.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Cloud Enterprise update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false"></applies-to-popover>
@@ -493,7 +493,7 @@ stack: ga 8.0.0, beta 8.1.0
     let ``renders multiple lifecycles with ellipsis and shows GA lifecycle`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="8.0" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="true" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available in 8.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="8.0" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="true" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available in 8.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -509,7 +509,7 @@ stack: ga 7.0.0
     let ``renders ga since released version`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.0+" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available since 7.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.0+" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available since 7.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -525,7 +525,7 @@ stack: preview 7.0.0
     let ``renders preview since released version`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.0+" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Preview since 7.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in technical preview and is not ready for production usage. Technical preview features may change or be removed at any time. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.0+" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Preview since 7.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in technical preview and is not ready for production usage. Technical preview features may change or be removed at any time. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -541,7 +541,7 @@ stack: beta 7.0.0
     let ``renders beta since released version`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.0+" lifecycle-class="beta" lifecycle-name="Beta" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Beta since 7.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in beta and is not ready for production usage. For beta features, the design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.0+" lifecycle-class="beta" lifecycle-name="Beta" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Beta since 7.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in beta and is not ready for production usage. For beta features, the design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -557,7 +557,7 @@ stack: deprecated 7.0.0
     let ``renders deprecated since released version`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.0+" lifecycle-class="deprecated" lifecycle-name="Deprecated" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Deprecated since 7.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is deprecated. You can still use it, but it\u0027ll be removed in a future Elastic Stack update.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.0+" lifecycle-class="deprecated" lifecycle-name="Deprecated" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Deprecated since 7.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is deprecated. You can still use it, but it\u0027ll be removed in a future Elastic Stack update.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -573,7 +573,7 @@ stack: removed 7.0.0
     let ``renders removed in released version`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.0" lifecycle-class="removed" lifecycle-name="Removed" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Removed in 7.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality was removed. You can no longer use it if you\u0027re running on this version or a later one.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.0" lifecycle-class="removed" lifecycle-name="Removed" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Removed in 7.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality was removed. You can no longer use it if you\u0027re running on this version or a later one.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -590,7 +590,7 @@ stack: ga =7.5
     let ``renders ga in exact released version`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.5" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available in 7.5&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.5" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available in 7.5&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -606,7 +606,7 @@ stack: ga 7.0-8.0
     let ``renders ga from-to when both ends released`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.0-8.0" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available from 7.0 to 8.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.0-8.0" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available from 7.0 to 8.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -622,7 +622,7 @@ stack: ga 7.0-9.0
     let ``renders ga since min when max unreleased`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.0+" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available since 7.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.0+" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available since 7.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -639,7 +639,7 @@ stack: preview 7.0, ga 7.5
     let ``renders ga badge with both lifecycles in popover`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.5+" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="true" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available since 7.5&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;},{&quot;text&quot;:&quot;Preview from 7.0 to 7.4&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in technical preview and is not ready for production usage. Technical preview features may change or be removed at any time. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.5+" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="true" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available since 7.5&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;},{&quot;text&quot;:&quot;Preview from 7.0 to 7.4&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in technical preview and is not ready for production usage. Technical preview features may change or be removed at any time. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -655,7 +655,7 @@ stack: preview 7.5.4!
     let ``renders patch version when explicitly requested with exclamation mark`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.5.4+" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Preview since 7.5.4&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in technical preview and is not ready for production usage. Technical preview features may change or be removed at any time. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.5.4+" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Preview since 7.5.4&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in technical preview and is not ready for production usage. Technical preview features may change or be removed at any time. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -671,7 +671,7 @@ stack: preview 7.5.4
     let ``hides patch version when no exclamation mark used`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.5+" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Preview since 7.5&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in technical preview and is not ready for production usage. Technical preview features may change or be removed at any time. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.5+" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Preview since 7.5&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in technical preview and is not ready for production usage. Technical preview features may change or be removed at any time. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -687,7 +687,7 @@ stack: beta 7.0.3!-7.5.2!
     let ``renders range with patch versions when both have exclamation marks`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.0.3-7.5.2" lifecycle-class="beta" lifecycle-name="Beta" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Beta from 7.0.3 to 7.5.2&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in beta and is not ready for production usage. For beta features, the design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.0.3-7.5.2" lifecycle-class="beta" lifecycle-name="Beta" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Beta from 7.0.3 to 7.5.2&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in beta and is not ready for production usage. For beta features, the design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -703,7 +703,7 @@ stack: ga 7.0.5!-7.5
     let ``renders range with patch on mininum version only when explicit operator is used`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.0.5-7.5" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available from 7.0.5 to 7.5&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.0.5-7.5" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available from 7.0.5 to 7.5&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -719,7 +719,7 @@ stack: ga 7.0-7.5.3!
     let ``renders range with patch on maxinum version only when explicit operator is used`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.0-7.5.3" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available from 7.0 to 7.5.3&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.0-7.5.3" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available from 7.0 to 7.5.3&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
@@ -735,7 +735,7 @@ stack: ga =7.5.3!
     let ``renders exact version with patch when explicit operator is used`` () =
         markdown |> convertsToHtml """
 <p class="applies applies-block">
-	<applies-to-popover badge-key="Stack" badge-version="7.5.3" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available in 7.5.3&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
+	<applies-to-popover badge-key="Stack" badge-version="7.5.3" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="true" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available in 7.5.3&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="false">
 </applies-to-popover>
 </p>
 """
diff --git a/tests/authoring/Blocks/Admonitions.fs b/tests/authoring/Blocks/Admonitions.fs
index 7d0585d504..719fa637d0 100644
--- a/tests/authoring/Blocks/Admonitions.fs
+++ b/tests/authoring/Blocks/Admonitions.fs
@@ -64,7 +64,7 @@ This is a custom admonition with applies_to information.
 	<div class="admonition-header">
 		<span class="admonition-title">Note</span>
 		<span class="applies applies-admonition">
-			<applies-to-popover badge-key="Stack" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="true"></applies-to-popover>
+			<applies-to-popover badge-key="Stack" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="true"></applies-to-popover>
 		</span>
 		<span class="admonition-title__separator"></span>
 	</div>
@@ -76,7 +76,7 @@ This is a custom admonition with applies_to information.
 	<div class="admonition-header">
 		<span class="admonition-title">Warning</span>
 		<span class="applies applies-admonition">
-			<applies-to-popover badge-key="Serverless" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Serverless interfaces and procedures might differ from classic Elastic Stack deployments.&quot;,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="true"></applies-to-popover>
+			<applies-to-popover badge-key="Serverless" lifecycle-class="ga" lifecycle-name="GA" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud. Their UI and capabilities can differ from the traditionally versioned Elastic Stack.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Generally available&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is generally available and ready for production usage.&quot;}],&quot;additionalInfo&quot;:&quot;Serverless interfaces and procedures might differ from classic Elastic Stack deployments.&quot;,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="true"></applies-to-popover>
 		</span>
 		<span class="admonition-title__separator"></span>
 	</div>
@@ -88,7 +88,7 @@ This is a custom admonition with applies_to information.
 	<div class="admonition-header">
 		<span class="admonition-title">Tip</span>
 		<span class="applies applies-admonition">
-			<applies-to-popover badge-key="Serverless Elasticsearch" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="true" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Preview&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in technical preview and is not ready for production usage. Technical preview features may change or be removed at any time. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="true"></applies-to-popover>
+			<applies-to-popover badge-key="Serverless Elasticsearch" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="true" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;\u003Cstrong\u003EElastic Cloud Serverless\u003C/strong\u003E projects are autoscaled environments, fully managed by Elastic and available on Elastic Cloud. Their UI and capabilities can differ from the traditionally versioned Elastic Stack.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Preview&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in technical preview and is not ready for production usage. Technical preview features may change or be removed at any time. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:null,&quot;showVersionNote&quot;:false,&quot;versionNote&quot;:null}" show-popover="true" is-inline="true"></applies-to-popover>
 		</span>
 		<span class="admonition-title__separator"></span>
 	</div>
diff --git a/tests/authoring/Inline/AppliesToRole.fs b/tests/authoring/Inline/AppliesToRole.fs
index 81bb0f78fd..3c93c00cf3 100644
--- a/tests/authoring/Inline/AppliesToRole.fs
+++ b/tests/authoring/Inline/AppliesToRole.fs
@@ -30,7 +30,7 @@ This is an inline {applies_to}`stack: preview 9.1` element.
         markdown |> convertsToHtml """
 <p>This is an inline
 	<span class="applies applies-inline">
-        <applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="true">
+        <applies-to-popover badge-key="Stack" badge-lifecycle-text="Planned" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="false" show-version="false" has-multiple-lifecycles="false" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Planned&quot;,&quot;lifecycleDescription&quot;:&quot;We plan to add this functionality in a future Elastic Stack update. Subject to changes.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="true">
         </applies-to-popover>
 	</span>
 	element.</p>
@@ -150,7 +150,7 @@ This is an inline {applies_to}`stack: preview 8.0, ga 8.1` element.
         markdown |> convertsToHtml """
 <p>This is an inline
 	<span class="applies applies-inline">
-        <applies-to-popover badge-key="Stack" badge-version="8.0" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="true" popover-data="{&quot;productDescription&quot;:&quot;The \u003Cstrong\u003EElastic Stack\u003C/strong\u003E includes Elastic\u0027s core products such as Elasticsearch, Kibana, Logstash, and Beats.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Preview in 8.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in technical preview and is not ready for production usage. Technical preview features may change or be removed at any time. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="true">
+        <applies-to-popover badge-key="Stack" badge-version="8.0" lifecycle-class="preview" lifecycle-name="Preview" show-lifecycle-name="true" show-version="true" has-multiple-lifecycles="true" popover-data="{&quot;productDescription&quot;:&quot;This documentation applies to \u003Cstrong\u003EElastic Stack\u003C/strong\u003E 8.0.0 to 8.0.0. To know if this functionality exists in versions prior to v8, refer to the corresponding version of the documentation.&quot;,&quot;availabilityItems&quot;:[{&quot;text&quot;:&quot;Preview in 8.0&quot;,&quot;lifecycleDescription&quot;:&quot;This functionality is in technical preview and is not ready for production usage. Technical preview features may change or be removed at any time. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. Specific Support terms apply.&quot;}],&quot;additionalInfo&quot;:&quot;Unless stated otherwise on the page, this functionality is available when your Elastic Stack is deployed on Elastic Cloud Hosted, Elastic Cloud Enterprise, Elastic Cloud on Kubernetes, and self-managed environments.&quot;,&quot;showVersionNote&quot;:true,&quot;versionNote&quot;:&quot;This documentation corresponds to the latest patch available for each minor version. If you\u0027re not using the latest patch, check the \u003Ca href=\u0022https://www.elastic.co/docs/release-notes\u0022\u003Erelease notes\u003C/a\u003E for changes.&quot;}" show-popover="true" is-inline="true">
         </applies-to-popover>
 	</span>
 	element.</p>

From 54c3a7e272bbebb9024651de7d81609519a42d7d Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Mon, 4 May 2026 21:13:46 +0200
Subject: [PATCH 131/226] Stop pill click from toggling the metadata box

The product pill <a> lives inside <details>/<summary>, so a native
click on the pill toggles the box and the link doesn't navigate.
`onclick="event.stopPropagation()"` lets the link navigate while
the toggle is suppressed. Toggle still works on every other part of
the summary (label, chevron, empty space).
---
 src/Elastic.Markdown/Page/MetadataBox.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Elastic.Markdown/Page/MetadataBox.cshtml b/src/Elastic.Markdown/Page/MetadataBox.cshtml
index c0ae7791fc..58a1035a77 100644
--- a/src/Elastic.Markdown/Page/MetadataBox.cshtml
+++ b/src/Elastic.Markdown/Page/MetadataBox.cshtml
@@ -37,7 +37,7 @@
 					var isAbsolute = hub.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
 						|| hub.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
 					var href = isAbsolute ? hub : $"{prefix}/{hub.Trim('/')}/";
-					<a class="product-badge product-badge-@product.Id" href="@href">
+					<a class="product-badge product-badge-@product.Id" href="@href" onclick="event.stopPropagation()">
 						<span class="product-badge-dot" aria-hidden="true"></span>
 						<span class="product-badge-label">@product.DisplayName</span>
 						<span class="product-badge-arrow" aria-hidden="true">&rarr;</span>

From 3357eb60d7526ec21ed9cb5a00340375210b3f89 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Mon, 4 May 2026 22:46:32 +0200
Subject: [PATCH 132/226] Make hub-page navigation work cleanly from
 htmx-boosted swaps

Three small fixes triggered by clicking through to hub pages:

- MetadataBox.cshtml: product pill <a> now carries hx-boost="false"
  so the body-level hx-boost="true" doesn't intercept the click. The
  onclick="event.stopPropagation()" still suppresses the <details>
  toggle so the click navigates rather than collapsing the box.

- _Layout.cshtml: hub layout adds an empty <aside id="toc-nav"
  hidden> so htmx's hx-select-oob="#content-container,#toc-nav"
  swap doesn't fail on missing target when boosting from a regular
  page. Hub pages have their own inline {on-this-page} chip, so the
  TOC slot stays empty.

- hub.css: drop the grey + dotted page background. It made the page
  read inconsistently between full-load and htmx-boosted swap (the
  swap leaves the regular layout's white body intact). Hero stays
  dark navy; section cards keep their own visual separation.
---
 .../Assets/markdown/hub.css                         | 13 +++----------
 src/Elastic.Markdown/Page/MetadataBox.cshtml        |  2 +-
 src/Elastic.Markdown/_Layout.cshtml                 |  2 ++
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/markdown/hub.css b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
index 8ea07978b8..1a9f814d0b 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/hub.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/hub.css
@@ -17,16 +17,9 @@
  */
 
 @layer components {
-	/* Page wrapper: dotted background like the gist, full-width content. */
-	.hub-page {
-		background-color: var(--color-grey-10);
-		background-image: radial-gradient(
-			circle,
-			var(--color-grey-20) 0.75px,
-			transparent 0.75px
-		);
-		background-size: 24px 24px;
-	}
+	/* Page wrapper: full-width content. Stays white so the page reads
+	   consistently whether the user lands via full navigation or via an
+	   htmx-boosted swap from a regular docs page. */
 	.hub-page .hub-content {
 		@apply mb-20 w-full max-w-none p-0;
 	}
diff --git a/src/Elastic.Markdown/Page/MetadataBox.cshtml b/src/Elastic.Markdown/Page/MetadataBox.cshtml
index 58a1035a77..4d69e8494d 100644
--- a/src/Elastic.Markdown/Page/MetadataBox.cshtml
+++ b/src/Elastic.Markdown/Page/MetadataBox.cshtml
@@ -37,7 +37,7 @@
 					var isAbsolute = hub.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
 						|| hub.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
 					var href = isAbsolute ? hub : $"{prefix}/{hub.Trim('/')}/";
-					<a class="product-badge product-badge-@product.Id" href="@href" onclick="event.stopPropagation()">
+					<a class="product-badge product-badge-@product.Id" href="@href" hx-boost="false" onclick="event.stopPropagation()">
 						<span class="product-badge-dot" aria-hidden="true"></span>
 						<span class="product-badge-label">@product.DisplayName</span>
 						<span class="product-badge-arrow" aria-hidden="true">&rarr;</span>
diff --git a/src/Elastic.Markdown/_Layout.cshtml b/src/Elastic.Markdown/_Layout.cshtml
index 9d141914ab..20974384c7 100644
--- a/src/Elastic.Markdown/_Layout.cshtml
+++ b/src/Elastic.Markdown/_Layout.cshtml
@@ -63,6 +63,8 @@
 							@await RenderBodyAsync()
 						</article>
 					</main>
+					@* Empty TOC slot so htmx hx-select-oob="#toc-nav" swaps don't fail when boosted from a regular page. Hub pages have their own inline {on-this-page} chip. *@
+					<aside id="toc-nav" class="hidden" aria-hidden="true"></aside>
 				</div>
 			</div>
 		</div>

From ee242b353558f4befff9f2d5b8d3fce13b561aac Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Tue, 5 May 2026 13:44:57 -0500
Subject: [PATCH 133/226] Redesign landing page with search-first layout and
 product index

Replaces the previous hero/card layout with a search-first design:
- Version disambiguation banner with link to 8.x docs
- Prominent search bar with What's new ribbon
- Analytics-driven popular destinations grid
- Get started cards (local, cloud trial, fundamentals)
- Browse by solution (Search, Observability, Security) with sub-links
- Full product index categorized by stack, cloud, ingest, query languages, APM agents, and developer tools
- Scoped CSS replacing Tailwind utility classes

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Layout/_LandingPage.cshtml                | 910 ++++++++++++------
 1 file changed, 619 insertions(+), 291 deletions(-)

diff --git a/src/Elastic.Markdown/Layout/_LandingPage.cshtml b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
index 7dd11f233f..4f45273501 100644
--- a/src/Elastic.Markdown/Layout/_LandingPage.cshtml
+++ b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
@@ -1,300 +1,628 @@
 @inherits RazorSlice<Elastic.Markdown.MarkdownLayoutViewModel>
-<div hx-select-oob="#main-container" hx-swap="none" class="w-full max-w-[100vw] text-ink relative text-pretty overflow-x-hidden">
-	<section class="w-full bg-grey-10" id="hero">
-		<div class="container mx-auto pt-28 pb-4 min-[1024px]:pb-28 grid min-[1024px]:grid-cols-[auto_420px] min-[1024px]:justify-between items-center gap-6 min-[1024px]:gap-[74px]">
-			<div class="max-w-165">
-				<h1 class="text-6xl font-bold font-sans text-black">Elastic Docs</h1>
-				<p class="mt-4">Welcome to the technical documentation for <span class="whitespace-nowrap">Elastic Stack 9.0.0</span>
-					and later, and <span class="whitespace-nowrap">Elastic Cloud Serverless</span>. Deploy, operate, and scale with step-by-step guides, API references, examples, and best practices.</p>
-				<p class="mt-4"><strong>Upgrading from an earlier version?</strong> Follow the <a href="@Model.Link("/deploy-manage/upgrade")"
-					class="link">upgrade guide</a> to plan and complete your upgrade. </p>
+<style>
+  /* ── Reset & Base ── */
+  *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
+  :root {
+    --bg: #fafbfc;
+    --surface: #ffffff;
+    --surface-alt: #f3f5f7;
+    --border: #e2e6ea;
+    --border-light: #eef0f3;
+    --text: #1a1f36;
+    --text-secondary: #4a5270;
+    --text-muted: #8891a4;
+    --accent: #0077cc;
+    --accent-hover: #005fa3;
+    --accent-bg: #e8f4fd;
+    --green: #00bfb3;
+    --green-bg: #e6faf8;
+    --orange: #f5a623;
+    --orange-bg: #fef6e8;
+    --purple: #7b61ff;
+    --purple-bg: #f0edff;
+    --pink: #ff4081;
+    --pink-bg: #fff0f5;
+    --radius: 10px;
+    --radius-sm: 6px;
+    --shadow-sm: 0 1px 3px rgba(0,0,0,0.06);
+    --shadow: 0 2px 8px rgba(0,0,0,0.08);
+    --shadow-lg: 0 4px 20px rgba(0,0,0,0.10);
+    --max-w: 1120px;
+    --font: -apple-system, BlinkMacSystemFont, 'Inter', 'Segoe UI', sans-serif;
+  }
+  body { font-family: var(--font); background: var(--bg); color: var(--text); line-height: 1.55; -webkit-font-smoothing: antialiased; }
+  a { color: var(--accent); text-decoration: none; transition: color 0.15s; }
+  a:hover { color: var(--accent-hover); }
 
-				<div class="flex md:inline-flex flex-col gap-6 mt-6">
-					<navigation-search></navigation-search>
-					<div class="flex gap-3">
-						<a href="@Model.Link("/get-started")"
-						   class="grow select-none cursor-pointer text-white text-nowrap bg-blue-elastic hover:bg-blue-elastic-110 focus:ring-4 focus:ring-blue-elastic-50 font-semibold font-sans rounded-sm px-6 py-2 focus:outline-none h-10 flex items-center justify-center">
-							Elastic Fundamentals
-						</a>
-						<a href="https://cloud.elastic.co/registration?page=docs&placement=docs-body"
-						   class="grow cursor-pointer text-blue-elastic hover:text-blue-elastic-100 text-nowrap border-2 border-blue-elastic hover:border-blue-elastic-100 focus:ring-4 focus:outline-none focus:ring-blue-elastic-50 font-semibold font-sans rounded-sm px-6 py-2 text-center h-10 flex items-center justify-center">
-							Start free trial
-						</a>
-					</div>
-				</div>
-				@if (Model.AllVersionsUrl is not null)
-				{
-					<div class="mt-6">
-						<a href="@Model.AllVersionsUrl" class="link">
-							View previous docs versions
-							<svg class="link-arrow"
-							     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-								<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
-							</svg>
-						</a>
-					</div>
-				}
-			</div>
-			<div class="flex flex-col justify-center w-full mt-14 min-[1024px]:mt-0">
-				<div class="rounded-2xl p-8 bg-white flex flex-col gap-4 items-start"
-				     style="border: 2px solid transparent; background: linear-gradient(white, white) padding-box, linear-gradient(-65deg, #BFDBFF 17%, #E2D3FE 83%) border-box; background-clip: padding-box, border-box; background-origin: padding-box, border-box;">
-					<span class="euiBadge euiBadge--primary inline-flex items-center font-sans font-bold text-xs uppercase tracking-wide shrink-0 rounded-full px-2 py-0.5 bg-[#8144CC] text-white">NEW</span>
-					<div class="flex flex-col">
-						<p class="font-sans font-bold text-xl">Elastic skills for AI agents</p>
-						<p class="mt-2">Install official skills that teach AI coding agents how to work with Elasticsearch, Kibana, Fleet, and the rest of the Elastic stack.</p>
-						<div class="grid grid-cols-1 mt-6 gap-2 text-left">
-							<a href="@Model.Link("/explore-analyze/ai-features/agent-skills")" class="link justify-start">
-								Learn more
-								<svg class="link-arrow"
-								     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-									<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
-								</svg>
-							</a>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</section>
+  /* ── Hero / Search ── */
+  .hero {
+    max-width: var(--max-w);
+    margin: 0 auto;
+    padding: 48px 24px 0;
+    text-align: center;
+  }
+  .hero h1 {
+    font-size: 28px;
+    font-weight: 700;
+    letter-spacing: -0.02em;
+    margin-bottom: 10px;
+  }
+  .hero p {
+    font-size: 15px;
+    color: var(--text-secondary);
+    margin-bottom: 28px;
+  }
+  .search-wrap {
+    max-width: 640px;
+    margin: 0 auto 16px;
+    position: relative;
+  }
+  .search-wrap svg {
+    position: absolute;
+    left: 16px;
+    top: 50%;
+    transform: translateY(-50%);
+    color: var(--text-muted);
+    pointer-events: none;
+  }
+  .search-wrap input {
+    width: 100%;
+    height: 52px;
+    border: 2px solid var(--border);
+    border-radius: var(--radius);
+    padding: 0 16px 0 48px;
+    font-size: 16px;
+    font-family: var(--font);
+    background: var(--surface);
+    color: var(--text);
+    transition: border-color 0.15s, box-shadow 0.15s;
+    outline: none;
+  }
+  .search-wrap input::placeholder { color: var(--text-muted); }
+  .search-wrap input:focus {
+    border-color: var(--accent);
+    box-shadow: 0 0 0 3px rgba(0,119,204,0.12);
+  }
 
-	<section class="w-full bg-grey-10">
-		<div class="container mx-auto py-10 pb-28">
-			<div class="heading-wrapper" id="solutions-use-cases">
-				<h2 class="font-bold font-sans text-3xl text-ink-dark">
-					<a href="#solutions-use-cases">Solutions and use cases</a>
-				</h2>
-			</div>
-			<div class="grid grid-cols-1 min-[1024px]:grid-cols-2 lg:grid-cols-3 gap-6 mt-6">
-				<div class="rounded-2xl border-1 border-grey-20 p-8 bg-white flex gap-6 items-start">
-					<img loading="lazy" alt="Search logo" src="@Model.Static("elasticsearch-logo-color-64px.svg")" class="size-8"/>
-					<div class="flex flex-col">
-						<p class="font-sans font-bold text-xl">Elasticsearch</p>
-						<p class="mt-2">Build powerful search and RAG applications using Elasticsearch's vector database, AI toolkit, and advanced retrieval capabilities.</p>
-						<div class="grid grid-cols-1 mt-6 gap-2">
-							<a href="@Model.Link("/solutions/search")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold">9.0+ (latest @Model.CurrentVersion) docs</a>
-							<a href="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" class="text-sm text-grey-90 hover:text-grey-110 font-sans font-semibold" hx-disable="true">Previous versions</a>
-						</div>
-					</div>
-				</div>
-				<div class="rounded-2xl border-1 border-grey-20 p-8 bg-white flex gap-6 items-start">
-					<img loading="lazy" alt="Observability logo" src="@Model.Static("observability-logo-color-64px.svg")" class="size-8"/>
-					<div class="flex flex-col">
-						<p class="font-sans font-bold text-xl">Observability</p>
-						<p class="mt-2">Resolve problems with open, flexible, and unified observability powered by advanced machine learning and analytics.</p>
-						<div class="grid grid-cols-1 mt-6 gap-2">
-							<a href="@Model.Link("/solutions/observability")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold">9.0+ (latest @Model.CurrentVersion) docs</a>
-							<a href="https://www.elastic.co/guide/en/observability/index.html" class="text-sm text-grey-90 hover:text-grey-110 font-sans font-semibold" hx-disable="true">Previous versions</a>
-						</div>
-					</div>
-				</div>
-				<div class="rounded-2xl border-1 border-grey-20 p-8 bg-white flex gap-6 items-start">
-					<img loading="lazy" alt="Security logo" src="@Model.Static("security-logo-color-64px.svg")" class="size-8"/>
-					<div class="flex flex-col">
-						<p class="font-sans font-bold text-xl">Security</p>
-						<p class="mt-2">Detect, investigate, and respond to threats with AI-driven security analytics to protect your organization at scale.</p>
-						<div class="grid grid-cols-1 mt-6 gap-2">
-							<a href="@Model.Link("/solutions/security")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold">9.0+ (latest @Model.CurrentVersion) docs</a>
-							<a href="https://www.elastic.co/guide/en/security/index.html" class="text-sm text-grey-90 hover:text-grey-110 font-sans font-semibold" hx-disable="true">Previous versions</a>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</section>
+  /* ── Quick destinations ── */
+  .section { max-width: var(--max-w); margin: 0 auto; padding: 40px 24px 0; }
+  .section-header {
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+    margin-bottom: 16px;
+  }
+  .section-header h2 { font-size: 17px; font-weight: 700; letter-spacing: -0.01em; }
+  .section-header a { font-size: 13px; font-weight: 500; }
 
-	<section class="w-full">
-		<div class="container mx-auto pt-20 pb-10">
-			<div class="heading-wrapper" id="how-to-guides">
-				<h2 class="font-bold font-sans text-3xl text-ink-dark">
-					<a href="#how-to-guides">
-						How-to guides
-					</a>
-				</h2>
-			</div>
-			<div class="grid grid-cols-1 min-[1024px]:grid-cols-2 lg:grid-cols-4 gap-6 mt-6">
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col gap-6 items-start">
-					<img loading="lazy" alt="Manage data icon" src="@Model.Static("productStreamsWired.svg")" class="size-8"/>
-					<div class="flex flex-col grow">
-						<p class="font-sans font-bold text-xl">Manage data</p>
-						<p class="mt-2 grow">Learn how to ingest, enrich, and manage your data in Elastic.</p>
-						<a href="@Model.Link("/manage-data")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-					</div>
-				</div>
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col gap-6 items-start">
-					<img loading="lazy" alt="Explore and analyze icon" src="@Model.Static("productDashboard.svg")" class="size-8"/>
-					<div class="flex flex-col grow">
-						<p class="font-sans font-bold text-xl">Explore and analyze</p>
-						<p class="mt-2 grow">Discover the tools of Elasticsearch and Kibana.</p>
-						<a href="@Model.Link("/explore-analyze")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-					</div>
-				</div>
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col gap-6 items-start">
-					<img loading="lazy" alt="Deploy and manage icon" src="@Model.Static("storage.svg")" class="size-8"/>
-					<div class="flex flex-col grow">
-						<p class="font-sans font-bold text-xl">Deploy and manage</p>
-						<p class="mt-2 grow">Learn how to deploy and manage all aspects of your Elastic environment.</p>
-						<a href="@Model.Link("/deploy-manage")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-					</div>
-				</div>
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col gap-6 items-start">
-					<img loading="lazy" alt="Manage Cloud account icon" src="@Model.Static("cloud.svg")" class="size-8"/>
-					<div class="flex flex-col grow">
-						<p class="font-sans font-bold text-xl">Manage Cloud account</p>
-						<p class="mt-2 grow">Manage your profile information, preferences, and personal settings.</p>
-						<a href="@Model.Link("/cloud-account")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-					</div>
-				</div>
-			</div>
-		</div>
-	</section>
+  .quick-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
+    gap: 12px;
+  }
+  .quick-card {
+    background: var(--surface);
+    border: 1px solid var(--border-light);
+    border-radius: var(--radius);
+    padding: 18px 20px;
+    display: flex;
+    align-items: flex-start;
+    gap: 14px;
+    transition: box-shadow 0.15s, border-color 0.15s;
+    cursor: pointer;
+    text-decoration: none;
+    color: var(--text);
+  }
+  .quick-card:hover {
+    border-color: var(--accent);
+    box-shadow: var(--shadow);
+    color: var(--text);
+  }
+  .quick-card .icon {
+    width: 40px;
+    height: 40px;
+    border-radius: var(--radius-sm);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    font-size: 18px;
+  }
+  .quick-card .card-text h3 { font-size: 14px; font-weight: 600; margin-bottom: 3px; }
+  .quick-card .card-text p { font-size: 13px; color: var(--text-secondary); line-height: 1.4; }
+  .quick-card .card-text .meta { font-size: 12px; color: var(--text-muted); margin-top: 4px; }
 
-	<section class="w-full">
-		<div class="container mx-auto py-10">
-			<div class="heading-wrapper" id="references">
-				<h2 class="font-bold font-sans text-3xl text-ink-dark">
-					<a href="#references">Reference</a>
-				</h2>
-			</div>
-			<div class="grid grid-cols-1 min-[1024px]:grid-cols-2 lg:grid-cols-4 gap-6 mt-6">
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">Elastic APIs</p>
-					<p class="mt-2 grow">Browse the API docs for Elasticsearch, Kibana, Elastic Cloud, and more.</p>
-					<a href="https://www.elastic.co/docs/api" target="_blank" rel="noopener noreferrer" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-				</div>
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">Elasticsearch clients</p>
-					<p class="mt-2 grow">Browse the Elasticsearch client libraries for Java, .Net, Python, and more.</p>
-					<a href="@Model.Link("/reference/elasticsearch-clients/")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-				</div>
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">OpenTelemetry</p>
-					<p class="mt-2 grow">Browse the docs for the Elastic Distributions of OpenTelemetry (EDOT).</p>
-					<a href="@Model.Link("/reference/opentelemetry/")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-				</div>
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">Query languages</p>
-					<p class="mt-2 grow">Browse the docs for Query DSL, <span class="whitespace-nowrap">ES|QL</span>, KQL, and more.</p>
-					<a href="@Model.Link("/reference/query-languages/")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-				</div>
-			</div>
-			<div class="mt-6">
-				<a href="@Model.Link("/reference")" class="link">
-					View all reference docs
-					<svg class="link-arrow"
-					     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-						<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
-					</svg>
-				</a>
-			</div>
-		</div>
-	</section>
+  /* Icon color variants */
+  .icon-blue { background: var(--accent-bg); color: var(--accent); }
+  .icon-green { background: var(--green-bg); color: var(--green); }
+  .icon-orange { background: var(--orange-bg); color: var(--orange); }
+  .icon-purple { background: var(--purple-bg); color: var(--purple); }
+  .icon-pink { background: var(--pink-bg); color: var(--pink); }
 
-	<section class="w-full">
-		<div class="container mx-auto py-10">
-			<div class="heading-wrapper" id="product-resources">
-				<h2 class="font-bold font-sans text-3xl">
-					<a href="#product-resources">
-						Product resources
-					</a>
-				</h2>
-			</div>
-			<div class="grid grid-cols-1 min-[1024px]:grid-cols-2 lg:grid-cols-4 gap-6 mt-6">
-				<div class="min-h-61 rounded-2xl bg-ink-navy border-1 border-grey-20 text-white p-8 flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">Release notes</p>
-					<p class="mt-2 grow">Explore the latest features and changes in Elastic.</p>
-					<a href="@Model.Link("/release-notes/")" class="link mt-3 justify-start text-white hover:text-grey-20">View release notes
-						<svg class="link-arrow"
-						     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-							<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
-						</svg>
-						</a>
-				</div>
-				<div class="min-h-61 rounded-2xl bg-ink-navy border-1 border-grey-20 text-white p-8 flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">Extend and contribute</p>
-					<p class="mt-2 grow">Learn how to contribute to Elastic products and extend capabilities.</p>
-					<a href="@Model.Link("extend/")" class="link mt-3 justify-start text-white hover:text-grey-20">View extend and contribute docs
-						<svg class="link-arrow"
-						     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-							<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
-						</svg>
-						</a>
-				</div>
-				<div class="min-h-61 rounded-2xl bg-ink-navy border-1 border-grey-20 text-white p-8 flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">Troubleshoot</p>
-					<p class="mt-2 grow">Check troubleshooting guides for common fixes.</p>
-					<a href="@Model.Link("/troubleshoot/")" class="link mt-3 justify-start text-white hover:text-grey-20">View troubleshooting docs
-						<svg class="link-arrow"
-						     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-							<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
-						</svg>
-						</a>
-				</div>
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 bg-white p-8 flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">Previous versions</p>
-					<p class="mt-2 grow">Browse the docs for previous Elastic product versions.</p>
-					<a href="https://www.elastic.co/guide?lang=en" target="_blank" rel="noopener noreferrer" class="link mt-3 justify-start text-blue-elastic-100 hover:text-blue-elastic-110" hx-disable="true">View previous versions
-						<svg class="link-arrow"
-						     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-							<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
-						</svg>
-						</a>
-				</div>
-			</div>
-		</div>
-	</section>
-	
-	@* <section class="w-full bg-grey-10"> *@
-	@* 	<div class="container mx-auto py-10"> *@
-	@* 		<h2 class="font-bold text-3xl text-ink-dark">Instant Elasticsearch</h2> *@
-	@* 		<div class="grid lg:grid-cols-2 gap-6 mt-6"> *@
-	@* 			<div class="lg:basis-[50%]"> *@
-	@* 				<p class="mt-2 font-body">For local testing, use Docker to install and run Elasticsearch.</p> *@
-	@* 			</div> *@
-	@* 			<div class="lg:basis-[50%] rounded-xl border-1 border-grey-20 p-6"> *@
-	@* 				<p class="font-body">Try it locally now:</p> *@
-	@* 				<div class="mt-2"> *@
-	@* 					<div class="highlight-bash notranslate"> *@
-	@* 						<div class="highlight"> *@
-	@* 							<pre> *@
-	@* 								<code class="language-yaml hljs" data-highlighted="yes">curl -fsSL https://elastic.co/start-local | sh</code> *@
-	@* 							</pre> *@
-	@* 						</div> *@
-	@* 					</div> *@
-	@* 				</div> *@
-	@* 			</div> *@
-	@* 		</div> *@
-	@* 	</div> *@
-	@* </section> *@
+  /* ── Version banner ── */
+  .version-banner {
+    max-width: var(--max-w);
+    margin: 40px auto 0;
+    padding: 0 24px;
+  }
+  .version-banner-inner {
+    background: linear-gradient(135deg, #f8f9fb 0%, #eef2f7 100%);
+    border: 1px solid var(--border);
+    border-radius: var(--radius);
+    padding: 20px 24px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 20px;
+    flex-wrap: wrap;
+  }
+  .version-banner-inner .vb-text { flex: 1; min-width: 200px; }
+  .version-banner-inner .vb-text h3 { font-size: 14px; font-weight: 600; margin-bottom: 3px; }
+  .version-banner-inner .vb-text p { font-size: 13px; color: var(--text-secondary); }
+  .version-banner-inner .vb-actions { display: flex; gap: 10px; flex-wrap: wrap; }
+  .btn {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    padding: 8px 18px;
+    border-radius: var(--radius-sm);
+    font-size: 13px;
+    font-weight: 600;
+    font-family: var(--font);
+    cursor: pointer;
+    transition: background 0.15s, box-shadow 0.15s;
+    border: none;
+    text-decoration: none;
+  }
+  .btn-primary { background: var(--accent); color: #fff; }
+  .btn-primary:hover { background: var(--accent-hover); color: #fff; }
+  .btn-outline { background: var(--surface); color: var(--text-secondary); border: 1px solid var(--border); }
+  .btn-outline:hover { border-color: var(--accent); color: var(--accent); background: var(--accent-bg); }
 
-	<section class="w-full">
-		<div class="container mx-auto py-10">
-			<div class="rounded-xl border-1 border-grey-20 px-12 py-8 grid lg:grid-cols-[1fr_auto] gap-12 items-center text-center lg:text-left">
-				<div>
-					<h2 class="font-semibold font-sans text-3xl text-black leading-[1.2em]">Welcome to our community of developers</h2>
-					<p class="mt-2">Learn from your peers and share code examples.</p>
-				</div>
-				<a href="https://discuss.elastic.co" target="_blank" rel="noopener noreferrer" class="w-full cursor-pointer text-blue-elastic hover:text-blue-elastic-100 text-nowrap border-2 border-blue-elastic hover:border-blue-elastic-100 focus:ring-4 focus:outline-none focus:ring-blue-elastic-50 font-semibold rounded-sm px-6 py-2 text-center h-10 flex items-center justify-center min-w-40 max-w-md lg:max-w-none justify-self-center lg:justify-self-auto">
-					Join now
-				</a>
-			</div>
-		</div>
-	</section>
+  /* ── Product sections ── */
+  .products-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 16px;
+  }
+  @@media (max-width: 800px) {
+    .products-grid { grid-template-columns: 1fr; }
+  }
+  .product-card {
+    background: var(--surface);
+    border: 1px solid var(--border-light);
+    border-radius: var(--radius);
+    padding: 24px;
+    transition: box-shadow 0.15s;
+  }
+  .product-card:hover { box-shadow: var(--shadow); }
+  .product-card h3 {
+    font-size: 16px;
+    font-weight: 700;
+    margin-bottom: 6px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+  .product-card h3 .dot {
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    flex-shrink: 0;
+  }
+  .product-card > p { font-size: 13px; color: var(--text-secondary); margin-bottom: 16px; line-height: 1.5; }
+  .product-card ul { list-style: none; }
+  .product-card ul li { border-top: 1px solid var(--border-light); }
+  .product-card ul li a {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 10px 0;
+    font-size: 14px;
+    color: var(--text);
+    transition: color 0.15s;
+  }
+  .product-card ul li a:hover { color: var(--accent); }
+  .product-card ul li a .arrow { color: var(--text-muted); font-size: 14px; transition: transform 0.15s, color 0.15s; }
+  .product-card ul li a:hover .arrow { transform: translateX(3px); color: var(--accent); }
+
+  /* ── Product index (categorized) ── */
+  .product-index {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 16px;
+  }
+  @@media (max-width: 800px) {
+    .product-index { grid-template-columns: 1fr; }
+  }
+  .pi-category {
+    background: var(--surface);
+    border: 1px solid var(--border-light);
+    border-radius: var(--radius);
+    padding: 18px 20px;
+  }
+  .pi-category h4 {
+    font-size: 12px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.06em;
+    color: var(--text-muted);
+    margin-bottom: 10px;
+  }
+  .pi-category ul { list-style: none; }
+  .pi-category ul li + li { border-top: 1px solid var(--border-light); }
+  .pi-category ul li a {
+    display: block;
+    padding: 8px 0;
+    font-size: 14px;
+    font-weight: 500;
+    color: var(--text);
+    text-decoration: none;
+    transition: color 0.12s;
+  }
+  .pi-category ul li a:hover { color: var(--accent); }
+
+  /* ── Reference & API strip ── */
+  .ref-strip {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+    gap: 12px;
+  }
+  .ref-item {
+    background: var(--surface);
+    border: 1px solid var(--border-light);
+    border-radius: var(--radius-sm);
+    padding: 16px;
+    text-decoration: none;
+    color: var(--text);
+    transition: box-shadow 0.15s, border-color 0.15s;
+  }
+  .ref-item:hover { border-color: var(--accent); box-shadow: var(--shadow-sm); color: var(--text); }
+  .ref-item h4 { font-size: 14px; font-weight: 600; margin-bottom: 3px; }
+  .ref-item p { font-size: 12px; color: var(--text-muted); }
+
+  /* ── Getting started ── */
+  .gs-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 14px;
+  }
+  @@media (max-width: 800px) {
+    .gs-grid { grid-template-columns: 1fr; }
+  }
+  .gs-card {
+    background: var(--surface);
+    border: 1px solid var(--border-light);
+    border-radius: var(--radius);
+    padding: 22px 22px 20px;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    text-decoration: none;
+    color: var(--text);
+    transition: border-color 0.15s, box-shadow 0.15s;
+  }
+  .gs-card:hover { border-color: var(--accent); box-shadow: var(--shadow); color: var(--text); }
+  .gs-card .gs-card-icon {
+    width: 36px;
+    height: 36px;
+    border-radius: var(--radius-sm);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 18px;
+    flex-shrink: 0;
+  }
+  .gs-card h3 { font-size: 15px; font-weight: 700; }
+  .gs-card p { font-size: 13px; color: var(--text-secondary); line-height: 1.45; flex: 1; }
+  .gs-card .gs-cta { font-size: 13px; font-weight: 600; color: var(--accent); }
+
+  /* ── Footer ── */
+  .landing-footer {
+    max-width: var(--max-w);
+    margin: 48px auto 0;
+    padding: 40px 24px;
+    border-top: 1px solid var(--border-light);
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 12px;
+    font-size: 13px;
+    color: var(--text-muted);
+  }
+  .landing-footer a { color: var(--text-secondary); }
+
+  /* ── What's new ribbon ── */
+  .whats-new {
+    max-width: var(--max-w);
+    margin: 32px auto 0;
+    padding: 0 24px;
+  }
+  .whats-new-inner {
+    background: linear-gradient(135deg, #eef2ff 0%, #f0edff 100%);
+    border: 1px solid #d8d0ff;
+    border-radius: var(--radius);
+    padding: 14px 20px;
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    font-size: 14px;
+  }
+  .whats-new-inner .badge {
+    background: var(--purple);
+    color: #fff;
+    font-size: 11px;
+    font-weight: 700;
+    padding: 3px 10px;
+    border-radius: 20px;
+    white-space: nowrap;
+    letter-spacing: 0.03em;
+  }
+  .whats-new-inner a { font-weight: 500; }
+
+  /* ── Responsive ── */
+  @@media (max-width: 680px) {
+    .hero h1 { font-size: 22px; }
+    .quick-grid { grid-template-columns: 1fr; }
+    .version-banner-inner { flex-direction: column; align-items: flex-start; }
+    .gs-grid { grid-template-columns: 1fr; }
+  }
+</style>
+
+<div hx-select-oob="#main-container" hx-swap="none" class="w-full max-w-[100vw] relative overflow-x-hidden">
+
+  <!-- ── Version disambiguation ── -->
+  <div class="version-banner">
+    <div class="version-banner-inner">
+      <div class="vb-text">
+        <h3>You're viewing docs for Elastic Stack 9.0+ (latest @Model.CurrentVersion)</h3>
+        <p>Need docs for an earlier version?</p>
+      </div>
+      <div class="vb-actions">
+        <a href="https://www.elastic.co/guide" class="btn btn-outline" hx-disable="true">8.x docs (elastic.co/guide) →</a>
+        @if (Model.AllVersionsUrl is not null)
+        {
+          <a href="@Model.AllVersionsUrl" class="btn btn-outline">All versions</a>
+        }
+      </div>
+    </div>
+  </div>
+
+  <!-- ── Hero: Search-first ── -->
+  <div class="hero">
+    <h1>Elastic documentation</h1>
+    <p>Find guides, API references, and tutorials for the Elastic Stack.</p>
+    <div class="search-wrap">
+      <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="7"/><path d="M21 21l-4.35-4.35"/></svg>
+      <navigation-search></navigation-search>
+    </div>
+  </div>
+
+  <!-- ── What's new ── -->
+  <div class="whats-new">
+    <div class="whats-new-inner">
+      <span class="badge">NEW</span>
+      <span>Elasticsearch @Model.CurrentVersion is out — <a href="@Model.Link("/release-notes/")">check out what's new →</a></span>
+    </div>
+  </div>
+
+  <!-- ── Popular destinations ── -->
+  <div class="section">
+    <div class="section-header">
+      <h2>Popular destinations</h2>
+    </div>
+    <div class="quick-grid">
+      <a class="quick-card" href="@Model.Link("/solutions/search")">
+        <div class="icon icon-blue">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="7"/><path d="M21 21l-4.35-4.35"/></svg>
+        </div>
+        <div class="card-text">
+          <h3>Elasticsearch</h3>
+          <p>Store, search, and analyze your data</p>
+        </div>
+      </a>
+      <a class="quick-card" href="@Model.Link("/deploy-manage/deploy/self-managed/installing-elasticsearch")">
+        <div class="icon icon-orange">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/></svg>
+        </div>
+        <div class="card-text">
+          <h3>Install with Docker</h3>
+          <p>Run Elasticsearch in containers</p>
+        </div>
+      </a>
+      <a class="quick-card" href="@Model.Link("/reference/query-languages/")">
+        <div class="icon icon-purple">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M16 18l6-6-6-6"/><path d="M8 6l-6 6 6 6"/></svg>
+        </div>
+        <div class="card-text">
+          <h3>Query DSL</h3>
+          <p>Full-text search, filters, and aggregations</p>
+        </div>
+      </a>
+      <a class="quick-card" href="@Model.Link("/get-started")">
+        <div class="icon icon-green">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 2L2 7l10 5 10-5-10-5z"/><path d="M2 17l10 5 10-5"/><path d="M2 12l10 5 10-5"/></svg>
+        </div>
+        <div class="card-text">
+          <h3>The Elastic Stack</h3>
+          <p>Learn about the open-source tools to search, analyze, and visualize data in real time</p>
+        </div>
+      </a>
+      <a class="quick-card" href="https://www.elastic.co/docs/api" target="_blank" rel="noopener noreferrer" hx-disable="true">
+        <div class="icon icon-pink">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/><polyline points="14 2 14 8 20 8"/></svg>
+        </div>
+        <div class="card-text">
+          <h3>Elasticsearch API</h3>
+          <p>REST endpoints</p>
+        </div>
+      </a>
+      <a class="quick-card" href="@Model.Link("/explore-analyze")">
+        <div class="icon icon-orange">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M3 9h18"/><path d="M9 21V9"/></svg>
+        </div>
+        <div class="card-text">
+          <h3>Kibana</h3>
+          <p>Visualize your Elasticsearch data</p>
+        </div>
+      </a>
+    </div>
+  </div>
+
+  <!-- ── Get started ── -->
+  <div class="section">
+    <div class="section-header">
+      <h2>Get started</h2>
+    </div>
+    <div class="gs-grid">
+      <a class="gs-card" href="@Model.Link("/get-started")">
+        <div class="gs-card-icon icon-green">
+          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/></svg>
+        </div>
+        <h3>Try locally</h3>
+        <p>One command. Elasticsearch + Kibana on your machine in under two minutes. No account, no credit card.</p>
+        <span class="gs-cta">Run locally →</span>
+      </a>
+      <a class="gs-card" href="https://cloud.elastic.co/registration?page=docs&placement=docs-body" target="_blank" rel="noopener noreferrer" hx-disable="true">
+        <div class="gs-card-icon icon-blue">
+          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M17.5 19H9a7 7 0 1 1 6.71-9h1.79a4.5 4.5 0 1 1 0 9z"/></svg>
+        </div>
+        <h3>Free cloud trial</h3>
+        <p>Fully managed on AWS, GCP, or Azure. Production-ready in minutes. Search, Observability, and Security all included.</p>
+        <span class="gs-cta">Start free trial →</span>
+      </a>
+      <a class="gs-card" href="@Model.Link("/get-started")">
+        <div class="gs-card-icon icon-purple">
+          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M2 3h6a4 4 0 0 1 4 4v14a3 3 0 0 0-3-3H2z"/><path d="M22 3h-6a4 4 0 0 0-4 4v14a3 3 0 0 1 3-3h7z"/></svg>
+        </div>
+        <h3>Elastic fundamentals</h3>
+        <p>Learn about Elasticsearch concepts and how to get up and running.</p>
+        <span class="gs-cta">Learn the basics →</span>
+      </a>
+    </div>
+  </div>
+
+  <!-- ── Browse by solution ── -->
+  <div class="section">
+    <div class="section-header">
+      <h2>Browse by solution</h2>
+    </div>
+    <div class="products-grid">
+      <div class="product-card">
+        <h3><span class="dot" style="background:#0077cc"></span> Search</h3>
+        <p>Build search experiences powered by Elasticsearch — from full-text search to vector and hybrid retrieval.</p>
+        <ul>
+          <li><a href="@Model.Link("/solutions/search")">Get started with Search <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/search")">Semantic &amp; vector search <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/search")">Search applications <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/search")">Agent Builder <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/search")">AI agent skills <span class="arrow">→</span></a></li>
+        </ul>
+      </div>
+      <div class="product-card">
+        <h3><span class="dot" style="background:#00bfb3"></span> Observability</h3>
+        <p>Logs, metrics, APM, and uptime monitoring in a unified platform.</p>
+        <ul>
+          <li><a href="@Model.Link("/solutions/observability")">Get started with Observability <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/observability")">APM <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/observability")">Log monitoring <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/observability")">Synthetics <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/observability")">Infrastructure monitoring <span class="arrow">→</span></a></li>
+        </ul>
+      </div>
+      <div class="product-card">
+        <h3><span class="dot" style="background:#ff4081"></span> Security</h3>
+        <p>SIEM, endpoint protection, and threat hunting for your organization.</p>
+        <ul>
+          <li><a href="@Model.Link("/solutions/security")">Get started with Security <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/security")">Detection rules <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/security")">Endpoint protection <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/security")">Cases &amp; investigations <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/security")">Cloud security <span class="arrow">→</span></a></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <!-- ── All products ── -->
+  <div class="section">
+    <div class="section-header">
+      <h2>All products</h2>
+    </div>
+    <div class="product-index">
+      <div class="pi-category">
+        <h4>Elastic Stack</h4>
+        <ul>
+          <li><a href="@Model.Link("/solutions/search")">Elasticsearch</a></li>
+          <li><a href="@Model.Link("/explore-analyze")">Kibana</a></li>
+          <li><a href="@Model.Link("/manage-data")">Logstash</a></li>
+          <li><a href="@Model.Link("/manage-data")">Beats</a></li>
+          <li><a href="@Model.Link("/explore-analyze")">Machine Learning</a></li>
+          <li><a href="@Model.Link("/manage-data")">Elasticsearch for Apache Hadoop &amp; Spark</a></li>
+        </ul>
+      </div>
+      <div class="pi-category">
+        <h4>Cloud &amp; orchestration</h4>
+        <ul>
+          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Serverless</a></li>
+          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Hosted</a></li>
+          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud on Kubernetes (ECK)</a></li>
+          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Enterprise (ECE)</a></li>
+          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud control (ecctl)</a></li>
+        </ul>
+      </div>
+      <div class="pi-category">
+        <h4>Ingest tools</h4>
+        <ul>
+          <li><a href="@Model.Link("/manage-data")">Integrations</a></li>
+          <li><a href="@Model.Link("/reference/opentelemetry/")">Elastic Distributions for OpenTelemetry</a></li>
+          <li><a href="@Model.Link("/manage-data")">Fleet &amp; Elastic Agent</a></li>
+          <li><a href="@Model.Link("/solutions/observability")">APM</a></li>
+          <li><a href="@Model.Link("/solutions/security")">Elastic Defend</a></li>
+          <li><a href="@Model.Link("/manage-data")">Elastic Serverless Forwarder for AWS</a></li>
+          <li><a href="@Model.Link("/manage-data")">Connectors</a></li>
+          <li><a href="@Model.Link("/manage-data")">Web crawler</a></li>
+        </ul>
+      </div>
+      <div class="pi-category">
+        <h4>Query languages</h4>
+        <ul>
+          <li><a href="@Model.Link("/reference/query-languages/")">Query DSL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">ES|QL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">KQL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">SQL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">EQL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">Lucene</a></li>
+        </ul>
+      </div>
+      <div class="pi-category">
+        <h4>APM agents</h4>
+        <ul>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Java Agent</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">&#46;NET Agent</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Node.js Agent</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Python Agent</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Ruby Agent</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Go Agent</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">PHP Agent</a></li>
+        </ul>
+      </div>
+      <div class="pi-category">
+        <h4>Developer tools &amp; standards</h4>
+        <ul>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Elasticsearch clients</a></li>
+          <li><a href="@Model.Link("/reference")">Elastic Common Schema (ECS)</a></li>
+          <li><a href="@Model.Link("/reference")">Search UI</a></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <!-- ── Footer ── -->
+  <footer class="landing-footer">
+    <span>© 2026 Elasticsearch B.V.</span>
+    <span><a href="@Model.Link("/contribute-docs")">Edit this page</a> · <a href="@Model.Link("/contribute-docs")">Report a docs issue</a></span>
+  </footer>
 
-	<section class="w-full">
-		<div class="container mx-auto pt-10 pb-20">
-			<div class="rounded-2xl overflow-hidden px-12 py-8 bg-blue-elastic bg-no-repeat bg-auto grid lg:grid-cols-[1fr_auto] gap-12 items-center text-center lg:text-left"
-			     style="background-image: url('@Model.Static("elasticon-bg-b.png")'); background-position: center 65%">
-				<div>
-					<h2 class="font-bold font-sans text-3xl text-white">Looking for more?</h2>
-					<p class="mt-2 text-white text-base">We'll show you how to solve toughest challenges with Search AI.
-						Join us at an Elastic{ON} event near you!</p>
-				</div>
-				<a href="https://www.elastic.co/events/elasticon" target="_blank" rel="noopener noreferrer"
-				   class="w-full cursor-pointer text-blue-elastic hover:text-blue-elastic-100 text-nowrap border-2 border-white hover:border-grey-20 bg-white hover:bg-grey-10 focus:ring-4 focus:outline-none focus:ring-blue-elastic-50 font-semibold font-sans rounded-sm px-6 py-2 text-center h-10 flex items-center justify-center min-w-40 max-w-md lg:max-w-none justify-self-center lg:justify-self-auto">
-					Register now
-				</a>
-			</div>
-		</div>
-	</section>
-	
 </div>

From b0dbb3a36e23ebc4acd21d85ac8c601b303fdd58 Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Tue, 5 May 2026 13:44:57 -0500
Subject: [PATCH 134/226] Redesign landing page with search-first layout and
 product index

Replaces the previous hero/card layout with a search-first design:
- Version disambiguation banner with link to 8.x docs
- Prominent search bar with What's new ribbon
- Analytics-driven popular destinations grid
- Get started cards (local, cloud trial, fundamentals)
- Browse by solution (Search, Observability, Security) with sub-links
- Full product index categorized by stack, cloud, ingest, query languages, APM agents, and developer tools
- Scoped CSS replacing Tailwind utility classes

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Layout/_LandingPage.cshtml                | 910 ++++++++++++------
 1 file changed, 619 insertions(+), 291 deletions(-)

diff --git a/src/Elastic.Markdown/Layout/_LandingPage.cshtml b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
index 7dd11f233f..4f45273501 100644
--- a/src/Elastic.Markdown/Layout/_LandingPage.cshtml
+++ b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
@@ -1,300 +1,628 @@
 @inherits RazorSlice<Elastic.Markdown.MarkdownLayoutViewModel>
-<div hx-select-oob="#main-container" hx-swap="none" class="w-full max-w-[100vw] text-ink relative text-pretty overflow-x-hidden">
-	<section class="w-full bg-grey-10" id="hero">
-		<div class="container mx-auto pt-28 pb-4 min-[1024px]:pb-28 grid min-[1024px]:grid-cols-[auto_420px] min-[1024px]:justify-between items-center gap-6 min-[1024px]:gap-[74px]">
-			<div class="max-w-165">
-				<h1 class="text-6xl font-bold font-sans text-black">Elastic Docs</h1>
-				<p class="mt-4">Welcome to the technical documentation for <span class="whitespace-nowrap">Elastic Stack 9.0.0</span>
-					and later, and <span class="whitespace-nowrap">Elastic Cloud Serverless</span>. Deploy, operate, and scale with step-by-step guides, API references, examples, and best practices.</p>
-				<p class="mt-4"><strong>Upgrading from an earlier version?</strong> Follow the <a href="@Model.Link("/deploy-manage/upgrade")"
-					class="link">upgrade guide</a> to plan and complete your upgrade. </p>
+<style>
+  /* ── Reset & Base ── */
+  *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
+  :root {
+    --bg: #fafbfc;
+    --surface: #ffffff;
+    --surface-alt: #f3f5f7;
+    --border: #e2e6ea;
+    --border-light: #eef0f3;
+    --text: #1a1f36;
+    --text-secondary: #4a5270;
+    --text-muted: #8891a4;
+    --accent: #0077cc;
+    --accent-hover: #005fa3;
+    --accent-bg: #e8f4fd;
+    --green: #00bfb3;
+    --green-bg: #e6faf8;
+    --orange: #f5a623;
+    --orange-bg: #fef6e8;
+    --purple: #7b61ff;
+    --purple-bg: #f0edff;
+    --pink: #ff4081;
+    --pink-bg: #fff0f5;
+    --radius: 10px;
+    --radius-sm: 6px;
+    --shadow-sm: 0 1px 3px rgba(0,0,0,0.06);
+    --shadow: 0 2px 8px rgba(0,0,0,0.08);
+    --shadow-lg: 0 4px 20px rgba(0,0,0,0.10);
+    --max-w: 1120px;
+    --font: -apple-system, BlinkMacSystemFont, 'Inter', 'Segoe UI', sans-serif;
+  }
+  body { font-family: var(--font); background: var(--bg); color: var(--text); line-height: 1.55; -webkit-font-smoothing: antialiased; }
+  a { color: var(--accent); text-decoration: none; transition: color 0.15s; }
+  a:hover { color: var(--accent-hover); }
 
-				<div class="flex md:inline-flex flex-col gap-6 mt-6">
-					<navigation-search></navigation-search>
-					<div class="flex gap-3">
-						<a href="@Model.Link("/get-started")"
-						   class="grow select-none cursor-pointer text-white text-nowrap bg-blue-elastic hover:bg-blue-elastic-110 focus:ring-4 focus:ring-blue-elastic-50 font-semibold font-sans rounded-sm px-6 py-2 focus:outline-none h-10 flex items-center justify-center">
-							Elastic Fundamentals
-						</a>
-						<a href="https://cloud.elastic.co/registration?page=docs&placement=docs-body"
-						   class="grow cursor-pointer text-blue-elastic hover:text-blue-elastic-100 text-nowrap border-2 border-blue-elastic hover:border-blue-elastic-100 focus:ring-4 focus:outline-none focus:ring-blue-elastic-50 font-semibold font-sans rounded-sm px-6 py-2 text-center h-10 flex items-center justify-center">
-							Start free trial
-						</a>
-					</div>
-				</div>
-				@if (Model.AllVersionsUrl is not null)
-				{
-					<div class="mt-6">
-						<a href="@Model.AllVersionsUrl" class="link">
-							View previous docs versions
-							<svg class="link-arrow"
-							     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-								<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
-							</svg>
-						</a>
-					</div>
-				}
-			</div>
-			<div class="flex flex-col justify-center w-full mt-14 min-[1024px]:mt-0">
-				<div class="rounded-2xl p-8 bg-white flex flex-col gap-4 items-start"
-				     style="border: 2px solid transparent; background: linear-gradient(white, white) padding-box, linear-gradient(-65deg, #BFDBFF 17%, #E2D3FE 83%) border-box; background-clip: padding-box, border-box; background-origin: padding-box, border-box;">
-					<span class="euiBadge euiBadge--primary inline-flex items-center font-sans font-bold text-xs uppercase tracking-wide shrink-0 rounded-full px-2 py-0.5 bg-[#8144CC] text-white">NEW</span>
-					<div class="flex flex-col">
-						<p class="font-sans font-bold text-xl">Elastic skills for AI agents</p>
-						<p class="mt-2">Install official skills that teach AI coding agents how to work with Elasticsearch, Kibana, Fleet, and the rest of the Elastic stack.</p>
-						<div class="grid grid-cols-1 mt-6 gap-2 text-left">
-							<a href="@Model.Link("/explore-analyze/ai-features/agent-skills")" class="link justify-start">
-								Learn more
-								<svg class="link-arrow"
-								     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-									<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
-								</svg>
-							</a>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</section>
+  /* ── Hero / Search ── */
+  .hero {
+    max-width: var(--max-w);
+    margin: 0 auto;
+    padding: 48px 24px 0;
+    text-align: center;
+  }
+  .hero h1 {
+    font-size: 28px;
+    font-weight: 700;
+    letter-spacing: -0.02em;
+    margin-bottom: 10px;
+  }
+  .hero p {
+    font-size: 15px;
+    color: var(--text-secondary);
+    margin-bottom: 28px;
+  }
+  .search-wrap {
+    max-width: 640px;
+    margin: 0 auto 16px;
+    position: relative;
+  }
+  .search-wrap svg {
+    position: absolute;
+    left: 16px;
+    top: 50%;
+    transform: translateY(-50%);
+    color: var(--text-muted);
+    pointer-events: none;
+  }
+  .search-wrap input {
+    width: 100%;
+    height: 52px;
+    border: 2px solid var(--border);
+    border-radius: var(--radius);
+    padding: 0 16px 0 48px;
+    font-size: 16px;
+    font-family: var(--font);
+    background: var(--surface);
+    color: var(--text);
+    transition: border-color 0.15s, box-shadow 0.15s;
+    outline: none;
+  }
+  .search-wrap input::placeholder { color: var(--text-muted); }
+  .search-wrap input:focus {
+    border-color: var(--accent);
+    box-shadow: 0 0 0 3px rgba(0,119,204,0.12);
+  }
 
-	<section class="w-full bg-grey-10">
-		<div class="container mx-auto py-10 pb-28">
-			<div class="heading-wrapper" id="solutions-use-cases">
-				<h2 class="font-bold font-sans text-3xl text-ink-dark">
-					<a href="#solutions-use-cases">Solutions and use cases</a>
-				</h2>
-			</div>
-			<div class="grid grid-cols-1 min-[1024px]:grid-cols-2 lg:grid-cols-3 gap-6 mt-6">
-				<div class="rounded-2xl border-1 border-grey-20 p-8 bg-white flex gap-6 items-start">
-					<img loading="lazy" alt="Search logo" src="@Model.Static("elasticsearch-logo-color-64px.svg")" class="size-8"/>
-					<div class="flex flex-col">
-						<p class="font-sans font-bold text-xl">Elasticsearch</p>
-						<p class="mt-2">Build powerful search and RAG applications using Elasticsearch's vector database, AI toolkit, and advanced retrieval capabilities.</p>
-						<div class="grid grid-cols-1 mt-6 gap-2">
-							<a href="@Model.Link("/solutions/search")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold">9.0+ (latest @Model.CurrentVersion) docs</a>
-							<a href="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" class="text-sm text-grey-90 hover:text-grey-110 font-sans font-semibold" hx-disable="true">Previous versions</a>
-						</div>
-					</div>
-				</div>
-				<div class="rounded-2xl border-1 border-grey-20 p-8 bg-white flex gap-6 items-start">
-					<img loading="lazy" alt="Observability logo" src="@Model.Static("observability-logo-color-64px.svg")" class="size-8"/>
-					<div class="flex flex-col">
-						<p class="font-sans font-bold text-xl">Observability</p>
-						<p class="mt-2">Resolve problems with open, flexible, and unified observability powered by advanced machine learning and analytics.</p>
-						<div class="grid grid-cols-1 mt-6 gap-2">
-							<a href="@Model.Link("/solutions/observability")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold">9.0+ (latest @Model.CurrentVersion) docs</a>
-							<a href="https://www.elastic.co/guide/en/observability/index.html" class="text-sm text-grey-90 hover:text-grey-110 font-sans font-semibold" hx-disable="true">Previous versions</a>
-						</div>
-					</div>
-				</div>
-				<div class="rounded-2xl border-1 border-grey-20 p-8 bg-white flex gap-6 items-start">
-					<img loading="lazy" alt="Security logo" src="@Model.Static("security-logo-color-64px.svg")" class="size-8"/>
-					<div class="flex flex-col">
-						<p class="font-sans font-bold text-xl">Security</p>
-						<p class="mt-2">Detect, investigate, and respond to threats with AI-driven security analytics to protect your organization at scale.</p>
-						<div class="grid grid-cols-1 mt-6 gap-2">
-							<a href="@Model.Link("/solutions/security")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold">9.0+ (latest @Model.CurrentVersion) docs</a>
-							<a href="https://www.elastic.co/guide/en/security/index.html" class="text-sm text-grey-90 hover:text-grey-110 font-sans font-semibold" hx-disable="true">Previous versions</a>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</section>
+  /* ── Quick destinations ── */
+  .section { max-width: var(--max-w); margin: 0 auto; padding: 40px 24px 0; }
+  .section-header {
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+    margin-bottom: 16px;
+  }
+  .section-header h2 { font-size: 17px; font-weight: 700; letter-spacing: -0.01em; }
+  .section-header a { font-size: 13px; font-weight: 500; }
 
-	<section class="w-full">
-		<div class="container mx-auto pt-20 pb-10">
-			<div class="heading-wrapper" id="how-to-guides">
-				<h2 class="font-bold font-sans text-3xl text-ink-dark">
-					<a href="#how-to-guides">
-						How-to guides
-					</a>
-				</h2>
-			</div>
-			<div class="grid grid-cols-1 min-[1024px]:grid-cols-2 lg:grid-cols-4 gap-6 mt-6">
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col gap-6 items-start">
-					<img loading="lazy" alt="Manage data icon" src="@Model.Static("productStreamsWired.svg")" class="size-8"/>
-					<div class="flex flex-col grow">
-						<p class="font-sans font-bold text-xl">Manage data</p>
-						<p class="mt-2 grow">Learn how to ingest, enrich, and manage your data in Elastic.</p>
-						<a href="@Model.Link("/manage-data")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-					</div>
-				</div>
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col gap-6 items-start">
-					<img loading="lazy" alt="Explore and analyze icon" src="@Model.Static("productDashboard.svg")" class="size-8"/>
-					<div class="flex flex-col grow">
-						<p class="font-sans font-bold text-xl">Explore and analyze</p>
-						<p class="mt-2 grow">Discover the tools of Elasticsearch and Kibana.</p>
-						<a href="@Model.Link("/explore-analyze")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-					</div>
-				</div>
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col gap-6 items-start">
-					<img loading="lazy" alt="Deploy and manage icon" src="@Model.Static("storage.svg")" class="size-8"/>
-					<div class="flex flex-col grow">
-						<p class="font-sans font-bold text-xl">Deploy and manage</p>
-						<p class="mt-2 grow">Learn how to deploy and manage all aspects of your Elastic environment.</p>
-						<a href="@Model.Link("/deploy-manage")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-					</div>
-				</div>
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col gap-6 items-start">
-					<img loading="lazy" alt="Manage Cloud account icon" src="@Model.Static("cloud.svg")" class="size-8"/>
-					<div class="flex flex-col grow">
-						<p class="font-sans font-bold text-xl">Manage Cloud account</p>
-						<p class="mt-2 grow">Manage your profile information, preferences, and personal settings.</p>
-						<a href="@Model.Link("/cloud-account")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-					</div>
-				</div>
-			</div>
-		</div>
-	</section>
+  .quick-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
+    gap: 12px;
+  }
+  .quick-card {
+    background: var(--surface);
+    border: 1px solid var(--border-light);
+    border-radius: var(--radius);
+    padding: 18px 20px;
+    display: flex;
+    align-items: flex-start;
+    gap: 14px;
+    transition: box-shadow 0.15s, border-color 0.15s;
+    cursor: pointer;
+    text-decoration: none;
+    color: var(--text);
+  }
+  .quick-card:hover {
+    border-color: var(--accent);
+    box-shadow: var(--shadow);
+    color: var(--text);
+  }
+  .quick-card .icon {
+    width: 40px;
+    height: 40px;
+    border-radius: var(--radius-sm);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    font-size: 18px;
+  }
+  .quick-card .card-text h3 { font-size: 14px; font-weight: 600; margin-bottom: 3px; }
+  .quick-card .card-text p { font-size: 13px; color: var(--text-secondary); line-height: 1.4; }
+  .quick-card .card-text .meta { font-size: 12px; color: var(--text-muted); margin-top: 4px; }
 
-	<section class="w-full">
-		<div class="container mx-auto py-10">
-			<div class="heading-wrapper" id="references">
-				<h2 class="font-bold font-sans text-3xl text-ink-dark">
-					<a href="#references">Reference</a>
-				</h2>
-			</div>
-			<div class="grid grid-cols-1 min-[1024px]:grid-cols-2 lg:grid-cols-4 gap-6 mt-6">
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">Elastic APIs</p>
-					<p class="mt-2 grow">Browse the API docs for Elasticsearch, Kibana, Elastic Cloud, and more.</p>
-					<a href="https://www.elastic.co/docs/api" target="_blank" rel="noopener noreferrer" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-				</div>
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">Elasticsearch clients</p>
-					<p class="mt-2 grow">Browse the Elasticsearch client libraries for Java, .Net, Python, and more.</p>
-					<a href="@Model.Link("/reference/elasticsearch-clients/")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-				</div>
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">OpenTelemetry</p>
-					<p class="mt-2 grow">Browse the docs for the Elastic Distributions of OpenTelemetry (EDOT).</p>
-					<a href="@Model.Link("/reference/opentelemetry/")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-				</div>
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 p-8 bg-white flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">Query languages</p>
-					<p class="mt-2 grow">Browse the docs for Query DSL, <span class="whitespace-nowrap">ES|QL</span>, KQL, and more.</p>
-					<a href="@Model.Link("/reference/query-languages/")" class="text-blue-elastic-100 hover:text-blue-elastic-110 font-sans font-semibold mt-3">View docs</a>
-				</div>
-			</div>
-			<div class="mt-6">
-				<a href="@Model.Link("/reference")" class="link">
-					View all reference docs
-					<svg class="link-arrow"
-					     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-						<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
-					</svg>
-				</a>
-			</div>
-		</div>
-	</section>
+  /* Icon color variants */
+  .icon-blue { background: var(--accent-bg); color: var(--accent); }
+  .icon-green { background: var(--green-bg); color: var(--green); }
+  .icon-orange { background: var(--orange-bg); color: var(--orange); }
+  .icon-purple { background: var(--purple-bg); color: var(--purple); }
+  .icon-pink { background: var(--pink-bg); color: var(--pink); }
 
-	<section class="w-full">
-		<div class="container mx-auto py-10">
-			<div class="heading-wrapper" id="product-resources">
-				<h2 class="font-bold font-sans text-3xl">
-					<a href="#product-resources">
-						Product resources
-					</a>
-				</h2>
-			</div>
-			<div class="grid grid-cols-1 min-[1024px]:grid-cols-2 lg:grid-cols-4 gap-6 mt-6">
-				<div class="min-h-61 rounded-2xl bg-ink-navy border-1 border-grey-20 text-white p-8 flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">Release notes</p>
-					<p class="mt-2 grow">Explore the latest features and changes in Elastic.</p>
-					<a href="@Model.Link("/release-notes/")" class="link mt-3 justify-start text-white hover:text-grey-20">View release notes
-						<svg class="link-arrow"
-						     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-							<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
-						</svg>
-						</a>
-				</div>
-				<div class="min-h-61 rounded-2xl bg-ink-navy border-1 border-grey-20 text-white p-8 flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">Extend and contribute</p>
-					<p class="mt-2 grow">Learn how to contribute to Elastic products and extend capabilities.</p>
-					<a href="@Model.Link("extend/")" class="link mt-3 justify-start text-white hover:text-grey-20">View extend and contribute docs
-						<svg class="link-arrow"
-						     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-							<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
-						</svg>
-						</a>
-				</div>
-				<div class="min-h-61 rounded-2xl bg-ink-navy border-1 border-grey-20 text-white p-8 flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">Troubleshoot</p>
-					<p class="mt-2 grow">Check troubleshooting guides for common fixes.</p>
-					<a href="@Model.Link("/troubleshoot/")" class="link mt-3 justify-start text-white hover:text-grey-20">View troubleshooting docs
-						<svg class="link-arrow"
-						     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-							<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
-						</svg>
-						</a>
-				</div>
-				<div class="min-h-61 rounded-2xl border-1 border-grey-20 bg-white p-8 flex flex-col items-start">
-					<p class="font-sans font-bold text-xl">Previous versions</p>
-					<p class="mt-2 grow">Browse the docs for previous Elastic product versions.</p>
-					<a href="https://www.elastic.co/guide?lang=en" target="_blank" rel="noopener noreferrer" class="link mt-3 justify-start text-blue-elastic-100 hover:text-blue-elastic-110" hx-disable="true">View previous versions
-						<svg class="link-arrow"
-						     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-							<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
-						</svg>
-						</a>
-				</div>
-			</div>
-		</div>
-	</section>
-	
-	@* <section class="w-full bg-grey-10"> *@
-	@* 	<div class="container mx-auto py-10"> *@
-	@* 		<h2 class="font-bold text-3xl text-ink-dark">Instant Elasticsearch</h2> *@
-	@* 		<div class="grid lg:grid-cols-2 gap-6 mt-6"> *@
-	@* 			<div class="lg:basis-[50%]"> *@
-	@* 				<p class="mt-2 font-body">For local testing, use Docker to install and run Elasticsearch.</p> *@
-	@* 			</div> *@
-	@* 			<div class="lg:basis-[50%] rounded-xl border-1 border-grey-20 p-6"> *@
-	@* 				<p class="font-body">Try it locally now:</p> *@
-	@* 				<div class="mt-2"> *@
-	@* 					<div class="highlight-bash notranslate"> *@
-	@* 						<div class="highlight"> *@
-	@* 							<pre> *@
-	@* 								<code class="language-yaml hljs" data-highlighted="yes">curl -fsSL https://elastic.co/start-local | sh</code> *@
-	@* 							</pre> *@
-	@* 						</div> *@
-	@* 					</div> *@
-	@* 				</div> *@
-	@* 			</div> *@
-	@* 		</div> *@
-	@* 	</div> *@
-	@* </section> *@
+  /* ── Version banner ── */
+  .version-banner {
+    max-width: var(--max-w);
+    margin: 40px auto 0;
+    padding: 0 24px;
+  }
+  .version-banner-inner {
+    background: linear-gradient(135deg, #f8f9fb 0%, #eef2f7 100%);
+    border: 1px solid var(--border);
+    border-radius: var(--radius);
+    padding: 20px 24px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 20px;
+    flex-wrap: wrap;
+  }
+  .version-banner-inner .vb-text { flex: 1; min-width: 200px; }
+  .version-banner-inner .vb-text h3 { font-size: 14px; font-weight: 600; margin-bottom: 3px; }
+  .version-banner-inner .vb-text p { font-size: 13px; color: var(--text-secondary); }
+  .version-banner-inner .vb-actions { display: flex; gap: 10px; flex-wrap: wrap; }
+  .btn {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    padding: 8px 18px;
+    border-radius: var(--radius-sm);
+    font-size: 13px;
+    font-weight: 600;
+    font-family: var(--font);
+    cursor: pointer;
+    transition: background 0.15s, box-shadow 0.15s;
+    border: none;
+    text-decoration: none;
+  }
+  .btn-primary { background: var(--accent); color: #fff; }
+  .btn-primary:hover { background: var(--accent-hover); color: #fff; }
+  .btn-outline { background: var(--surface); color: var(--text-secondary); border: 1px solid var(--border); }
+  .btn-outline:hover { border-color: var(--accent); color: var(--accent); background: var(--accent-bg); }
 
-	<section class="w-full">
-		<div class="container mx-auto py-10">
-			<div class="rounded-xl border-1 border-grey-20 px-12 py-8 grid lg:grid-cols-[1fr_auto] gap-12 items-center text-center lg:text-left">
-				<div>
-					<h2 class="font-semibold font-sans text-3xl text-black leading-[1.2em]">Welcome to our community of developers</h2>
-					<p class="mt-2">Learn from your peers and share code examples.</p>
-				</div>
-				<a href="https://discuss.elastic.co" target="_blank" rel="noopener noreferrer" class="w-full cursor-pointer text-blue-elastic hover:text-blue-elastic-100 text-nowrap border-2 border-blue-elastic hover:border-blue-elastic-100 focus:ring-4 focus:outline-none focus:ring-blue-elastic-50 font-semibold rounded-sm px-6 py-2 text-center h-10 flex items-center justify-center min-w-40 max-w-md lg:max-w-none justify-self-center lg:justify-self-auto">
-					Join now
-				</a>
-			</div>
-		</div>
-	</section>
+  /* ── Product sections ── */
+  .products-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 16px;
+  }
+  @@media (max-width: 800px) {
+    .products-grid { grid-template-columns: 1fr; }
+  }
+  .product-card {
+    background: var(--surface);
+    border: 1px solid var(--border-light);
+    border-radius: var(--radius);
+    padding: 24px;
+    transition: box-shadow 0.15s;
+  }
+  .product-card:hover { box-shadow: var(--shadow); }
+  .product-card h3 {
+    font-size: 16px;
+    font-weight: 700;
+    margin-bottom: 6px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+  .product-card h3 .dot {
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    flex-shrink: 0;
+  }
+  .product-card > p { font-size: 13px; color: var(--text-secondary); margin-bottom: 16px; line-height: 1.5; }
+  .product-card ul { list-style: none; }
+  .product-card ul li { border-top: 1px solid var(--border-light); }
+  .product-card ul li a {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 10px 0;
+    font-size: 14px;
+    color: var(--text);
+    transition: color 0.15s;
+  }
+  .product-card ul li a:hover { color: var(--accent); }
+  .product-card ul li a .arrow { color: var(--text-muted); font-size: 14px; transition: transform 0.15s, color 0.15s; }
+  .product-card ul li a:hover .arrow { transform: translateX(3px); color: var(--accent); }
+
+  /* ── Product index (categorized) ── */
+  .product-index {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 16px;
+  }
+  @@media (max-width: 800px) {
+    .product-index { grid-template-columns: 1fr; }
+  }
+  .pi-category {
+    background: var(--surface);
+    border: 1px solid var(--border-light);
+    border-radius: var(--radius);
+    padding: 18px 20px;
+  }
+  .pi-category h4 {
+    font-size: 12px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.06em;
+    color: var(--text-muted);
+    margin-bottom: 10px;
+  }
+  .pi-category ul { list-style: none; }
+  .pi-category ul li + li { border-top: 1px solid var(--border-light); }
+  .pi-category ul li a {
+    display: block;
+    padding: 8px 0;
+    font-size: 14px;
+    font-weight: 500;
+    color: var(--text);
+    text-decoration: none;
+    transition: color 0.12s;
+  }
+  .pi-category ul li a:hover { color: var(--accent); }
+
+  /* ── Reference & API strip ── */
+  .ref-strip {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+    gap: 12px;
+  }
+  .ref-item {
+    background: var(--surface);
+    border: 1px solid var(--border-light);
+    border-radius: var(--radius-sm);
+    padding: 16px;
+    text-decoration: none;
+    color: var(--text);
+    transition: box-shadow 0.15s, border-color 0.15s;
+  }
+  .ref-item:hover { border-color: var(--accent); box-shadow: var(--shadow-sm); color: var(--text); }
+  .ref-item h4 { font-size: 14px; font-weight: 600; margin-bottom: 3px; }
+  .ref-item p { font-size: 12px; color: var(--text-muted); }
+
+  /* ── Getting started ── */
+  .gs-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 14px;
+  }
+  @@media (max-width: 800px) {
+    .gs-grid { grid-template-columns: 1fr; }
+  }
+  .gs-card {
+    background: var(--surface);
+    border: 1px solid var(--border-light);
+    border-radius: var(--radius);
+    padding: 22px 22px 20px;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    text-decoration: none;
+    color: var(--text);
+    transition: border-color 0.15s, box-shadow 0.15s;
+  }
+  .gs-card:hover { border-color: var(--accent); box-shadow: var(--shadow); color: var(--text); }
+  .gs-card .gs-card-icon {
+    width: 36px;
+    height: 36px;
+    border-radius: var(--radius-sm);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 18px;
+    flex-shrink: 0;
+  }
+  .gs-card h3 { font-size: 15px; font-weight: 700; }
+  .gs-card p { font-size: 13px; color: var(--text-secondary); line-height: 1.45; flex: 1; }
+  .gs-card .gs-cta { font-size: 13px; font-weight: 600; color: var(--accent); }
+
+  /* ── Footer ── */
+  .landing-footer {
+    max-width: var(--max-w);
+    margin: 48px auto 0;
+    padding: 40px 24px;
+    border-top: 1px solid var(--border-light);
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 12px;
+    font-size: 13px;
+    color: var(--text-muted);
+  }
+  .landing-footer a { color: var(--text-secondary); }
+
+  /* ── What's new ribbon ── */
+  .whats-new {
+    max-width: var(--max-w);
+    margin: 32px auto 0;
+    padding: 0 24px;
+  }
+  .whats-new-inner {
+    background: linear-gradient(135deg, #eef2ff 0%, #f0edff 100%);
+    border: 1px solid #d8d0ff;
+    border-radius: var(--radius);
+    padding: 14px 20px;
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    font-size: 14px;
+  }
+  .whats-new-inner .badge {
+    background: var(--purple);
+    color: #fff;
+    font-size: 11px;
+    font-weight: 700;
+    padding: 3px 10px;
+    border-radius: 20px;
+    white-space: nowrap;
+    letter-spacing: 0.03em;
+  }
+  .whats-new-inner a { font-weight: 500; }
+
+  /* ── Responsive ── */
+  @@media (max-width: 680px) {
+    .hero h1 { font-size: 22px; }
+    .quick-grid { grid-template-columns: 1fr; }
+    .version-banner-inner { flex-direction: column; align-items: flex-start; }
+    .gs-grid { grid-template-columns: 1fr; }
+  }
+</style>
+
+<div hx-select-oob="#main-container" hx-swap="none" class="w-full max-w-[100vw] relative overflow-x-hidden">
+
+  <!-- ── Version disambiguation ── -->
+  <div class="version-banner">
+    <div class="version-banner-inner">
+      <div class="vb-text">
+        <h3>You're viewing docs for Elastic Stack 9.0+ (latest @Model.CurrentVersion)</h3>
+        <p>Need docs for an earlier version?</p>
+      </div>
+      <div class="vb-actions">
+        <a href="https://www.elastic.co/guide" class="btn btn-outline" hx-disable="true">8.x docs (elastic.co/guide) →</a>
+        @if (Model.AllVersionsUrl is not null)
+        {
+          <a href="@Model.AllVersionsUrl" class="btn btn-outline">All versions</a>
+        }
+      </div>
+    </div>
+  </div>
+
+  <!-- ── Hero: Search-first ── -->
+  <div class="hero">
+    <h1>Elastic documentation</h1>
+    <p>Find guides, API references, and tutorials for the Elastic Stack.</p>
+    <div class="search-wrap">
+      <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="7"/><path d="M21 21l-4.35-4.35"/></svg>
+      <navigation-search></navigation-search>
+    </div>
+  </div>
+
+  <!-- ── What's new ── -->
+  <div class="whats-new">
+    <div class="whats-new-inner">
+      <span class="badge">NEW</span>
+      <span>Elasticsearch @Model.CurrentVersion is out — <a href="@Model.Link("/release-notes/")">check out what's new →</a></span>
+    </div>
+  </div>
+
+  <!-- ── Popular destinations ── -->
+  <div class="section">
+    <div class="section-header">
+      <h2>Popular destinations</h2>
+    </div>
+    <div class="quick-grid">
+      <a class="quick-card" href="@Model.Link("/solutions/search")">
+        <div class="icon icon-blue">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="7"/><path d="M21 21l-4.35-4.35"/></svg>
+        </div>
+        <div class="card-text">
+          <h3>Elasticsearch</h3>
+          <p>Store, search, and analyze your data</p>
+        </div>
+      </a>
+      <a class="quick-card" href="@Model.Link("/deploy-manage/deploy/self-managed/installing-elasticsearch")">
+        <div class="icon icon-orange">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/></svg>
+        </div>
+        <div class="card-text">
+          <h3>Install with Docker</h3>
+          <p>Run Elasticsearch in containers</p>
+        </div>
+      </a>
+      <a class="quick-card" href="@Model.Link("/reference/query-languages/")">
+        <div class="icon icon-purple">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M16 18l6-6-6-6"/><path d="M8 6l-6 6 6 6"/></svg>
+        </div>
+        <div class="card-text">
+          <h3>Query DSL</h3>
+          <p>Full-text search, filters, and aggregations</p>
+        </div>
+      </a>
+      <a class="quick-card" href="@Model.Link("/get-started")">
+        <div class="icon icon-green">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 2L2 7l10 5 10-5-10-5z"/><path d="M2 17l10 5 10-5"/><path d="M2 12l10 5 10-5"/></svg>
+        </div>
+        <div class="card-text">
+          <h3>The Elastic Stack</h3>
+          <p>Learn about the open-source tools to search, analyze, and visualize data in real time</p>
+        </div>
+      </a>
+      <a class="quick-card" href="https://www.elastic.co/docs/api" target="_blank" rel="noopener noreferrer" hx-disable="true">
+        <div class="icon icon-pink">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/><polyline points="14 2 14 8 20 8"/></svg>
+        </div>
+        <div class="card-text">
+          <h3>Elasticsearch API</h3>
+          <p>REST endpoints</p>
+        </div>
+      </a>
+      <a class="quick-card" href="@Model.Link("/explore-analyze")">
+        <div class="icon icon-orange">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M3 9h18"/><path d="M9 21V9"/></svg>
+        </div>
+        <div class="card-text">
+          <h3>Kibana</h3>
+          <p>Visualize your Elasticsearch data</p>
+        </div>
+      </a>
+    </div>
+  </div>
+
+  <!-- ── Get started ── -->
+  <div class="section">
+    <div class="section-header">
+      <h2>Get started</h2>
+    </div>
+    <div class="gs-grid">
+      <a class="gs-card" href="@Model.Link("/get-started")">
+        <div class="gs-card-icon icon-green">
+          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/></svg>
+        </div>
+        <h3>Try locally</h3>
+        <p>One command. Elasticsearch + Kibana on your machine in under two minutes. No account, no credit card.</p>
+        <span class="gs-cta">Run locally →</span>
+      </a>
+      <a class="gs-card" href="https://cloud.elastic.co/registration?page=docs&placement=docs-body" target="_blank" rel="noopener noreferrer" hx-disable="true">
+        <div class="gs-card-icon icon-blue">
+          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M17.5 19H9a7 7 0 1 1 6.71-9h1.79a4.5 4.5 0 1 1 0 9z"/></svg>
+        </div>
+        <h3>Free cloud trial</h3>
+        <p>Fully managed on AWS, GCP, or Azure. Production-ready in minutes. Search, Observability, and Security all included.</p>
+        <span class="gs-cta">Start free trial →</span>
+      </a>
+      <a class="gs-card" href="@Model.Link("/get-started")">
+        <div class="gs-card-icon icon-purple">
+          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M2 3h6a4 4 0 0 1 4 4v14a3 3 0 0 0-3-3H2z"/><path d="M22 3h-6a4 4 0 0 0-4 4v14a3 3 0 0 1 3-3h7z"/></svg>
+        </div>
+        <h3>Elastic fundamentals</h3>
+        <p>Learn about Elasticsearch concepts and how to get up and running.</p>
+        <span class="gs-cta">Learn the basics →</span>
+      </a>
+    </div>
+  </div>
+
+  <!-- ── Browse by solution ── -->
+  <div class="section">
+    <div class="section-header">
+      <h2>Browse by solution</h2>
+    </div>
+    <div class="products-grid">
+      <div class="product-card">
+        <h3><span class="dot" style="background:#0077cc"></span> Search</h3>
+        <p>Build search experiences powered by Elasticsearch — from full-text search to vector and hybrid retrieval.</p>
+        <ul>
+          <li><a href="@Model.Link("/solutions/search")">Get started with Search <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/search")">Semantic &amp; vector search <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/search")">Search applications <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/search")">Agent Builder <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/search")">AI agent skills <span class="arrow">→</span></a></li>
+        </ul>
+      </div>
+      <div class="product-card">
+        <h3><span class="dot" style="background:#00bfb3"></span> Observability</h3>
+        <p>Logs, metrics, APM, and uptime monitoring in a unified platform.</p>
+        <ul>
+          <li><a href="@Model.Link("/solutions/observability")">Get started with Observability <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/observability")">APM <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/observability")">Log monitoring <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/observability")">Synthetics <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/observability")">Infrastructure monitoring <span class="arrow">→</span></a></li>
+        </ul>
+      </div>
+      <div class="product-card">
+        <h3><span class="dot" style="background:#ff4081"></span> Security</h3>
+        <p>SIEM, endpoint protection, and threat hunting for your organization.</p>
+        <ul>
+          <li><a href="@Model.Link("/solutions/security")">Get started with Security <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/security")">Detection rules <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/security")">Endpoint protection <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/security")">Cases &amp; investigations <span class="arrow">→</span></a></li>
+          <li><a href="@Model.Link("/solutions/security")">Cloud security <span class="arrow">→</span></a></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <!-- ── All products ── -->
+  <div class="section">
+    <div class="section-header">
+      <h2>All products</h2>
+    </div>
+    <div class="product-index">
+      <div class="pi-category">
+        <h4>Elastic Stack</h4>
+        <ul>
+          <li><a href="@Model.Link("/solutions/search")">Elasticsearch</a></li>
+          <li><a href="@Model.Link("/explore-analyze")">Kibana</a></li>
+          <li><a href="@Model.Link("/manage-data")">Logstash</a></li>
+          <li><a href="@Model.Link("/manage-data")">Beats</a></li>
+          <li><a href="@Model.Link("/explore-analyze")">Machine Learning</a></li>
+          <li><a href="@Model.Link("/manage-data")">Elasticsearch for Apache Hadoop &amp; Spark</a></li>
+        </ul>
+      </div>
+      <div class="pi-category">
+        <h4>Cloud &amp; orchestration</h4>
+        <ul>
+          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Serverless</a></li>
+          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Hosted</a></li>
+          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud on Kubernetes (ECK)</a></li>
+          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Enterprise (ECE)</a></li>
+          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud control (ecctl)</a></li>
+        </ul>
+      </div>
+      <div class="pi-category">
+        <h4>Ingest tools</h4>
+        <ul>
+          <li><a href="@Model.Link("/manage-data")">Integrations</a></li>
+          <li><a href="@Model.Link("/reference/opentelemetry/")">Elastic Distributions for OpenTelemetry</a></li>
+          <li><a href="@Model.Link("/manage-data")">Fleet &amp; Elastic Agent</a></li>
+          <li><a href="@Model.Link("/solutions/observability")">APM</a></li>
+          <li><a href="@Model.Link("/solutions/security")">Elastic Defend</a></li>
+          <li><a href="@Model.Link("/manage-data")">Elastic Serverless Forwarder for AWS</a></li>
+          <li><a href="@Model.Link("/manage-data")">Connectors</a></li>
+          <li><a href="@Model.Link("/manage-data")">Web crawler</a></li>
+        </ul>
+      </div>
+      <div class="pi-category">
+        <h4>Query languages</h4>
+        <ul>
+          <li><a href="@Model.Link("/reference/query-languages/")">Query DSL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">ES|QL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">KQL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">SQL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">EQL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">Lucene</a></li>
+        </ul>
+      </div>
+      <div class="pi-category">
+        <h4>APM agents</h4>
+        <ul>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Java Agent</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">&#46;NET Agent</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Node.js Agent</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Python Agent</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Ruby Agent</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Go Agent</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">PHP Agent</a></li>
+        </ul>
+      </div>
+      <div class="pi-category">
+        <h4>Developer tools &amp; standards</h4>
+        <ul>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Elasticsearch clients</a></li>
+          <li><a href="@Model.Link("/reference")">Elastic Common Schema (ECS)</a></li>
+          <li><a href="@Model.Link("/reference")">Search UI</a></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <!-- ── Footer ── -->
+  <footer class="landing-footer">
+    <span>© 2026 Elasticsearch B.V.</span>
+    <span><a href="@Model.Link("/contribute-docs")">Edit this page</a> · <a href="@Model.Link("/contribute-docs")">Report a docs issue</a></span>
+  </footer>
 
-	<section class="w-full">
-		<div class="container mx-auto pt-10 pb-20">
-			<div class="rounded-2xl overflow-hidden px-12 py-8 bg-blue-elastic bg-no-repeat bg-auto grid lg:grid-cols-[1fr_auto] gap-12 items-center text-center lg:text-left"
-			     style="background-image: url('@Model.Static("elasticon-bg-b.png")'); background-position: center 65%">
-				<div>
-					<h2 class="font-bold font-sans text-3xl text-white">Looking for more?</h2>
-					<p class="mt-2 text-white text-base">We'll show you how to solve toughest challenges with Search AI.
-						Join us at an Elastic{ON} event near you!</p>
-				</div>
-				<a href="https://www.elastic.co/events/elasticon" target="_blank" rel="noopener noreferrer"
-				   class="w-full cursor-pointer text-blue-elastic hover:text-blue-elastic-100 text-nowrap border-2 border-white hover:border-grey-20 bg-white hover:bg-grey-10 focus:ring-4 focus:outline-none focus:ring-blue-elastic-50 font-semibold font-sans rounded-sm px-6 py-2 text-center h-10 flex items-center justify-center min-w-40 max-w-md lg:max-w-none justify-self-center lg:justify-self-auto">
-					Register now
-				</a>
-			</div>
-		</div>
-	</section>
-	
 </div>

From e6c9ed648c70e6e04fc534993129b4245910a9c2 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 6 May 2026 10:57:36 +0200
Subject: [PATCH 135/226] Scope landing page styles to page content

Prevent the landing page prototype from leaking reset and link styles into the shared Elastic navigation chrome.

Co-authored-by: OpenAI GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Layout/_LandingPage.cshtml                | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Elastic.Markdown/Layout/_LandingPage.cshtml b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
index 4f45273501..165992c42e 100644
--- a/src/Elastic.Markdown/Layout/_LandingPage.cshtml
+++ b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
@@ -1,8 +1,8 @@
 @inherits RazorSlice<Elastic.Markdown.MarkdownLayoutViewModel>
 <style>
   /* ── Reset & Base ── */
-  *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
-  :root {
+  .landing-page, .landing-page * , .landing-page *::before, .landing-page *::after { box-sizing: border-box; }
+  .landing-page {
     --bg: #fafbfc;
     --surface: #ffffff;
     --surface-alt: #f3f5f7;
@@ -29,10 +29,14 @@
     --shadow-lg: 0 4px 20px rgba(0,0,0,0.10);
     --max-w: 1120px;
     --font: -apple-system, BlinkMacSystemFont, 'Inter', 'Segoe UI', sans-serif;
+    font-family: var(--font);
+    background: var(--bg);
+    color: var(--text);
+    line-height: 1.55;
+    -webkit-font-smoothing: antialiased;
   }
-  body { font-family: var(--font); background: var(--bg); color: var(--text); line-height: 1.55; -webkit-font-smoothing: antialiased; }
-  a { color: var(--accent); text-decoration: none; transition: color 0.15s; }
-  a:hover { color: var(--accent-hover); }
+  .landing-page a { color: var(--accent); text-decoration: none; transition: color 0.15s; }
+  .landing-page a:hover { color: var(--accent-hover); }
 
   /* ── Hero / Search ── */
   .hero {
@@ -57,7 +61,7 @@
     margin: 0 auto 16px;
     position: relative;
   }
-  .search-wrap svg {
+  .search-wrap > .search-icon {
     position: absolute;
     left: 16px;
     top: 50%;
@@ -370,7 +374,7 @@
   }
 </style>
 
-<div hx-select-oob="#main-container" hx-swap="none" class="w-full max-w-[100vw] relative overflow-x-hidden">
+<div hx-select-oob="#main-container" hx-swap="none" class="landing-page w-full max-w-[100vw] relative overflow-x-hidden">
 
   <!-- ── Version disambiguation ── -->
   <div class="version-banner">
@@ -394,7 +398,7 @@
     <h1>Elastic documentation</h1>
     <p>Find guides, API references, and tutorials for the Elastic Stack.</p>
     <div class="search-wrap">
-      <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="7"/><path d="M21 21l-4.35-4.35"/></svg>
+      <svg class="search-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="7"/><path d="M21 21l-4.35-4.35"/></svg>
       <navigation-search></navigation-search>
     </div>
   </div>

From 1d628e287d9bf69a5d8b0b1a61997c331157514d Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 6 May 2026 10:57:47 +0200
Subject: [PATCH 136/226] Scope landing page styles to page content

Prevent the landing page prototype from leaking reset and link styles into the shared Elastic navigation chrome.

Co-authored-by: OpenAI GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Layout/_LandingPage.cshtml                | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Elastic.Markdown/Layout/_LandingPage.cshtml b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
index 4f45273501..165992c42e 100644
--- a/src/Elastic.Markdown/Layout/_LandingPage.cshtml
+++ b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
@@ -1,8 +1,8 @@
 @inherits RazorSlice<Elastic.Markdown.MarkdownLayoutViewModel>
 <style>
   /* ── Reset & Base ── */
-  *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
-  :root {
+  .landing-page, .landing-page * , .landing-page *::before, .landing-page *::after { box-sizing: border-box; }
+  .landing-page {
     --bg: #fafbfc;
     --surface: #ffffff;
     --surface-alt: #f3f5f7;
@@ -29,10 +29,14 @@
     --shadow-lg: 0 4px 20px rgba(0,0,0,0.10);
     --max-w: 1120px;
     --font: -apple-system, BlinkMacSystemFont, 'Inter', 'Segoe UI', sans-serif;
+    font-family: var(--font);
+    background: var(--bg);
+    color: var(--text);
+    line-height: 1.55;
+    -webkit-font-smoothing: antialiased;
   }
-  body { font-family: var(--font); background: var(--bg); color: var(--text); line-height: 1.55; -webkit-font-smoothing: antialiased; }
-  a { color: var(--accent); text-decoration: none; transition: color 0.15s; }
-  a:hover { color: var(--accent-hover); }
+  .landing-page a { color: var(--accent); text-decoration: none; transition: color 0.15s; }
+  .landing-page a:hover { color: var(--accent-hover); }
 
   /* ── Hero / Search ── */
   .hero {
@@ -57,7 +61,7 @@
     margin: 0 auto 16px;
     position: relative;
   }
-  .search-wrap svg {
+  .search-wrap > .search-icon {
     position: absolute;
     left: 16px;
     top: 50%;
@@ -370,7 +374,7 @@
   }
 </style>
 
-<div hx-select-oob="#main-container" hx-swap="none" class="w-full max-w-[100vw] relative overflow-x-hidden">
+<div hx-select-oob="#main-container" hx-swap="none" class="landing-page w-full max-w-[100vw] relative overflow-x-hidden">
 
   <!-- ── Version disambiguation ── -->
   <div class="version-banner">
@@ -394,7 +398,7 @@
     <h1>Elastic documentation</h1>
     <p>Find guides, API references, and tutorials for the Elastic Stack.</p>
     <div class="search-wrap">
-      <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="7"/><path d="M21 21l-4.35-4.35"/></svg>
+      <svg class="search-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="7"/><path d="M21 21l-4.35-4.35"/></svg>
       <navigation-search></navigation-search>
     </div>
   </div>

From af3da7b890eb5a53f898e1a5f5791e1d8c54ee97 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 7 May 2026 10:38:39 +0200
Subject: [PATCH 137/226] Update top navigation order

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 config/navigation-v2.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 6dce230cac..b08a0ff54c 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -3285,6 +3285,16 @@ nav:
   #      - page: docs-content://troubleshoot/ingest/opentelemetry/index.md
   #        title: Troubleshoot EDOT
 
+  - section: Products
+    url: /products/
+    children:
+    - page: docs-content://products/index.md
+      title: Product hubs
+    - page: docs-content://products/kibana/v9.md
+      title: Kibana
+    - page: docs-content://products/elasticsearch/v9.md
+      title: Elasticsearch
+
   - section: APIs
     url: https://www.elastic.co/docs/api
 
@@ -3297,25 +3307,15 @@ nav:
     - island: Logstash versioned plugins
       toc: logstash-docs-md://vpr
 
-  - section: Troubleshoot
-    url: /troubleshoot/
-    children:
-    - toc: docs-content://troubleshoot
-
   - section: Release notes
     url: /release-notes/
     children:
     - toc: docs-content://release-notes/intro
 
-  - section: Product hubs
-    url: /products/
+  - section: Troubleshoot
+    url: /troubleshoot/
     children:
-    - page: docs-content://products/index.md
-      title: Product hubs
-    - page: docs-content://products/kibana/v9.md
-      title: Kibana
-    - page: docs-content://products/elasticsearch/v9.md
-      title: Elasticsearch
+    - toc: docs-content://troubleshoot
 
   - section: Extension points
     url: /extend/

From ef8b5a6449effdcadabd3975184ad32577b9c529 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 7 May 2026 10:58:41 +0200
Subject: [PATCH 138/226] Update top navigation order

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 config/navigation-v2.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 3f34a060e5..2e15013040 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -3297,16 +3297,16 @@ nav:
     - island: Logstash versioned plugins
       toc: logstash-docs-md://vpr
 
-  - section: Troubleshoot
-    url: /troubleshoot/
-    children:
-    - toc: docs-content://troubleshoot
-
   - section: Release notes
     url: /release-notes/
     children:
     - toc: docs-content://release-notes/intro
 
+  - section: Troubleshoot
+    url: /troubleshoot/
+    children:
+    - toc: docs-content://troubleshoot
+
   - section: Extension points
     url: /extend/
     isolated: true

From 588260f13f075b0bb5906d61bbbbfe356367832a Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Thu, 7 May 2026 10:58:47 +0200
Subject: [PATCH 139/226] Update top navigation order

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 config/navigation-v2.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 6dce230cac..b08a0ff54c 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -3285,6 +3285,16 @@ nav:
   #      - page: docs-content://troubleshoot/ingest/opentelemetry/index.md
   #        title: Troubleshoot EDOT
 
+  - section: Products
+    url: /products/
+    children:
+    - page: docs-content://products/index.md
+      title: Product hubs
+    - page: docs-content://products/kibana/v9.md
+      title: Kibana
+    - page: docs-content://products/elasticsearch/v9.md
+      title: Elasticsearch
+
   - section: APIs
     url: https://www.elastic.co/docs/api
 
@@ -3297,25 +3307,15 @@ nav:
     - island: Logstash versioned plugins
       toc: logstash-docs-md://vpr
 
-  - section: Troubleshoot
-    url: /troubleshoot/
-    children:
-    - toc: docs-content://troubleshoot
-
   - section: Release notes
     url: /release-notes/
     children:
     - toc: docs-content://release-notes/intro
 
-  - section: Product hubs
-    url: /products/
+  - section: Troubleshoot
+    url: /troubleshoot/
     children:
-    - page: docs-content://products/index.md
-      title: Product hubs
-    - page: docs-content://products/kibana/v9.md
-      title: Kibana
-    - page: docs-content://products/elasticsearch/v9.md
-      title: Elasticsearch
+    - toc: docs-content://troubleshoot
 
   - section: Extension points
     url: /extend/

From 3e262e4b3f3ad782ac1d84d343bacc68dc7b9e2e Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 7 May 2026 15:59:53 +0200
Subject: [PATCH 140/226] Subsection product hubs nav island into Stack
 products + Deployment runbooks

Group the Product hubs sidebar by category and surface upcoming products
as non-clickable stubs, matching the gist's prototype island. Uses the
existing nav-v2 grammar:

- '- label: <name>' creates a non-clickable section header
- '- title: <name>' creates a non-clickable leaf entry (used for stubs)

Stack products: Elasticsearch, Kibana (linked) + Logstash, Beats (soon).
Deployment runbooks: Cloud Hosted, Cloud Serverless, Self-managed (all soon).
---
 config/navigation-v2.yml | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index b08a0ff54c..83ce92fbd0 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -3285,16 +3285,6 @@ nav:
   #      - page: docs-content://troubleshoot/ingest/opentelemetry/index.md
   #        title: Troubleshoot EDOT
 
-  - section: Products
-    url: /products/
-    children:
-    - page: docs-content://products/index.md
-      title: Product hubs
-    - page: docs-content://products/kibana/v9.md
-      title: Kibana
-    - page: docs-content://products/elasticsearch/v9.md
-      title: Elasticsearch
-
   - section: APIs
     url: https://www.elastic.co/docs/api
 
@@ -3307,15 +3297,34 @@ nav:
     - island: Logstash versioned plugins
       toc: logstash-docs-md://vpr
 
+  - section: Troubleshoot
+    url: /troubleshoot/
+    children:
+    - toc: docs-content://troubleshoot
+
   - section: Release notes
     url: /release-notes/
     children:
     - toc: docs-content://release-notes/intro
 
-  - section: Troubleshoot
-    url: /troubleshoot/
+  - section: Product hubs
+    url: /products/
     children:
-    - toc: docs-content://troubleshoot
+    - page: docs-content://products/index.md
+      title: Product hubs
+    - label: Stack products
+      children:
+      - page: docs-content://products/elasticsearch/v9.md
+        title: Elasticsearch
+      - page: docs-content://products/kibana/v9.md
+        title: Kibana
+      - title: Logstash (soon)
+      - title: Beats (soon)
+    - label: Deployment runbooks
+      children:
+      - title: Elastic Cloud Hosted (soon)
+      - title: Elastic Cloud Serverless (soon)
+      - title: Self-managed (soon)
 
   - section: Extension points
     url: /extend/

From 17bbea5437c8eb79143b8f0b00852bd2c0d1023f Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Thu, 7 May 2026 17:15:54 +0200
Subject: [PATCH 141/226] Top-bar dropdown for sections + restore Products
 rename and reorder

Two related changes that go together:

1. Add a `dropdown: true` opt-in to V2 nav sections. When set, the
   secondary nav renders the section as a <details>/<summary> with a
   chevron, and the open panel lists the section's children grouped by
   `- label:` subsections. `- title:` items without a `page:` render as
   muted "soon" stubs. Affects:
   - SectionNavV2Item (parser) reads `dropdown:`.
   - SectionNavigationNode + NavigationSection thread the flag.
   - _SecondaryNav.cshtml renders the dropdown UI when set.
   - secondary-nav-dropdown.css covers the visual layer.

2. Restore commit 588260f1 ("Update top navigation order") that was
   silently reverted during an earlier rebase resolution. Section
   renamed Product hubs -> Products, moved to second position right
   after Guides. Release notes moved before Troubleshoot. Final order:
   Guides -> Products -> APIs -> Reference -> Release notes ->
   Troubleshoot -> Extension points.

Wires Products as the first user of the new dropdown so reviewers can
jump straight from the top bar to a specific product hub without going
through the /products/ landing page.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/navigation-v2.yml                      |  45 ++++----
 .../Toc/NavigationV2File.cs                   |   7 +-
 .../V2/NavigationSection.cs                   |   1 +
 .../V2/SectionNavigationNode.cs               |   5 +
 .../V2/SiteNavigationV2.cs                    |   6 +-
 .../Assets/secondary-nav-dropdown.css         | 102 ++++++++++++++++++
 .../Assets/styles.css                         |   1 +
 .../Layout/_SecondaryNav.cshtml               |  72 ++++++++++++-
 .../Navigation/GlobalNavigationHtmlWriter.cs  |   2 +-
 9 files changed, 213 insertions(+), 28 deletions(-)
 create mode 100644 src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 83ce92fbd0..1969f8185e 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -3285,6 +3285,26 @@ nav:
   #      - page: docs-content://troubleshoot/ingest/opentelemetry/index.md
   #        title: Troubleshoot EDOT
 
+  - section: Products
+    url: /products/
+    dropdown: true
+    children:
+    - page: docs-content://products/index.md
+      title: Product hubs
+    - label: Stack products
+      children:
+      - page: docs-content://products/elasticsearch/v9.md
+        title: Elasticsearch
+      - page: docs-content://products/kibana/v9.md
+        title: Kibana
+      - title: Logstash (soon)
+      - title: Beats (soon)
+    - label: Deployment runbooks
+      children:
+      - title: Elastic Cloud Hosted (soon)
+      - title: Elastic Cloud Serverless (soon)
+      - title: Self-managed (soon)
+
   - section: APIs
     url: https://www.elastic.co/docs/api
 
@@ -3297,34 +3317,15 @@ nav:
     - island: Logstash versioned plugins
       toc: logstash-docs-md://vpr
 
-  - section: Troubleshoot
-    url: /troubleshoot/
-    children:
-    - toc: docs-content://troubleshoot
-
   - section: Release notes
     url: /release-notes/
     children:
     - toc: docs-content://release-notes/intro
 
-  - section: Product hubs
-    url: /products/
+  - section: Troubleshoot
+    url: /troubleshoot/
     children:
-    - page: docs-content://products/index.md
-      title: Product hubs
-    - label: Stack products
-      children:
-      - page: docs-content://products/elasticsearch/v9.md
-        title: Elasticsearch
-      - page: docs-content://products/kibana/v9.md
-        title: Kibana
-      - title: Logstash (soon)
-      - title: Beats (soon)
-    - label: Deployment runbooks
-      children:
-      - title: Elastic Cloud Hosted (soon)
-      - title: Elastic Cloud Serverless (soon)
-      - title: Self-managed (soon)
+    - toc: docs-content://troubleshoot
 
   - section: Extension points
     url: /extend/
diff --git a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
index 71cbf85b70..ab85ff9cdd 100644
--- a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
+++ b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
@@ -36,6 +36,7 @@ public record SectionNavV2Item(
 	string Label,
 	string Url,
 	bool Isolated,
+	bool Dropdown,
 	IReadOnlyList<INavV2Item> Children
 ) : INavV2Item;
 
@@ -139,10 +140,14 @@ private static IReadOnlyList<INavV2Item> ReadItemList(IParser parser, ObjectDese
 				&& isoVal is string isoStr
 				&& bool.TryParse(isoStr, out var isoBool)
 				&& isoBool;
+			var dropdown = dict.TryGetValue("dropdown", out var ddVal)
+				&& ddVal is string ddStr
+				&& bool.TryParse(ddStr, out var ddBool)
+				&& ddBool;
 			var sectionChildren = dict.TryGetValue("children", out var sch) && sch is IReadOnlyList<INavV2Item> sChildList
 				? sChildList
 				: [];
-			return new SectionNavV2Item(sectionStr, sectionUrl, isolated, sectionChildren);
+			return new SectionNavV2Item(sectionStr, sectionUrl, isolated, dropdown, sectionChildren);
 		}
 
 		if (dict.TryGetValue("island", out var islandVal) && islandVal is string islandStr)
diff --git a/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs b/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
index b0ee805d19..467d61db13 100644
--- a/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
+++ b/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
@@ -13,6 +13,7 @@ public record NavigationSection(
 	string Label,
 	string Url,
 	bool Isolated,
+	bool Dropdown,
 	IReadOnlyList<INavigationItem> NavigationItems
 );
 
diff --git a/src/Elastic.Documentation.Navigation/V2/SectionNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/SectionNavigationNode.cs
index 2e0012bf75..eb6f37ec2d 100644
--- a/src/Elastic.Documentation.Navigation/V2/SectionNavigationNode.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SectionNavigationNode.cs
@@ -19,6 +19,7 @@ public SectionNavigationNode(
 		string label,
 		string url,
 		bool isolated,
+		bool dropdown,
 		IReadOnlyCollection<INavigationItem> children,
 		INodeNavigationItem<INavigationModel, INavigationItem>? parent
 	)
@@ -27,6 +28,7 @@ public SectionNavigationNode(
 		NavigationTitle = label;
 		Url = url;
 		Isolated = isolated;
+		Dropdown = dropdown;
 		NavigationItems = children;
 		Parent = parent;
 		NavigationRoot = parent?.NavigationRoot!;
@@ -36,6 +38,9 @@ public SectionNavigationNode(
 	/// <summary>Whether this section is excluded from the top bar and renders with a back arrow.</summary>
 	public bool Isolated { get; }
 
+	/// <summary>Whether the top-bar entry should render as a dropdown listing the section's children.</summary>
+	public bool Dropdown { get; }
+
 	/// <inheritdoc />
 	public string Id { get; }
 
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 7d9f1aa8ff..c07e24a304 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -86,7 +86,7 @@ public SiteNavigationV2(
 	private static IReadOnlyList<NavigationSection> BuildSections(IReadOnlyList<INavigationItem> items) =>
 		items
 			.OfType<SectionNavigationNode>()
-			.Select(s => new NavigationSection(s.Id, s.NavigationTitle, s.Url, s.Isolated, [.. s.NavigationItems]))
+			.Select(s => new NavigationSection(s.Id, s.NavigationTitle, s.Url, s.Isolated, s.Dropdown, [.. s.NavigationItems]))
 			.ToList();
 
 	private static IReadOnlyList<NavigationIsland> BuildIslands(IReadOnlyList<NavigationSection> sections)
@@ -402,9 +402,9 @@ private static SectionNavigationNode CreateSection(
 		string sitePrefix
 	)
 	{
-		var placeholder = new SectionNavigationNode(section.Label, section.Url, section.Isolated, [], parent);
+		var placeholder = new SectionNavigationNode(section.Label, section.Url, section.Isolated, section.Dropdown, [], parent);
 		var children = BuildV2Items(section.Children, nodes, placeholder, sitePrefix);
-		return new SectionNavigationNode(section.Label, section.Url, section.Isolated, children, parent);
+		return new SectionNavigationNode(section.Label, section.Url, section.Isolated, section.Dropdown, children, parent);
 	}
 
 	private static INavigationItem? CreateIsland(
diff --git a/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css b/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css
new file mode 100644
index 0000000000..ea82bd88da
--- /dev/null
+++ b/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css
@@ -0,0 +1,102 @@
+/*
+ * Top-bar section dropdown. Opt in by setting `dropdown: true` on a
+ * `- section:` entry in `navigation-v2.yml`. The section's own URL
+ * remains the link target on the summary's anchor; the chevron toggles
+ * a panel listing the section's children so users can jump straight
+ * to a child page without going through the section landing.
+ */
+
+@layer components {
+	.secondary-nav-dropdown {
+		display: inline-flex;
+		align-items: center;
+	}
+	.secondary-nav-dropdown summary {
+		list-style: none;
+	}
+	.secondary-nav-dropdown summary::-webkit-details-marker {
+		display: none;
+	}
+
+	.secondary-nav-dropdown-chevron {
+		flex-shrink: 0;
+		color: var(--color-grey-60);
+		transition: transform 0.15s ease;
+	}
+	.secondary-nav-dropdown[open] .secondary-nav-dropdown-chevron {
+		transform: rotate(180deg);
+	}
+
+	.secondary-nav-dropdown-menu {
+		position: absolute;
+		top: calc(100% + 4px);
+		left: 0;
+		min-width: 220px;
+		max-width: 320px;
+		z-index: 50;
+		display: flex;
+		flex-direction: column;
+		padding: 6px 0;
+		background: var(--color-white);
+		border: 1px solid var(--color-grey-20);
+		border-radius: 6px;
+		box-shadow: 0 8px 24px rgb(0 0 0 / 0.08);
+		font-weight: 500;
+	}
+
+	.secondary-nav-dropdown-group-label {
+		padding: 8px 14px 4px 14px;
+		font-size: 11px;
+		font-weight: 700;
+		letter-spacing: 0.06em;
+		text-transform: uppercase;
+		color: var(--color-grey-70);
+		user-select: none;
+	}
+	.secondary-nav-dropdown-group-label:not(:first-child) {
+		margin-top: 4px;
+		border-top: 1px solid var(--color-grey-15, var(--color-grey-20));
+		padding-top: 10px;
+	}
+
+	.secondary-nav-dropdown-link {
+		display: block;
+		padding: 6px 14px;
+		font-size: 14px;
+		color: var(--color-ink-dark) !important;
+		text-decoration: none !important;
+		transition: background-color 0.12s ease;
+	}
+	.secondary-nav-dropdown-link:hover {
+		background: var(--color-grey-10);
+		color: var(--color-blue-elastic) !important;
+	}
+
+	.secondary-nav-dropdown-stub {
+		display: inline-flex;
+		align-items: center;
+		gap: 6px;
+		padding: 6px 14px;
+		font-size: 14px;
+		color: var(--color-grey-60);
+		cursor: default;
+	}
+	.secondary-nav-dropdown-stub::after {
+		content: 'soon';
+		font-size: 10px;
+		font-weight: 700;
+		letter-spacing: 0.04em;
+		text-transform: uppercase;
+		padding: 2px 6px;
+		border-radius: 4px;
+		background: var(--color-grey-15, var(--color-grey-20));
+		color: var(--color-grey-70);
+	}
+
+	/* Close the menu when the user clicks outside is browser-default for
+	   <details>; just suppress the htmx-boost on summary clicks so the
+	   first click only toggles. */
+	.secondary-nav-dropdown summary a {
+		text-decoration: none;
+	}
+}
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 9a3843dda7..85c696851f 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -29,6 +29,7 @@
 @import './markdown/agent-skill.css';
 @import './markdown/hub.css';
 @import './markdown/metadata-box.css';
+@import './secondary-nav-dropdown.css';
 @import './markdown/contributors.css';
 @import './api-docs.css';
 @import 'tippy.js/dist/tippy.css';
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index 21ea826449..0f9dea550c 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -1,4 +1,6 @@
 @using System.Linq
+@using Elastic.Documentation.Navigation
+@using Elastic.Documentation.Navigation.V2
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
 <div class="md:sticky md:top-0 md:z-30 bg-grey-10">
 	<ask-ai></ask-ai>
@@ -12,12 +14,79 @@
 				{
 					var isAbsolute = navTab.Url.StartsWith("http", StringComparison.OrdinalIgnoreCase);
 					var isActive = !isAbsolute && navTab.Id == Model.ActiveSectionId;
-					<li class="text-nowrap @(isActive ? "text-blue-elastic" : "hover:text-blue-elastic active:text-blue-elastic-100")"
+					<li class="text-nowrap @(isActive ? "text-blue-elastic" : "hover:text-blue-elastic active:text-blue-elastic-100") @(navTab.Dropdown ? "secondary-nav-dropdown-host relative" : "")"
 						data-section-id="@navTab.Id">
 						@if (isAbsolute)
 						{
 							<a href="@navTab.Url" target="_blank" rel="noopener" class="inline-flex items-center gap-1">@navTab.Label<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-3 h-3 opacity-60" aria-hidden="true"><path d="M8.75 1a.75.75 0 0 0 0 1.5h3.69L6.72 8.22a.75.75 0 0 0 1.06 1.06l5.72-5.72v3.69a.75.75 0 0 0 1.5 0v-5.5a.75.75 0 0 0-.75-.75h-5.5Z"/><path d="M3.5 3A1.5 1.5 0 0 0 2 4.5v8A1.5 1.5 0 0 0 3.5 14h8a1.5 1.5 0 0 0 1.5-1.5V10a.75.75 0 0 0-1.5 0v2.5h-8v-8H6A.75.75 0 0 0 6 3H3.5Z"/></svg></a>
 						}
+						else if (navTab.Dropdown)
+						{
+							<details class="secondary-nav-dropdown">
+								<summary class="inline-flex items-center gap-1 cursor-pointer select-none">
+									<a
+										href="@Model.Link(navTab.Url)"
+										@Model.Htmx.GetHxAttributes(
+											hxSwapOob: "#main-container,#secondary-nav"
+										)
+									>
+										@navTab.Label
+									</a>
+									<svg width="11" height="11" viewBox="0 0 16 16" fill="none" aria-hidden="true" class="secondary-nav-dropdown-chevron">
+										<path d="M4 6l4 4 4-4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+									</svg>
+								</summary>
+								<div class="secondary-nav-dropdown-menu">
+									@foreach (var child in navTab.NavigationItems)
+									{
+										var childUrl = child.Url;
+										var childTitle = child.NavigationTitle;
+										var childItems = child is INodeNavigationItem<INavigationModel, INavigationItem> nn ? nn.NavigationItems : null;
+										var isHidden = child is ILeafNavigationItem<INavigationModel> hl && hl.Hidden;
+
+										if (isHidden)
+										{
+											// Section index leaf is already linked from the summary; skip.
+											continue;
+										}
+										if (childItems is { Count: > 0 })
+										{
+											<div class="secondary-nav-dropdown-group-label">@childTitle</div>
+											foreach (var grandchild in childItems)
+											{
+												var gcUrl = grandchild.Url;
+												var gcTitle = grandchild.NavigationTitle;
+												var gcHasChildren = grandchild is INodeNavigationItem<INavigationModel, INavigationItem> gn && gn.NavigationItems.Count > 0;
+												if (!gcHasChildren && string.IsNullOrEmpty(gcUrl))
+												{
+													<span class="secondary-nav-dropdown-stub">@gcTitle</span>
+												}
+												else if (!string.IsNullOrEmpty(gcUrl))
+												{
+													<a class="secondary-nav-dropdown-link"
+														href="@gcUrl"
+														@Model.Htmx.GetHxAttributes(hxSwapOob: "#main-container,#secondary-nav")>
+														@gcTitle
+													</a>
+												}
+											}
+										}
+										else if (!string.IsNullOrEmpty(childUrl))
+										{
+											<a class="secondary-nav-dropdown-link"
+												href="@childUrl"
+												@Model.Htmx.GetHxAttributes(hxSwapOob: "#main-container,#secondary-nav")>
+												@childTitle
+											</a>
+										}
+										else
+										{
+											<span class="secondary-nav-dropdown-stub">@childTitle</span>
+										}
+									}
+								</div>
+							</details>
+						}
 						else
 						{
 							<a
@@ -62,3 +131,4 @@
 		</div>
 	</nav>
 </div>
+
diff --git a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
index 1f93a310ff..caef5c711d 100644
--- a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -141,7 +141,7 @@ Cancel ctx
 			_logger.LogInformation("Rendering V2 island navigation: {IslandLabel} ({IslandId})", island.Label, island.Id);
 
 			var wrapper = new SectionNavigationV2Wrapper(
-				new NavigationSection(island.Id, island.Label, "", false, island.NavigationItems),
+				new NavigationSection(island.Id, island.Label, "", false, false, island.NavigationItems),
 				navV2
 			);
 			var model = new NavigationViewModel

From deb195c74b39521fc81f439d86ffea495e69722f Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri-Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 8 May 2026 09:26:31 +0200
Subject: [PATCH 142/226] Wire most of nav v1 content into nav v2 (#3268)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Wire most of nav v1 content into nav v2

Closes 93% of the gap between nav v1 (config/navigation.yml + .artifacts
toc.yml graph) and nav v2 (config/navigation-v2.yml): 2,733 → 181 missing
pages.

- Re-enabled the commented Reference block (~1,222 pages: elasticsearch,
  kibana, cloud, ECS, search-ui, ECCTL, plus aggregations, query-languages,
  scripting, enrich-processor, text-analysis).
- Ported the per-product release notes tree from v1 (~126 pages: cloud
  hosted/enterprise, cloud-on-k8s, all APM agents, all EDOT SDKs, beats,
  logstash, elastic-agent, fleet-server, ECS, ECCTL, security, observability,
  serverless).
- Added per-product reference tocs grouped by family (~777 pages: ES clients,
  APM, OpenTelemetry/EDOT, ECS Logging) plus elasticsearch-plugins and
  community-contributed.
- Wired children of 12 deploy-manage landings (security, users-roles,
  monitor, tools, remote-clusters, upgrade, cloud-organization, maintenance,
  api-keys, autoscaling, license, uninstall) using hand-listed children to
  preserve the curated v2 group titles (~369 pages).
- Removed the dead Troubleshoot comment block (already covered by
  - toc: docs-content://troubleshoot).
- Brought in Liam's Search and query rewrite from PR #3094.

Co-Authored-By: Liam Thompson <leemthompo@gmail.com>
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* Wire missing observability pages into nav v2

Adds the 10 observability pages that v1 surfaces but v2 was missing,
slotted next to their existing siblings to preserve v2's curated order:

- APM > View and analyze data: discover-traces.md (between Drill down into
  data and Filter and search data, mirroring v1).
- OpenTelemetry use cases: llms/index.md as a sibling of Kubernetes
  observability under Get started.
- Streams > Process documents: concat, join, lowercase, uppercase, trim,
  redact, network-direction processors (appended after existing string-op
  processors, before manual-pipeline-configuration).
- Streams: streamlang.md as a sibling of Process documents.

Also fixes a counting bug in the offline diff script — it now honors the
`folder:` keyword in toc.yml, which removed ~75 false-positive "missing"
pages caused by treating apm-server filenames as living at solutions/ root.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* Wire Production guidance children into nav v2

Per Shaina, the remaining Deploy and manage misses sit under the two
existing production-guidance landings. Converts those flat entries into
groups and lists their canonical children from v1's deploy-manage toc:

- Run Elasticsearch in production
  - Design for resilience (3 children: small clusters, larger clusters,
    ECH and ECE)
  - Scaling considerations
  - Performance optimizations (6 children: general recommendations,
    indexing speed, search speed, approximate kNN, disk usage, size shards)
- Run Kibana in production
  - High availability and load balancing, configure memory, manage
    background tasks, traffic scaling, alerting, reporting (6 children)

18 pages recovered. Gap: 151 → 133.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* Wire remaining D&M, ingest architectures, and Contribute island

Closes the rest of the actionable gap (133 → 68; the 50 remaining are
explore-analyze pages intentionally left for separate IA work):

- Distributed architecture: converts three flat entries into groups with
  canonical children — clusters-nodes-shards (node-roles),
  shard-allocation-relocation-recovery (shard-allocation-awareness +
  index-level-shard-allocation with delaying-allocation-when-node-leaves),
  and discovery-cluster-formation (6 children: hosts-providers, quorums,
  voting, bootstrap-cluster, cluster-state, cluster-fault-detection).
- Deploy orchestrators: adds deploy-an-orchestrator.md as a peer page
  under Elastic Cloud Enterprise, and as the landing of the existing
  "Deploy an orchestrator" group under Elastic Cloud on Kubernetes
  (with install.md demoted to first child to match v1 hierarchy).
- Ingest architectures: converts the leaf entry into a group with the
  canonical 16 children grouped by architecture (Agent to Elasticsearch,
  Agent with Logstash, Agent with Kafka, Air-gapped, Logstash as input,
  Agent through a proxy). Sets ingesting-data-for-elastic-solutions.md
  as the "Ingest by solution" group landing. Surfaces tools.md alongside
  the existing API/upload entries.
- Contribute: new isolated section pulling docs-content://contribute-docs
  via toc, mirroring the Extension points pattern. Surfaces all 35
  contribute-docs pages (api-docs, content-types, how-to, style-guide,
  plus the standalone guides) without disturbing the main top-bar layout.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* Disable contribute-docs island pending decision

Comments out the new isolated Contribute section we added in the previous
commit. Whether to surface contribute-docs in the public site is still
open, so keep the entry as a ready-to-uncomment block rather than a
shipped section. The toc graph is unchanged; only the v2 surface is.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fixes

* Replace remaining {{templated}} group labels in nav titles

Eight `- group:` labels still contained `{{...}}` substitutions after
Shaina's fix pass — `{{apm-server}}` (2), `{{aws}}` (2), and
`{{elastic-defend}}` (4). The nav-v2 renderer does not expand these,
so they showed up literally in the sidebar. Replaced with their
canonical expansions per docs-content/docset.yml::features:
- {{apm-server}} -> APM Server
- {{aws}} -> AWS
- {{elastic-defend}} -> Elastic Defend

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Liam Thompson <leemthompo@gmail.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: shainaraskas <shaina.raskas@elastic.co>
---
 config/navigation-v2.yml | 1549 +++++++++++++++++++++++++++++++++-----
 1 file changed, 1349 insertions(+), 200 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index b08a0ff54c..fcb03bc4f8 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -32,16 +32,40 @@ nav:
         - group: Distributed architecture
           page: docs-content://deploy-manage/distributed-architecture.md
           children:
-          - page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards.md
-            title: Clusters, nodes, and shards
+          - group: Clusters, nodes, and shards
+            page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards.md
+            children:
+            - page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards/node-roles.md
+              title: Node roles
           - page: docs-content://deploy-manage/distributed-architecture/reading-and-writing-documents.md
             title: Reading and writing documents
-          - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md
-            title: Shard allocation, relocation, and recovery
+          - group: Shard allocation, relocation, and recovery
+            page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md
+            children:
+            - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/shard-allocation-awareness.md
+              title: Shard allocation awareness
+            - group: Index-level shard allocation filtering
+              page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/index-level-shard-allocation.md
+              children:
+              - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/delaying-allocation-when-node-leaves.md
+                title: Delaying allocation when a node leaves
           - page: docs-content://deploy-manage/distributed-architecture/shard-request-cache.md
             title: The shard request cache
-          - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation.md
-            title: Discovery and cluster formation
+          - group: Discovery and cluster formation
+            page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation.md
+            children:
+            - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/discovery-hosts-providers.md
+              title: Discovery hosts providers
+            - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-quorums.md
+              title: Quorum-based decision making
+            - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-voting.md
+              title: Voting configurations
+            - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-bootstrap-cluster.md
+              title: Bootstrapping a cluster
+            - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-state-overview.md
+              title: Cluster state
+            - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-fault-detection.md
+              title: Cluster fault detection
           - page: docs-content://deploy-manage/distributed-architecture/kibana-tasks-management.md
             title: Kibana task management
         - group: Plan your install
@@ -63,10 +87,50 @@ nav:
           - group: Production guidance
             page: docs-content://deploy-manage/production-guidance.md
             children:
-            - page: docs-content://deploy-manage/production-guidance/elasticsearch-in-production-environments.md
-              title: Run Elasticsearch in production
-            - page: docs-content://deploy-manage/production-guidance/kibana-in-production-environments.md
-              title: Run Kibana in production
+            - group: Run Elasticsearch in production
+              page: docs-content://deploy-manage/production-guidance/elasticsearch-in-production-environments.md
+              children:
+              - group: Design for resilience
+                page: docs-content://deploy-manage/production-guidance/availability-and-resilience.md
+                children:
+                - page: docs-content://deploy-manage/production-guidance/availability-and-resilience/resilience-in-small-clusters.md
+                  title: Resilience in small clusters
+                - page: docs-content://deploy-manage/production-guidance/availability-and-resilience/resilience-in-larger-clusters.md
+                  title: Resilience in larger clusters
+                - page: docs-content://deploy-manage/production-guidance/availability-and-resilience/resilience-in-ech.md
+                  title: Resilience in ECH and ECE
+              - page: docs-content://deploy-manage/production-guidance/scaling-considerations.md
+                title: Scaling considerations
+              - group: Performance optimizations
+                page: docs-content://deploy-manage/production-guidance/optimize-performance.md
+                children:
+                - page: docs-content://deploy-manage/production-guidance/general-recommendations.md
+                  title: General recommendations
+                - page: docs-content://deploy-manage/production-guidance/optimize-performance/indexing-speed.md
+                  title: Tune for indexing speed
+                - page: docs-content://deploy-manage/production-guidance/optimize-performance/search-speed.md
+                  title: Tune for search speed
+                - page: docs-content://deploy-manage/production-guidance/optimize-performance/approximate-knn-search.md
+                  title: Tune approximate kNN search
+                - page: docs-content://deploy-manage/production-guidance/optimize-performance/disk-usage.md
+                  title: Tune for disk usage
+                - page: docs-content://deploy-manage/production-guidance/optimize-performance/size-shards.md
+                  title: Size your shards
+            - group: Run Kibana in production
+              page: docs-content://deploy-manage/production-guidance/kibana-in-production-environments.md
+              children:
+              - page: docs-content://deploy-manage/production-guidance/kibana-load-balance-traffic.md
+                title: High availability and load balancing
+              - page: docs-content://deploy-manage/production-guidance/kibana-configure-memory.md
+                title: Configure memory
+              - page: docs-content://deploy-manage/production-guidance/kibana-task-manager-scaling-considerations.md
+                title: Manage background tasks
+              - page: docs-content://deploy-manage/production-guidance/kibana-traffic-scaling-considerations.md
+                title: Traffic scaling considerations
+              - page: docs-content://deploy-manage/production-guidance/kibana-alerting-production-considerations.md
+                title: Optimize alerting performance
+              - page: docs-content://deploy-manage/production-guidance/kibana-reporting-production-considerations.md
+                title: Reporting production considerations
         - group: Install and deploy Elasticsearch
           page: docs-content://deploy-manage/deploy.md
           children:
@@ -697,26 +761,718 @@ nav:
           - label: ───
           - group: Security and encryption
             page: docs-content://deploy-manage/security.md
+            children:
+            - page: docs-content://deploy-manage/security/secure-hosting-environment.md
+              title: "Secure your orchestrator"
+              children:
+              - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation.md
+                title: "Elastic Cloud Enterprise"
+                children:
+                - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/manage-security-certificates.md
+                  title: "Manage security certificates"
+                - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/allow-x509-certificates-signed-with-sha-1.md
+                  title: "Allow X.509 certificates signed with SHA-1"
+                - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/configure-tls-version.md
+                  title: "Configure the TLS version"
+                - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/migrate-ece-on-podman-hosts-to-selinux-enforce.md
+                  title: "Migrate ECE on Podman hosts to SELinux enforce"
+              - page: docs-content://deploy-manage/security/secure-your-eck-installation.md
+                title: "Elastic Cloud on Kubernetes"
+            - page: docs-content://deploy-manage/security/secure-your-cluster-deployment.md
+              title: "Secure your cluster, deployment, or project"
+              children:
+              - page: docs-content://deploy-manage/security/self-setup.md
+                title: "Self-managed security setup"
+                children:
+                - page: docs-content://deploy-manage/security/self-auto-setup.md
+                  title: "Automatic security setup"
+                - page: docs-content://deploy-manage/security/set-up-minimal-security.md
+                  title: "Minimal security setup"
+                - page: docs-content://deploy-manage/security/set-up-basic-security.md
+                  title: "Set up transport TLS"
+                - page: docs-content://deploy-manage/security/set-up-basic-security-plus-https.md
+                  title: "Set up HTTPS"
+                - page: docs-content://deploy-manage/security/using-kibana-with-security.md
+                  title: "Configure security in Kibana"
+              - page: docs-content://deploy-manage/security/secure-cluster-communications.md
+                title: "Manage TLS encryption"
+                children:
+                - page: docs-content://deploy-manage/security/self-tls.md
+                  title: "Self-managed"
+                  children:
+                  - page: docs-content://deploy-manage/security/updating-certificates.md
+                    title: "Update TLS certificates"
+                    children:
+                    - page: docs-content://deploy-manage/security/same-ca.md
+                      title: "With the same CA"
+                    - page: docs-content://deploy-manage/security/different-ca.md
+                      title: "With a different CA"
+                  - page: docs-content://deploy-manage/security/kibana-es-mutual-tls.md
+                    title: "Mutual authentication"
+                  - page: docs-content://deploy-manage/security/supported-ssltls-versions-by-jdk-version.md
+                    title: "Supported SSL/TLS versions by JDK version"
+                  - page: docs-content://deploy-manage/security/enabling-cipher-suites-for-stronger-encryption.md
+                    title: "Enabling cipher suites for stronger encryption"
+                - page: docs-content://deploy-manage/security/eck-tls.md
+                  title: "ECK"
+                  children:
+                  - page: docs-content://deploy-manage/security/k8s-https-settings.md
+                    title: "Manage HTTP certificates on ECK"
+                  - page: docs-content://deploy-manage/security/k8s-transport-settings.md
+                    title: Manage transport certificates on ECK
+                  - page: docs-content://deploy-manage/security/k8s-es-client-certificate-auth.md
+                    title: "Client certificate authentication"
+                - page: docs-content://deploy-manage/security/external-ca-transport.md
+                  title: "External CA for TLS"
+              - page: docs-content://deploy-manage/security/network-security.md
+                title: "Network security"
+                children:
+                - page: docs-content://deploy-manage/security/network-security-policies.md
+                  title: "How network security policies work in Cloud"
+                - page: docs-content://deploy-manage/security/ece-filter-rules.md
+                  title: "How IP filtering rules work in ECE"
+                - page: docs-content://deploy-manage/security/ip-filtering.md
+                  title: "Add IP filters"
+                  children:
+                  - page: docs-content://deploy-manage/security/ip-filtering-cloud.md
+                    title: "In ECH or Serverless"
+                  - page: docs-content://deploy-manage/security/ip-filtering-ece.md
+                    title: "In ECE"
+                  - page: docs-content://deploy-manage/security/ip-filtering-basic.md
+                    title: "In ECK and Self Managed"
+                - page: docs-content://deploy-manage/security/remote-cluster-filtering.md
+                  title: "Remote cluster filters"
+                - page: docs-content://deploy-manage/security/private-connectivity.md
+                  title: "Private connectivity"
+                  children:
+                  - page: docs-content://deploy-manage/security/private-connectivity-aws.md
+                    title: "AWS PrivateLink"
+                  - page: docs-content://deploy-manage/security/private-connectivity-azure.md
+                    title: "Azure Private Link"
+                  - page: docs-content://deploy-manage/security/private-connectivity-gcp.md
+                    title: "GCP Private Service Connect"
+                  - page: docs-content://deploy-manage/security/claim-private-connection-api.md
+                    title: "Claim private connection ownership"
+                - page: docs-content://deploy-manage/security/network-security-api.md
+                  title: "Through the API"
+                - page: docs-content://deploy-manage/security/k8s-network-policies.md
+                  title: "Kubernetes network policies"
+              - page: docs-content://deploy-manage/security/elastic-cloud-static-ips.md
+                title: "Elastic Cloud static IPs"
+              - page: docs-content://deploy-manage/security/kibana-session-management.md
+                title: "Kibana session management"
+              - page: docs-content://deploy-manage/security/data-security.md
+                title: "Encrypt your deployment data"
+                children:
+                - page: docs-content://deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md
+                  title: "Use a customer-managed encryption key"
+              - page: docs-content://deploy-manage/security/secure-settings.md
+                title: "Secure your settings"
+                children:
+                - page: docs-content://deploy-manage/security/k8s-secure-settings.md
+                  title: "Secure settings on ECK"
+              - page: docs-content://deploy-manage/security/secure-saved-objects.md
+                title: "Secure Kibana saved objects"
+              - page: docs-content://deploy-manage/security/logging-configuration/security-event-audit-logging.md
+                title: "Security event audit logging"
+                children:
+                - page: docs-content://deploy-manage/security/logging-configuration/enabling-audit-logs.md
+                  title: "Enable audit logging"
+                - page: docs-content://deploy-manage/security/logging-configuration/configuring-audit-logs.md
+                  title: Configure audit logging
+                  children:
+                  - page: docs-content://deploy-manage/security/logging-configuration/logfile-audit-events-ignore-policies.md
+                    title: "Elasticsearch audit events ignore policies"
+                  - page: docs-content://deploy-manage/security/logging-configuration/logfile-audit-output.md
+                    title: "Elasticsearch logfile output"
+                - page: docs-content://deploy-manage/security/logging-configuration/auditing-search-queries.md
+                  title: Audit Elasticsearch search queries
+                - page: docs-content://deploy-manage/security/logging-configuration/correlating-kibana-elasticsearch-audit-logs.md
+                  title: "Correlate audit events"
+            - page: docs-content://deploy-manage/security/secure-clients-integrations.md
+              title: Secure other Elastic Stack components
+            - page: docs-content://deploy-manage/security/httprest-clients-security.md
+              title: Securing HTTP client applications
+            - page: docs-content://deploy-manage/security/limitations.md
+              title: "Limitations"
+            - page: docs-content://deploy-manage/security/fips.md
+              title: FIPS compliance
+              children:
+              - page: docs-content://deploy-manage/security/fips-es.md
+                title: FIPS compliance for Elasticsearch
+              - page: docs-content://deploy-manage/security/fips-kib.md
+                title: FIPS compliance for Kibana
+              - page: docs-content://deploy-manage/security/fips-ingest.md
+                title: FIPS mode for Ingest tools
           - group: Authentication and authorization
             page: docs-content://deploy-manage/users-roles.md
+            children:
+            - page: docs-content://deploy-manage/users-roles/cloud-organization.md
+              title: "Cloud organization"
+              children:
+              - page: docs-content://deploy-manage/users-roles/cloud-organization/manage-users.md
+                title: Manage users
+              - page: docs-content://deploy-manage/users-roles/cloud-organization/user-roles.md
+                title: User roles and privileges
+              - page: docs-content://deploy-manage/users-roles/cloud-organization/configure-saml-authentication.md
+                title: "Configure SAML SSO"
+                children:
+                - page: docs-content://deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-okta.md
+                  title: "Okta"
+                - page: docs-content://deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-microsoft-entra-id.md
+                  title: "Microsoft Entra ID"
+            - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator.md
+              title: "ECE orchestrator"
+              children:
+              - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-system-passwords.md
+                title: Manage system passwords
+              - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-users-roles.md
+                title: Manage users and roles
+                children:
+                - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/native-user-authentication.md
+                  title: Native users
+                - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/active-directory.md
+                  title: Active Directory
+                - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/ldap.md
+                  title: LDAP
+                - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/saml.md
+                  title: SAML
+              - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/configure-sso-for-deployments.md
+                title: Configure SSO for deployments
+            - page: docs-content://deploy-manage/users-roles/serverless-custom-roles.md
+              title: Serverless project custom roles
+            - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth.md
+              title: "Cluster or deployment"
+              children:
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/quickstart.md
+                title: "Quickstart"
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/user-authentication.md
+                title: User authentication
+                children:
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/authentication-realms.md
+                  title: Authentication realms
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/realm-chains.md
+                    title: Realm chains
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/security-domains.md
+                    title: Security domains
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/internal-authentication.md
+                  title: Internal authentication
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/native.md
+                    title: "Native"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/file-based.md
+                    title: "File-based"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/external-authentication.md
+                  title: External authentication
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/active-directory.md
+                    title: "Active Directory"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/jwt.md
+                    title: "JWT"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md
+                    title: "Kerberos"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/ldap.md
+                    title: "LDAP"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/openid-connect.md
+                    title: "OpenID Connect"
+                    children:
+                    - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/oidc-examples.md
+                      title: "With Azure, Google, or Okta"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/saml.md
+                    title: "SAML"
+                    children:
+                    - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/saml-entra.md
+                      title: "With Microsoft Entra ID"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/pki.md
+                    title: PKI
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/custom.md
+                    title: Custom realms
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/built-in-users.md
+                  title: "Built-in users"
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/built-in-sm.md
+                    title: "Change passwords"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/orchestrator-managed-users-overview.md
+                  title: "Orchestrator-managed users"
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/manage-elastic-user-cloud.md
+                    title: "ECH and ECE"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/managed-credentials-eck.md
+                    title: "ECK managed credentials"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kibana-authentication.md
+                  title: "Kibana authentication"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/access-agreement.md
+                  title: Kibana access agreement
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/anonymous-access.md
+                  title: Anonymous access
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/token-based-authentication-services.md
+                  title: Token-based authentication services
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/service-accounts.md
+                  title: Service accounts
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/internal-users.md
+                  title: Internal users
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges.md
+                  title: Operator privileges
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/configure-operator-privileges.md
+                    title: Configure operator privileges
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/operator-only-functionality.md
+                    title: Operator-only functionality
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges-for-snapshot-restore.md
+                    title: Operator privileges for snapshot and restore
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/user-profiles.md
+                  title: User profiles
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/looking-up-users-without-authentication.md
+                  title: Looking up users without authentication
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/controlling-user-cache.md
+                  title: Controlling the user cache
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/manage-authentication-for-multiple-clusters.md
+                  title: Manage authentication for multiple clusters
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/user-roles.md
+                title: User roles
+                children:
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/defining-roles.md
+                  title: Defining roles
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/role-structure.md
+                    title: Role structure
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/granting-privileges-for-data-streams-aliases.md
+                    title: "For data streams and aliases"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kibana-role-management.md
+                    title: "Using Kibana"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/role-restriction.md
+                    title: Role restriction
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kibana-privileges.md
+                  title: Kibana privileges
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/mapping-users-groups-to-roles.md
+                  title: "Map users and groups to roles"
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/role-mapping-resources.md
+                    title: "Role mapping properties"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/authorization-delegation.md
+                  title: Authorization delegation
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/authorization-plugins.md
+                  title: Authorization plugins
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/controlling-access-at-document-field-level.md
+                  title: "Control access at the document and field level"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/submitting-requests-on-behalf-of-other-users.md
+                  title: "Submit requests on behalf of other users"
           - group: API keys
             page: docs-content://deploy-manage/api-keys.md
+            children:
+            - page: docs-content://deploy-manage/api-keys/elasticsearch-api-keys.md
+              title: Elasticsearch API keys
+            - page: docs-content://deploy-manage/api-keys/serverless-project-api-keys.md
+              title: Serverless project API keys
+            - page: docs-content://deploy-manage/api-keys/elastic-cloud-api-keys.md
+              title: Elastic Cloud API keys
+            - page: docs-content://deploy-manage/api-keys/elastic-cloud-enterprise-api-keys.md
+              title: Elastic Cloud Enterprise API keys
           - group: Spaces
             page: docs-content://deploy-manage/manage-spaces.md
           - group: Monitoring
             page: docs-content://deploy-manage/monitor.md
+            children:
+            - page: docs-content://deploy-manage/monitor/autoops.md
+              title: AutoOps
+              children:
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-how-to-access.md
+                title: "For Elastic Cloud Hosted"
+              - page: docs-content://deploy-manage/monitor/autoops/autoops-for-serverless.md
+                title: "For Elastic Cloud Serverless"
+                children:
+                - page: docs-content://deploy-manage/monitor/autoops/access-autoops-for-serverless.md
+                  title: "Access AutoOps in your project"
+                - page: docs-content://deploy-manage/monitor/autoops/search-tier-view-autoops-serverless.md
+                  title: "Search Tier view"
+                - page: docs-content://deploy-manage/monitor/autoops/indexing-tier-view-autoops-serverless.md
+                  title: "Indexing Tier view"
+                - page: docs-content://deploy-manage/monitor/autoops/search-ai-lake-view-autoops-serverless.md
+                  title: "Search AI Lake view"
+              - page: docs-content://deploy-manage/monitor/autoops/cc-autoops-as-cloud-connected.md
+                title: "For ECE, ECK, and self-managed clusters"
+                children:
+                - page: docs-content://deploy-manage/monitor/autoops/cc-connect-self-managed-to-autoops.md
+                  title: "Connect your cluster"
+                - page: docs-content://deploy-manage/monitor/autoops/cc-connect-local-dev-to-autoops.md
+                  title: "Connect your local development cluster"
+                - page: docs-content://deploy-manage/monitor/autoops/autoops-sm-custom-certification.md
+                  title: "Configure Elastic agent with custom certificate"
+                - page: docs-content://deploy-manage/monitor/autoops/autoops-disable-metrics-collection.md
+                  title: "Disable certain types of data collection"
+                - page: docs-content://deploy-manage/monitor/autoops/cc-manage-users.md
+                  title: "Manage connected cluster users"
+                - page: docs-content://deploy-manage/monitor/autoops/cc-cloud-connect-autoops-troubleshooting.md
+                  title: "Troubleshooting"
+                  children:
+                  - page: docs-content://deploy-manage/monitor/autoops/autoops-connectivity-check.md
+                    title: "Run the Connectivity Check"
+                  - page: docs-content://deploy-manage/monitor/autoops/autoops-sm-troubleshoot-firewalls.md
+                    title: "Firewalls blocking Elastic Agent"
+                  - page: docs-content://deploy-manage/monitor/autoops/autoops-sm-troubleshoot-eck-no-clusters.md
+                    title: "Connected clusters not appearing with ECK"
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-regions.md
+                title: "Regions"
+              - page: docs-content://deploy-manage/monitor/autoops/views.md
+                title: "Views"
+                children:
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-overview-view.md
+                  title: "Overview"
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-deployment-view.md
+                  title: "Deployment or Cluster"
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-nodes-view.md
+                  title: "Nodes"
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-index-view.md
+                  title: "Indices"
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-shards-view.md
+                  title: "Shards"
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-template-optimizer.md
+                  title: "Template Optimizer"
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-events.md
+                title: "Events"
+                children:
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-event-settings.md
+                  title: Event Settings
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-notifications-settings.md
+                  title: Notifications Settings
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-faq.md
+                title: "FAQ"
+            - page: docs-content://deploy-manage/monitor/stack-monitoring.md
+              title: Stack monitoring
+              children:
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/ece-ech-stack-monitoring.md
+                title: "Enable on ECH and ECE"
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/eck-stack-monitoring.md
+                title: "Enable on ECK"
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/elasticsearch-monitoring-self-managed.md
+                title: "Self-managed: Elasticsearch"
+                children:
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-elastic-agent.md
+                  title: "Collecting monitoring data with Elastic Agent"
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-metricbeat.md
+                  title: "Collecting monitoring data with Metricbeat"
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/collecting-log-data-with-filebeat.md
+                  title: "Collecting log data with Filebeat"
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/es-self-monitoring-prod.md
+                  title: Monitoring in a production environment
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/es-legacy-collection-methods.md
+                  title: "Legacy collection methods"
+                  children:
+                  - page: docs-content://deploy-manage/monitor/stack-monitoring/es-monitoring-collectors.md
+                    title: Collectors
+                  - page: docs-content://deploy-manage/monitor/stack-monitoring/es-monitoring-exporters.md
+                    title: Exporters
+                  - page: docs-content://deploy-manage/monitor/stack-monitoring/es-local-exporter.md
+                    title: Local exporters
+                  - page: docs-content://deploy-manage/monitor/stack-monitoring/es-http-exporter.md
+                    title: HTTP exporters
+                  - page: docs-content://deploy-manage/monitor/stack-monitoring/es-pause-export.md
+                    title: Pausing data collection
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-self-managed.md
+                title: "Self-managed: Kibana"
+                children:
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-elastic-agent.md
+                  title: "Collect monitoring data with Elastic Agent"
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-metricbeat.md
+                  title: "Collect monitoring data with Metricbeat"
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-legacy.md
+                  title: "Legacy collection methods"
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
+                title: Access monitoring data in Kibana
+              - page: docs-content://deploy-manage/monitor/monitoring-data/visualizing-monitoring-data.md
+                title: Visualizing monitoring data
+                children:
+                - page: docs-content://deploy-manage/monitor/monitoring-data/beats-page.md
+                  title: Beats metrics
+                - page: docs-content://deploy-manage/monitor/monitoring-data/elasticsearch-metrics.md
+                  title: Elasticsearch metrics
+                - page: docs-content://deploy-manage/monitor/monitoring-data/kibana-page.md
+                  title: Kibana metrics
+                - page: docs-content://deploy-manage/monitor/monitoring-data/integrations-server-page.md
+                  title: Integrations Server metrics
+                - page: docs-content://deploy-manage/monitor/monitoring-data/logstash-page.md
+                  title: Logstash metrics
+                - page: docs-content://deploy-manage/monitor/monitoring-data/monitor-troubleshooting.md
+                  title: "Troubleshooting"
+              - page: docs-content://deploy-manage/monitor/monitoring-data/configure-stack-monitoring-alerts.md
+                title: Stack monitoring alerts
+              - page: docs-content://deploy-manage/monitor/monitoring-data/configuring-data-streamsindices-for-monitoring.md
+                title: Configuring monitoring data streams and indices
+                children:
+                - page: docs-content://deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-elastic-agent.md
+                  title: Configuring data streams created by Elastic Agent
+                - page: docs-content://deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-metricbeat-8.md
+                  title: Configuring data streams created by Metricbeat 8
+                - page: docs-content://deploy-manage/monitor/monitoring-data/config-monitoring-indices-metricbeat-7-internal-collection.md
+                  title: Configuring indices created by Metricbeat 7 or internal collection
+            - page: docs-content://deploy-manage/monitor/autoops-vs-stack-monitoring.md
+              title: "AutoOps vs. Stack Monitoring"
+            - page: docs-content://deploy-manage/monitor/cloud-health-perf.md
+              title: "Cloud deployment health"
+              children:
+              - page: docs-content://deploy-manage/monitor/access-performance-metrics-on-elastic-cloud.md
+                title: Performance metrics on Elastic Cloud
+              - page: docs-content://deploy-manage/monitor/ec-memory-pressure.md
+                title: JVM memory pressure indicator
+            - page: docs-content://deploy-manage/monitor/kibana-task-manager-health-monitoring.md
+              title: "Kibana task manager monitoring"
+            - page: docs-content://deploy-manage/monitor/orchestrators.md
+              title: Monitoring orchestrators
+              children:
+              - page: docs-content://deploy-manage/monitor/orchestrators/eck-metrics-configuration.md
+                title: ECK operator metrics
+                children:
+                - page: docs-content://deploy-manage/monitor/orchestrators/k8s-enabling-metrics-endpoint.md
+                  title: Enabling the metrics endpoint
+                - page: docs-content://deploy-manage/monitor/orchestrators/k8s-securing-metrics-endpoint.md
+                  title: Securing the metrics endpoint
+                - page: docs-content://deploy-manage/monitor/orchestrators/k8s-prometheus-requirements.md
+                  title: Prometheus requirements
+              - page: docs-content://deploy-manage/monitor/orchestrators/ece-platform-monitoring.md
+                title: ECE platform monitoring
+                children:
+                - page: docs-content://deploy-manage/monitor/orchestrators/ece-monitoring-ece-access.md
+                  title: Platform monitoring deployment logs and metrics
+                - page: docs-content://deploy-manage/monitor/orchestrators/ece-proxy-log-fields.md
+                  title: Proxy log fields
+                - page: docs-content://deploy-manage/monitor/orchestrators/ece-monitoring-ece-set-retention.md
+                  title: Set the retention period for logging and metrics indices
+            - page: docs-content://deploy-manage/monitor/logging-configuration.md
+              title: Logging
+              children:
+              - page: docs-content://deploy-manage/monitor/logging-configuration/elasticsearch-log4j-configuration-self-managed.md
+                title: Elasticsearch log4j configuration
+              - page: docs-content://deploy-manage/monitor/logging-configuration/update-elasticsearch-logging-levels.md
+                title: Update Elasticsearch logging levels
+              - page: docs-content://deploy-manage/monitor/logging-configuration/elasticsearch-deprecation-logs.md
+                title: Elasticsearch deprecation logs
+              - page: docs-content://deploy-manage/monitor/logging-configuration/slow-logs.md
+                title: Slow query and index logging
+              - page: docs-content://deploy-manage/monitor/logging-configuration/kibana-logging.md
+                title: Kibana logging
+                children:
+                - page: docs-content://deploy-manage/monitor/logging-configuration/kibana-log-levels.md
+                  title: Set global log levels for Kibana
+                - page: docs-content://deploy-manage/monitor/logging-configuration/kib-advanced-logging.md
+                  title: Advanced Kibana logging settings
+                  children:
+                  - page: docs-content://deploy-manage/monitor/logging-configuration/kibana-log-settings-examples.md
+                    title: "Examples"
           - page: docs-content://deploy-manage/kibana-reporting-configuration.md
             title: Configure Kibana reporting
           - group: Backup, high availability, and resilience tools
             page: docs-content://deploy-manage/tools.md
+            children:
+            - page: docs-content://deploy-manage/tools/snapshot-and-restore.md
+              title: Snapshot and restore
+              children:
+              - page: docs-content://deploy-manage/tools/snapshot-and-restore/manage-snapshot-repositories.md
+                title: Manage snapshot repositories
+                children:
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/self-managed.md
+                  title: "Self-managed"
+                  children:
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/azure-repository.md
+                    title: Azure repository
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/google-cloud-storage-repository.md
+                    title: Google Cloud Storage repository
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/s3-repository.md
+                    title: S3 repository
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/shared-file-system-repository.md
+                    title: Shared file system repository
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/read-only-url-repository.md
+                    title: Read-only URL repository
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/source-only-repository.md
+                    title: Source-only repository
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/elastic-cloud-hosted.md
+                  title: "Elastic Cloud Hosted"
+                  children:
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md
+                    title: "AWS S3"
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/ec-gcs-snapshotting.md
+                    title: "Google Cloud Storage"
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/ec-azure-snapshotting.md
+                    title: "Azure Blob Storage"
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/access-isolation-for-found-snapshots-repository.md
+                    title: Access isolation for the found-snapshots repository
+                    children:
+                    - page: docs-content://deploy-manage/tools/snapshot-and-restore/repository-isolation-on-azure.md
+                      title: "Azure"
+                    - page: docs-content://deploy-manage/tools/snapshot-and-restore/repository-isolation-on-aws-gcp.md
+                      title: "AWS and GCP"
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/cloud-enterprise.md
+                  title: "Elastic Cloud Enterprise"
+                  children:
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md
+                    title: "AWS S3"
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/google-cloud-storage-gcs-repository.md
+                    title: "Google Cloud Storage"
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/azure-storage-repository.md
+                    title: Azure Storage repository
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/minio-on-premise-repository.md
+                    title: MinIO self-managed repository
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/cloud-on-k8s.md
+                  title: "Elastic Cloud on Kubernetes"
+              - page: docs-content://deploy-manage/tools/snapshot-and-restore/create-snapshots.md
+                title: Create, monitor and delete snapshots
+              - page: docs-content://deploy-manage/tools/snapshot-and-restore/restore-snapshot.md
+                title: Restore a snapshot
+                children:
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-across-clusters.md
+                  title: Restore a snapshot across clusters
+                  children:
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-new-deployment.md
+                    title: Restore snapshot into a new deployment
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-existing-deployment.md
+                    title: Restore snapshot into an existing deployment
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-containing-searchable-snapshots-indices-across-clusters.md
+                    title: Restore snapshots containing searchable snapshots indices across clusters
+              - page: docs-content://deploy-manage/tools/snapshot-and-restore/searchable-snapshots.md
+                title: Searchable snapshots
+            - page: docs-content://deploy-manage/tools/cross-cluster-replication.md
+              title: Cross-cluster replication
+              children:
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/set-up-cross-cluster-replication.md
+                title: "Set up cross-cluster replication"
+                children:
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-getting-started-prerequisites.md
+                  title: "Prerequisites"
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_connect_to_a_remote_cluster.md
+                  title: Connect to a remote cluster
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_configure_privileges_for_cross_cluster_replication_2.md
+                  title: Configure privileges for cross-cluster replication
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-getting-started-follower-index.md
+                  title: Create a follower index to replicate a specific index
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-getting-started-auto-follow.md
+                  title: Create an auto-follow pattern to replicate time series indices
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/manage-cross-cluster-replication.md
+                title: Manage cross-cluster replication
+                children:
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-inspect-progress.md
+                  title: Inspect replication statistics
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-pause-replication.md
+                  title: Pause and resume replication
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-recreate-follower-index.md
+                  title: Recreate a follower index
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-terminate-replication.md
+                  title: Terminate replication
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/manage-auto-follow-patterns.md
+                title: Manage auto-follow patterns
+                children:
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-create.md
+                  title: Create auto-follow patterns
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-retrieve.md
+                  title: Retrieve auto-follow patterns
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-pause.md
+                  title: Pause and resume auto-follow patterns
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-delete.md
+                  title: Delete auto-follow patterns
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/upgrading-clusters.md
+                title: "Upgrading clusters"
+                children:
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-uni-directional-upgrade.md
+                  title: Uni-directional index following
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-bi-directional-upgrade.md
+                  title: Bi-directional index following
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/uni-directional-disaster-recovery.md
+                title: "Uni-directional disaster recovery"
+                children:
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_prerequisites_14.md
+                  title: "Prerequisites"
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down.md
+                  title: "Failover when clusterA is down"
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back.md
+                  title: "Failback when clusterA comes back"
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/bi-directional-disaster-recovery.md
+                title: "Bi-directional disaster recovery"
+                children:
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-tutorial-initial-setup.md
+                  title: Initial setup
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down_2.md
+                  title: "Failover when clusterA is down"
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back_2.md
+                  title: "Failback when clusterA comes back"
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_perform_update_or_delete_by_query.md
+                  title: Perform update or delete by query
           - group: Autoscaling
             page: docs-content://deploy-manage/autoscaling.md
+            children:
+            - page: docs-content://deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md
+              title: "In ECE and ECH"
+            - page: docs-content://deploy-manage/autoscaling/autoscaling-in-eck.md
+              title: "In ECK"
+            - page: docs-content://deploy-manage/autoscaling/autoscaling-deciders.md
+              title: Autoscaling deciders
+            - page: docs-content://deploy-manage/autoscaling/trained-model-autoscaling.md
+              title: Trained model autoscaling
           - page: docs-content://deploy-manage/stack-settings.md
             title: Stack settings
           - page: docs-content://deploy-manage/manage-connectors.md
             title: Connectors
           - group: Remote clusters
             page: docs-content://deploy-manage/remote-clusters.md
+            children:
+            - page: docs-content://deploy-manage/remote-clusters/security-models.md
+              title: "Security models"
+            - page: docs-content://deploy-manage/remote-clusters/connection-modes.md
+              title: "Connection modes"
+            - page: docs-content://deploy-manage/remote-clusters/ec-enable-ccs.md
+              title: "On Elastic Cloud Hosted"
+              children:
+              - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-same-ess.md
+                title: "To the same Elastic Cloud organization"
+              - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-other-ess.md
+                title: "To a different Elastic Cloud organization"
+              - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-ece.md
+                title: "To Elastic Cloud Enterprise"
+              - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-self-managed.md
+                title: "To a self-managed cluster"
+              - page: docs-content://deploy-manage/remote-clusters/ec-enable-ccs-for-eck.md
+                title: "To Elastic Cloud on Kubernetes"
+              - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-strong-identity.md
+                title: "Strong identity verification"
+              - page: docs-content://deploy-manage/remote-clusters/ec-edit-remove-trusted-environment.md
+                title: "Manage trusted environments"
+              - page: docs-content://deploy-manage/remote-clusters/ec-migrate-ccs.md
+                title: "Migrate from the CCS deployment template"
+            - page: docs-content://deploy-manage/remote-clusters/ece-enable-ccs.md
+              title: "On Elastic Cloud Enterprise"
+              children:
+              - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-same-ece.md
+                title: "To the same ECE environment"
+              - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-other-ece.md
+                title: "To a different ECE environment"
+              - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-ece-ess.md
+                title: "To Elastic Cloud"
+              - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-self-managed.md
+                title: "To a self-managed cluster"
+              - page: docs-content://deploy-manage/remote-clusters/ece-enable-ccs-for-eck.md
+                title: "To Elastic Cloud on Kubernetes"
+              - page: docs-content://deploy-manage/remote-clusters/ece-edit-remove-trusted-environment.md
+                title: "Manage trusted environments"
+              - page: docs-content://deploy-manage/remote-clusters/ece-migrate-ccs.md
+                title: "Migrate from the CCS deployment template"
+            - page: docs-content://deploy-manage/remote-clusters/remote-clusters-self-managed.md
+              title: "On self-managed Elastic Stack"
+              children:
+              - page: docs-content://deploy-manage/remote-clusters/remote-clusters-api-key.md
+                title: Add remote clusters using API key authentication
+              - page: docs-content://deploy-manage/remote-clusters/remote-clusters-cert.md
+                title: Add remote clusters using TLS certificate authentication
+              - page: docs-content://deploy-manage/remote-clusters/self-remote-cluster-eck.md
+                title: "To Elastic Cloud on Kubernetes"
+              - page: docs-content://deploy-manage/remote-clusters/remote-clusters-migrate.md
+                title: "Migrate from certificate to API key authentication"
+            - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-landing.md
+              title: "On Elastic Cloud on Kubernetes"
+              children:
+              - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters.md
+                title: "To the same ECK environment"
+              - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-to-other-eck.md
+                title: "To a different ECK environment"
+              - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-to-external.md
+                title: "To an external cluster or deployment"
           - group: Cross-project search
             page: docs-content://deploy-manage/cross-project-search-config.md
             children:
@@ -729,14 +1485,157 @@ nav:
           - label: ───
           - group: Maintenance
             page: docs-content://deploy-manage/maintenance.md
+            children:
+            - page: docs-content://deploy-manage/maintenance/ece.md
+              title: ECE maintenance
+              children:
+              - page: docs-content://deploy-manage/maintenance/ece/deployments-maintenance.md
+                title: Deployments maintenance
+                children:
+                - page: docs-content://deploy-manage/maintenance/ece/pause-instance.md
+                  title: Pause instance
+              - page: docs-content://deploy-manage/maintenance/ece/maintenance-activities.md
+                title: Maintenance activities
+                children:
+                - page: docs-content://deploy-manage/maintenance/ece/enable-maintenance-mode.md
+                  title: Enable maintenance mode
+                - page: docs-content://deploy-manage/maintenance/ece/scale-out-installation.md
+                  title: Scale out your installation
+                - page: docs-content://deploy-manage/maintenance/ece/move-nodes-instances-from-allocators.md
+                  title: Move nodes or instances from allocators
+                - page: docs-content://deploy-manage/maintenance/ece/perform-ece-hosts-maintenance.md
+                  title: Perform ECE hosts maintenance
+                - page: docs-content://deploy-manage/maintenance/ece/delete-ece-hosts.md
+                  title: Delete ECE hosts
+            - page: docs-content://deploy-manage/maintenance/start-stop-services.md
+              title: Start and stop services
+              children:
+              - page: docs-content://deploy-manage/maintenance/start-stop-services/start-stop-elasticsearch.md
+                title: Start and stop Elasticsearch
+              - page: docs-content://deploy-manage/maintenance/start-stop-services/start-stop-kibana.md
+                title: Start and stop Kibana
+              - page: docs-content://deploy-manage/maintenance/start-stop-services/restart-cloud-hosted-deployment.md
+                title: Restart an Elastic Cloud Hosted deployment
+              - page: docs-content://deploy-manage/maintenance/start-stop-services/restart-an-ece-deployment.md
+                title: Restart an ECE deployment
+              - page: docs-content://deploy-manage/maintenance/start-stop-services/full-cluster-restart-rolling-restart-procedures.md
+                title: Full Cluster restart and rolling restart procedures
+            - page: docs-content://deploy-manage/maintenance/start-stop-routing-requests.md
+              title: Start and stop routing requests
+            - page: docs-content://deploy-manage/maintenance/add-and-remove-elasticsearch-nodes.md
+              title: Add and Remove Elasticsearch nodes
           - group: Upgrade
             page: docs-content://deploy-manage/upgrade.md
+            children:
+            - page: docs-content://deploy-manage/upgrade/plan-upgrade.md
+              title: Plan your upgrade
+            - page: docs-content://deploy-manage/upgrade/prepare-to-upgrade.md
+              title: "Preparation steps"
+              children:
+              - page: docs-content://deploy-manage/upgrade/prepare-to-upgrade/upgrade-assistant.md
+                title: Upgrade Assistant
+            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster.md
+              title: Upgrade your deployment or cluster
+              children:
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-717.md
+                title: Upgrade from 7.17 to latest
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ech.md
+                title: "Upgrade on Elastic Cloud Hosted"
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ece.md
+                title: "Upgrade on Elastic Cloud Enterprise"
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-on-eck.md
+                title: "Upgrade on Elastic Cloud on Kubernetes"
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/self-managed.md
+                title: "Upgrade Elastic on a self-managed cluster"
+                children:
+                - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/elasticsearch.md
+                  title: Upgrade Elasticsearch
+                - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-elasticsearch-docker.md
+                  title: "Upgrade Elasticsearch running on Docker"
+                - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/kibana.md
+                  title: Upgrade Kibana
+                  children:
+                  - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/saved-object-migrations.md
+                    title: Saved object migrations
+                  - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/kibana-roll-back.md
+                    title: "Roll back to a previous version"
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/archived-settings.md
+                title: "Archived settings"
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/reading-indices-from-older-elasticsearch-versions.md
+                title: "Reading indices from older versions"
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/enterprise-search.md
+                title: Upgrade Enterprise Search
+            - page: docs-content://deploy-manage/upgrade/ingest-components.md
+              title: Upgrade your ingest components
+            - page: docs-content://deploy-manage/upgrade/orchestrator.md
+              title: "Upgrade your ECE or ECK orchestrator"
+              children:
+              - page: docs-content://deploy-manage/upgrade/orchestrator/upgrade-cloud-enterprise.md
+                title: Upgrade Elastic Cloud Enterprise
+                children:
+                - page: docs-content://deploy-manage/upgrade/orchestrator/re-running-the-ece-upgrade.md
+                  title: Re-running the ECE upgrade
+              - page: docs-content://deploy-manage/upgrade/orchestrator/upgrade-cloud-on-k8s.md
+                title: Upgrade Elastic Cloud on Kubernetes
           - group: Uninstall
             page: docs-content://deploy-manage/uninstall.md
+            children:
+            - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md
+              title: Uninstall Elastic Cloud Enterprise
+            - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-on-kubernetes.md
+              title: Uninstall Elastic Cloud on Kubernetes
+            - page: docs-content://deploy-manage/uninstall/delete-a-cloud-deployment.md
+              title: "Delete an orchestrated deployment"
           - group: Licenses and subscriptions
             page: docs-content://deploy-manage/license.md
+            children:
+            - page: docs-content://deploy-manage/license/manage-your-license-in-ece.md
+              title: "Elastic Cloud Enterprise"
+            - page: docs-content://deploy-manage/license/manage-your-license-in-eck.md
+              title: "Elastic Cloud on Kubernetes"
+            - page: docs-content://deploy-manage/license/manage-your-license-in-self-managed-cluster.md
+              title: "Self-managed cluster"
           - group: Manage your Cloud organization
             page: docs-content://deploy-manage/cloud-organization.md
+            children:
+            - page: docs-content://deploy-manage/cloud-organization/billing.md
+              title: Billing
+              children:
+              - page: docs-content://deploy-manage/cloud-organization/billing/cloud-hosted-deployment-billing-dimensions.md
+                title: "Hosted billing dimensions"
+              - page: docs-content://deploy-manage/cloud-organization/billing/serverless-project-billing-dimensions.md
+                title: "Serverless billing dimensions"
+                children:
+                - page: docs-content://deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md
+                  title: "Elasticsearch projects"
+                - page: docs-content://deploy-manage/cloud-organization/billing/elastic-observability-billing-dimensions.md
+                  title: "Observability projects"
+                - page: docs-content://deploy-manage/cloud-organization/billing/security-billing-dimensions.md
+                  title: "Security projects"
+              - page: docs-content://deploy-manage/cloud-organization/billing/billing-models.md
+                title: Billing models
+              - page: docs-content://deploy-manage/cloud-organization/billing/add-billing-details.md
+                title: Add your billing details
+              - page: docs-content://deploy-manage/cloud-organization/billing/view-billing-history.md
+                title: View your billing history
+              - page: docs-content://deploy-manage/cloud-organization/billing/manage-billing-notifications.md
+                title: "Manage notifications"
+              - page: docs-content://deploy-manage/cloud-organization/billing/manage-subscription.md
+                title: Manage your subscription
+              - page: docs-content://deploy-manage/cloud-organization/billing/monitor-analyze-usage.md
+                title: Monitor and analyze usage
+              - page: docs-content://deploy-manage/cloud-organization/billing/ecu.md
+                title: Elastic Consumption Units
+              - page: docs-content://deploy-manage/cloud-organization/billing/billing-faq.md
+                title: Billing FAQ
+            - page: docs-content://deploy-manage/cloud-organization/operational-emails.md
+              title: Operational emails
+            - page: docs-content://deploy-manage/cloud-organization/billing/update-billing-operational-contacts.md
+              title: Update billing and operational contacts
+            - page: docs-content://deploy-manage/cloud-organization/service-status.md
+              title: Service status
+            - page: docs-content://deploy-manage/cloud-organization/tools-and-apis.md
+              title: "Tools and APIs"
         - group: Deployment and administration tools
           children:
           - toc: ecctl://reference
@@ -750,9 +1649,47 @@ nav:
           children:
           - page: docs-content://manage-data/ingest.md
             title: Choose/Plan your ingest method
-          - page: docs-content://manage-data/ingest/ingest-reference-architectures.md
-            title: Ingest architectures
+          - group: Ingest architectures
+            page: docs-content://manage-data/ingest/ingest-reference-architectures.md
+            children:
+            - group: Agent to Elasticsearch
+              page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-to-es.md
+              children:
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-installed.md
+                title: Elastic Agent (installed)
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-apis.md
+                title: Elastic Agent via APIs
+            - group: Agent with Logstash
+              page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-ls.md
+              children:
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-enrich.md
+                title: Logstash for enrichment
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/lspq.md
+                title: Logstash persistent queue
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-networkbridge.md
+                title: Logstash as a network bridge
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-multi.md
+                title: Logstash for multiple destinations
+            - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-proxy.md
+              title: Agent through a proxy
+            - group: Agent with Kafka
+              page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-kafka-es.md
+              children:
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-kafka-ls.md
+                title: Agent to Kafka via Logstash
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-kafka-essink.md
+                title: Agent to Kafka with Elasticsearch sink
+            - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-for-input.md
+              title: Logstash as input
+            - group: Air-gapped environments
+              page: docs-content://manage-data/ingest/ingest-reference-architectures/airgapped-env.md
+              children:
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-es-airgapped.md
+                title: Agent to Elasticsearch (air-gapped)
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-ls-airgapped.md
+                title: Agent with Logstash (air-gapped)
           - group: Ingest by solution
+            page: docs-content://manage-data/ingest/ingesting-data-for-elastic-solutions.md
             children:
             - page: docs-content://solutions/search/ingest-for-search.md
               title: Ingesting data for search use cases
@@ -831,6 +1768,8 @@ nav:
             - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-nodejs-web-application-using-filebeat.md
               title: Ingest logs from a Node.js web application using Filebeat
           - title: Ingest data using the API
+          - page: docs-content://manage-data/ingest/tools.md
+            title: Ingest tools overview
           - page: docs-content://manage-data/ingest/upload-data-files.md
             title: Upload data files
           - page: docs-content://manage-data/ingest/sample-data.md
@@ -1112,35 +2051,215 @@ nav:
             title: Calculate ingest lag metadata
       - label: Search, visualize and analyze
         children:
+        # =======================================================================
+        # SEARCH AND QUERY
+        # Narrative arc: get started → approaches → ingest → querying → cross-cluster → integrate
+        # Pages pulled from solutions/search/ and explore-analyze/ at current paths.
+        # [from E&A] = page currently lives in explore-analyze/
+        # [TODO] = placeholder, page not yet written
+        # =======================================================================
         - group: Search and query
+          page: docs-content://solutions/search.md
           children:
+
+          # -----------------------------------------------------------------------
+          # 1. GET STARTED
+          # -----------------------------------------------------------------------
           - group: Get started with search
+            page: docs-content://solutions/search/get-started.md
+            children:
+            - group: Quickstarts
+              page: docs-content://solutions/search/get-started/quickstarts.md
+              children:
+              - page: docs-content://solutions/search/get-started/index-basics.md
+                title: Index basics
+              - page: docs-content://solutions/search/get-started/keyword-search-python.md
+                title: Keyword search with Python
+              - page: docs-content://solutions/search/get-started/semantic-search.md
+                title: Semantic search
+
+          # -----------------------------------------------------------------------
+          # 2. SEARCH APPROACHES
+          # What kind of search do I need?
+          # FTS is the foundation — everything else layers on top.
+          # -----------------------------------------------------------------------
+          - group: Search approaches
+            page: docs-content://solutions/search/search-approaches.md
+            children:
+            # Full-text is core to every deployment, not just one option
+            - group: Full-text search
+              page: docs-content://solutions/search/full-text.md
+              children:
+              - page: docs-content://solutions/search/full-text/how-full-text-works.md
+                title: How full-text search works
+              - page: docs-content://solutions/search/full-text/text-analysis-during-search.md
+                title: Text analysis during search
+              - group: Search relevance
+                page: docs-content://solutions/search/full-text/search-relevance.md
+                children:
+                - page: docs-content://solutions/search/full-text/search-relevance/mixing-exact-search-with-stemming.md
+                  title: Mix exact search with stemming
+                - page: docs-content://solutions/search/full-text/search-relevance/consistent-scoring.md
+                  title: Consistent scoring
+                - page: docs-content://solutions/search/full-text/search-relevance/static-scoring-signals.md
+                  title: Static scoring signals
+              - group: Synonyms
+                page: docs-content://solutions/search/full-text/search-with-synonyms.md
+                children:
+                - page: docs-content://solutions/search/full-text/create-update-synonyms-api-example.md
+                  title: Create and update synonyms via API
+            # Vector search — formerly "AI search"
+            - group: Vector search
+              page: docs-content://solutions/search/ai-search/ai-search.md
+              children:
+              - group: Dense vector search
+                page: docs-content://solutions/search/vector/dense-vector.md
+                children:
+                - page: docs-content://solutions/search/vector/knn.md
+                  title: k-nearest neighbor (kNN)
+                - page: docs-content://solutions/search/vector/bring-own-vectors.md
+                  title: Bring your own vectors
+              - page: docs-content://solutions/search/vector/sparse-vector.md
+                title: Sparse vector search
+              - page: docs-content://solutions/search/vector/dense-versus-sparse-ingest-pipelines.md
+                title: Dense vs sparse ingest pipelines
+              - group: Semantic search
+                page: docs-content://solutions/search/semantic-search.md
+                children:
+                - page: docs-content://solutions/search/semantic-search/semantic-search-semantic-text.md
+                  title: Semantic search with semantic_text
+                - page: docs-content://solutions/search/semantic-search/semantic-search-inference.md
+                  title: Semantic search with the inference API
+                - page: docs-content://solutions/search/semantic-search/semantic-search-elser-ingest-pipelines.md
+                  title: Semantic search with ELSER
+                - page: docs-content://solutions/search/semantic-search/cohere-es.md
+                  title: Semantic search with Cohere
+              - page: docs-content://solutions/search/using-openai-compatible-models.md
+                title: Using OpenAI-compatible models
+            - group: Hybrid search
+              page: docs-content://solutions/search/hybrid-search.md
+              children:
+              - page: docs-content://solutions/search/hybrid-semantic-text.md
+                title: Hybrid search with semantic_text
+            # Ranking — semantic reranking is a lightweight upgrade on top of FTS
+            - group: Ranking and reranking
+              page: docs-content://solutions/search/ranking.md
+              children:
+              - page: docs-content://solutions/search/ranking/semantic-reranking.md
+                title: Semantic reranking
+              - group: Learning to rank
+                page: docs-content://solutions/search/ranking/learning-to-rank-ltr.md
+                children:
+                - page: docs-content://solutions/search/ranking/learning-to-rank-model-training.md
+                  title: Train an LTR model
+                - page: docs-content://solutions/search/ranking/learning-to-rank-search-usage.md
+                  title: Use LTR in search
+
+          # -----------------------------------------------------------------------
+          # 3. INGEST FOR SEARCH
+          # After approaches — the approach decision shapes what your pipeline needs.
+          # -----------------------------------------------------------------------
+          - group: Ingest for search
+            page: docs-content://solutions/search/ingest-for-search.md
             children:
-            - title: APIs and tools for search
-          - group: Search strategies
+            - page: docs-content://solutions/search/search-pipelines.md
+              title: Search pipelines
+
+          # -----------------------------------------------------------------------
+          # 4. QUERYING
+          # How do I express and execute my search?
+          # Two dimensions: what language? what interface?
+          # -----------------------------------------------------------------------
+          - group: Build search queries
+            page: docs-content://solutions/search/querying-for-search.md
             children:
-            - title: Full-text search
-            - title: AI-powered search
-            - title: Hybrid search
-            - title: Ranking and reranking
-          - group: Build search queries with APIs and query languages and search templates
+            - group: The search API
+              page: docs-content://solutions/search/the-search-api.md
+              children:
+              - page: docs-content://solutions/search/search-templates.md
+                title: Search templates
+              - group: Aggregations
+                page: docs-content://explore-analyze/query-filter/aggregations.md # [from E&A]
+                children:
+                - page: docs-content://explore-analyze/query-filter/aggregations/tutorial-analyze-ecommerce-data-with-aggregations-using-query-dsl.md
+                  title: Tutorial — analyze e-commerce data
+            - page: docs-content://solutions/search/retrievers-overview.md
+              title: Retrievers
+            - page: docs-content://solutions/search/esql-for-search.md
+              title: ES|QL for search
+            - page: docs-content://solutions/search/async-search-api.md
+              title: Async search
+            # Language narrative pages — "understand and decide" layer
+            # These sit above the bulk reference toc further down.
+            - group: Query languages
+              page: docs-content://explore-analyze/query-filter/languages.md # [from E&A] comparison table landing
+              children:
+              - page: docs-content://explore-analyze/query-filter/languages/querydsl.md # [from E&A]
+                title: Query DSL
+              - page: docs-content://explore-analyze/query-filter/languages/kql.md # [from E&A]
+                title: KQL
+              - group: EQL
+                page: docs-content://explore-analyze/query-filter/languages/eql.md # [from E&A]
+                children:
+                - page: docs-content://explore-analyze/query-filter/languages/example-detect-threats-with-eql.md
+                  title: Detect threats with EQL
+              # [THIN] sql.md is a hollow intro + link list that duplicates the reference toc below.
+              # Candidate for removal — redirect to elasticsearch://reference/query-languages/sql.md
+              - page: docs-content://explore-analyze/query-filter/languages/sql.md # [from E&A]
+                title: SQL
+              # [THIN] lucene-query-syntax.md is a single paragraph pointing users to the Kibana UI toggle.
+              # Candidate for removal — redirect to elasticsearch://reference/query-languages/query-dsl/query-dsl-query-string-query.md
+              - page: docs-content://explore-analyze/query-filter/languages/lucene-query-syntax.md # [from E&A]
+                title: Lucene query syntax
+            # Query language reference — bulk toc, cannot interleave with narrative pages above
+            - toc: elasticsearch://reference/query-languages
+            # Developer tools — for running and testing queries
+            - group: Developer tools
+              page: docs-content://explore-analyze/query-filter/tools.md # [from E&A]
+              children:
+              - page: docs-content://explore-analyze/query-filter/tools/console.md
+                title: Console
+              - page: docs-content://explore-analyze/query-filter/tools/search-profiler.md
+                title: Search Profiler
+              - page: docs-content://explore-analyze/query-filter/tools/saved-queries.md
+                title: Saved queries
+
+          # -----------------------------------------------------------------------
+          # 5. SEARCH ACROSS CLUSTERS AND PROJECTS
+          # End-of-journey scaling topic: "my data spans multiple clusters"
+          # -----------------------------------------------------------------------
+          - group: Cross-cluster search
+            page: docs-content://explore-analyze/cross-cluster-search.md # [from E&A]
             children:
-            - title: ES|QL
-            - title: Query DSL
-            - title: "..."
+            - page: docs-content://explore-analyze/cross-cluster-search/using-resolve-cluster-endpoint-before-cross-cluster-search.md
+              title: Using the resolve cluster endpoint
+          # Cross-project search — serverless only, pages are hidden in toc
           - group: Cross-project search
+            page: docs-content://explore-analyze/cross-project-search.md # [from E&A]
             children:
-            - title: Link projects for cross-project search
-            - title: Using project routing to limit search scope
-            - title: How search works in CPS
-            - title: Using tags to control search
-          - title: Cross-cluster search
-          - title: Add search to your site or app
-          - group: Querying and filtering in Kibana
-            children:
-            - title: Filtering in Kibana
-            - title: Query languages
-            - title: Query tools
+            - page: docs-content://explore-analyze/cross-project-search/cross-project-search-link-projects.md
+              title: Link projects
+            - page: docs-content://explore-analyze/cross-project-search/cross-project-search-search.md
+              title: Search across projects
+            - page: docs-content://explore-analyze/cross-project-search/cross-project-search-tags.md
+              title: Using tags to control search
+            - page: docs-content://explore-analyze/cross-project-search/cross-project-search-project-routing.md
+              title: Project routing
+
+          # -----------------------------------------------------------------------
+          # 6. INTEGRATE WITH YOUR APP
+          # Wire search into your application code.
+          # [TODO] site-or-app.md → integrate.md rename deferred to docs-content work
+          # -----------------------------------------------------------------------
+          - group: Integrate with your app
+            page: docs-content://solutions/search/site-or-app.md
+            children:
+            - page: docs-content://solutions/search/site-or-app/clients.md
+              title: Client libraries
+            - page: docs-content://solutions/search/site-or-app/search-ui.md
+              title: Search UI
+            - page: docs-content://solutions/search/apis-and-tools.md
+              title: APIs and tools
         - group: Explore and visualize
           page: docs-content://explore-analyze/explore-and-visualize.md
           children:
@@ -1954,6 +3073,8 @@ nav:
                 title: Upgrade
               - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/customization.md
                 title: Customization
+            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/llms/index.md
+              title: LLM observability
           - group: Other Observability tutorials
             page: docs-content://solutions/observability/get-started/other-tutorials/index.md
             children:
@@ -2055,6 +3176,8 @@ nav:
                   title: Infrastructure
                 - page: docs-content://solutions/observability/apm/logs.md
                   title: Logs
+              - page: docs-content://solutions/observability/apm/discover-traces.md
+                title: Discover traces
               - group: Filter and search data
                 page: docs-content://solutions/observability/apm/filter-search-data.md
                 children:
@@ -2152,7 +3275,7 @@ nav:
                 title: Reduce storage
               - page: docs-content://solutions/observability/apm/explore-data-in-elasticsearch.md
                 title: Explore data in Elasticsearch
-            - group: "Work with {{apm-server}}"
+            - group: "Work with APM Server"
               page: docs-content://solutions/observability/apm/apm-server/index.md
               children:
               - group: Set up
@@ -2187,7 +3310,7 @@ nav:
                   - page: docs-content://solutions/observability/apm/apm-server/configure-elasticsearch-output.md
                     title: Elasticsearch
                   - page: docs-content://solutions/observability/apm/apm-server/configure-logstash-output.md
-                    title: "{{ls}}"
+                    title: "Logstash"
                   - page: docs-content://solutions/observability/apm/apm-server/configure-kafka-output.md
                     title: Kafka
                   - page: docs-content://solutions/observability/apm/apm-server/configure-redis-output.md
@@ -2235,7 +3358,7 @@ nav:
                   - page: docs-content://solutions/observability/apm/apm-server/use-internal-collection-to-send-monitoring-data.md
                     title: Use internal collection
                   - page: docs-content://solutions/observability/apm/apm-server/use-metricbeat-to-send-monitoring-data.md
-                    title: "Use {{metricbeat}} collection"
+                    title: "Use Metricbeat collection"
                   - page: docs-content://solutions/observability/apm/apm-server/use-select-metrics-emitted-directly-to-monitoring-cluster.md
                     title: Use local collection
             - group: APM APIs
@@ -2243,7 +3366,7 @@ nav:
               children:
               - page: docs-content://solutions/observability/apm/apm-ui-api.md
                 title: APM UI API
-              - group: "{{apm-server}} API"
+              - group: "APM Server API"
                 page: docs-content://solutions/observability/apm/apm-server/api.md
                 children:
                 - page: docs-content://solutions/observability/apm/apm-server/information-api.md
@@ -2271,16 +3394,16 @@ nav:
                 - page: docs-content://solutions/observability/apm/upgrade-self-installation-of-apm-integration-to-9.md
                   title: Self-installation APM integration
                 - page: docs-content://solutions/observability/apm/upgrade-elastic-cloud-apm-server-standalone-to-9.md
-                  title: "{{ecloud}} standalone"
+                  title: "Elastic Cloud standalone"
                 - page: docs-content://solutions/observability/apm/upgrade-elastic-cloud-with-apm-integration-to-9.md
-                  title: "{{ecloud}} APM integration"
+                  title: "Elastic Cloud APM integration"
               - group: Switch to the Elastic APM integration
                 page: docs-content://solutions/observability/apm/switch-to-elastic-apm-integration.md
                 children:
                 - page: docs-content://solutions/observability/apm/switch-self-installation-to-apm-integration.md
                   title: Switch a self-installation
                 - page: docs-content://solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md
-                  title: "Switch an {{ecloud}} cluster"
+                  title: "Switch an Elastic Cloud cluster"
           - group: Synthetic monitoring
             page: docs-content://solutions/observability/synthetics/index.md
             children:
@@ -2374,7 +3497,7 @@ nav:
             children:
             - page: docs-content://solutions/observability/cloud/ingestion-options.md
               title: Ingestion options
-            - group: "Monitor {{aws}} with Elastic Agent"
+            - group: "Monitor AWS with Elastic Agent"
               page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-agent.md
               children:
               - page: docs-content://solutions/observability/cloud/monitor-amazon-cloud-compute-ec2.md
@@ -2386,8 +3509,8 @@ nav:
               - page: docs-content://solutions/observability/cloud/monitor-amazon-simple-queue-service-sqs.md
                 title: SQS
             - page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md
-              title: "Monitor {{aws}} with {{beats}}"
-            - group: "Monitor {{aws}} with Amazon Data Firehose"
+              title: "Monitor AWS with Beats"
+            - group: "Monitor AWS with Amazon Data Firehose"
               page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-amazon-data-firehose.md
               children:
               - page: docs-content://solutions/observability/cloud/monitor-virtual-private-cloud-vpc-flow-logs.md
@@ -2401,7 +3524,7 @@ nav:
               - page: docs-content://solutions/observability/cloud/monitor-cloudwatch-logs.md
                 title: CloudWatch logs
             - page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-serverless-forwarder.md
-              title: "Monitor {{aws}} with Elastic Serverless Forwarder"
+              title: "Monitor AWS with Elastic Serverless Forwarder"
           - group: Azure
             page: docs-content://solutions/observability/cloud/azure-monitoring.md
             children:
@@ -2570,8 +3693,24 @@ nav:
             title: Rename processor
           - page: docs-content://solutions/observability/streams/management/extract/append.md
             title: Append processor
+          - page: docs-content://solutions/observability/streams/management/extract/concat.md
+            title: Concat processor
+          - page: docs-content://solutions/observability/streams/management/extract/join.md
+            title: Join processor
+          - page: docs-content://solutions/observability/streams/management/extract/lowercase.md
+            title: Lowercase processor
+          - page: docs-content://solutions/observability/streams/management/extract/uppercase.md
+            title: Uppercase processor
+          - page: docs-content://solutions/observability/streams/management/extract/trim.md
+            title: Trim processor
+          - page: docs-content://solutions/observability/streams/management/extract/redact.md
+            title: Redact processor
+          - page: docs-content://solutions/observability/streams/management/extract/network-direction.md
+            title: Network direction processor
           - page: docs-content://solutions/observability/streams/management/extract/manual-pipeline-configuration.md
             title: Manual pipeline configuration
+        - page: docs-content://solutions/observability/streams/management/streamlang.md
+          title: Streamlang
         - page: docs-content://solutions/observability/streams/management/partitioning.md
           title: Partition data into child streams
         - page: docs-content://solutions/observability/streams/management/schema.md
@@ -2697,9 +3836,9 @@ nav:
             page: docs-content://solutions/security/get-started/spaces-elastic-security.md
             children:
             - page: docs-content://solutions/security/get-started/spaces-defend-faq.md
-              title: "Spaces and {{elastic-defend}} FAQ"
+              title: "Spaces and Elastic Defend FAQ"
           - page: docs-content://solutions/security/get-started/data-views-elastic-security.md
-            title: "{{data-sources-cap}} and Elastic Security"
+            title: "Data views and Elastic Security"
           - page: docs-content://solutions/security/get-started/create-runtime-fields-in-elastic-security.md
             title: Create runtime fields in Elastic Security
           - page: docs-content://solutions/security/get-started/configure-advanced-settings.md
@@ -2799,7 +3938,7 @@ nav:
               - page: docs-content://solutions/security/detect-and-alert/threshold.md
                 title: Threshold rules
               - page: docs-content://solutions/security/detect-and-alert/machine-learning.md
-                title: "{{ml-cap}} rules"
+                title: "Machine learning rules"
               - page: docs-content://solutions/security/detect-and-alert/new-terms.md
                 title: New terms rules
             - page: docs-content://solutions/security/detect-and-alert/using-the-rule-ui.md
@@ -2846,12 +3985,12 @@ nav:
               title: View detection alert details
             - page: docs-content://solutions/security/detect-and-alert/query-alert-indices.md
               title: Query alert indices
-        - group: "Configure endpoint protection with {{elastic-defend}}"
+        - group: "Configure endpoint protection with Elastic Defend"
           page: docs-content://solutions/security/configure-elastic-defend.md
           children:
           - page: docs-content://solutions/security/configure-elastic-defend/elastic-defend-requirements.md
-            title: "{{elastic-defend}} requirements"
-          - group: "Install {{elastic-defend}}"
+            title: "Elastic Defend requirements"
+          - group: "Install Elastic Defend"
             page: docs-content://solutions/security/configure-elastic-defend/install-elastic-defend.md
             children:
             - page: docs-content://solutions/security/configure-elastic-defend/enable-access-for-macos.md
@@ -2861,14 +4000,14 @@ nav:
             - page: docs-content://solutions/security/configure-elastic-defend/prevent-elastic-agent-uninstallation.md
               title: Prevent Elastic Agent uninstallation
           - page: docs-content://solutions/security/configure-elastic-defend/elastic-defend-feature-privileges.md
-            title: "{{elastic-defend}} feature privileges"
-          - group: "Configure an integration policy for {{elastic-defend}}"
+            title: "Elastic Defend feature privileges"
+          - group: "Configure an integration policy for Elastic Defend"
             page: docs-content://solutions/security/configure-elastic-defend/configure-an-integration-policy-for-elastic-defend.md
             children:
             - page: docs-content://solutions/security/configure-elastic-defend/configure-updates-for-protection-artifacts.md
               title: Configure updates for protection artifacts
             - page: docs-content://solutions/security/configure-elastic-defend/turn-off-diagnostic-data-for-elastic-defend.md
-              title: "Turn off diagnostic data for {{elastic-defend}}"
+              title: "Turn off diagnostic data for Elastic Defend"
             - page: docs-content://solutions/security/configure-elastic-defend/configure-self-healing-rollback-for-windows-endpoints.md
               title: Configure self-healing rollback for Windows endpoints
             - page: docs-content://solutions/security/configure-elastic-defend/configure-linux-file-system-monitoring.md
@@ -2881,7 +4020,7 @@ nav:
             title: Configure offline endpoints and air-gapped environments
           - page: docs-content://solutions/security/configure-elastic-defend/uninstall-elastic-agent.md
             title: Uninstall Elastic Agent
-        - group: "Manage {{elastic-defend}}"
+        - group: "Manage Elastic Defend"
           page: docs-content://solutions/security/manage-elastic-defend.md
           children:
           - page: docs-content://solutions/security/manage-elastic-defend/endpoints.md
@@ -2899,17 +4038,17 @@ nav:
           - page: docs-content://solutions/security/manage-elastic-defend/blocklist.md
             title: Blocklist
           - page: docs-content://solutions/security/manage-elastic-defend/optimize-elastic-defend.md
-            title: "Optimize {{elastic-defend}}"
+            title: "Optimize Elastic Defend"
           - page: docs-content://solutions/security/manage-elastic-defend/event-capture-elastic-defend.md
-            title: "Event capture and {{elastic-defend}}"
+            title: "Event capture and Elastic Defend"
           - page: docs-content://solutions/security/manage-elastic-defend/endpoint-protection-rules.md
             title: Endpoint protection rules
           - page: docs-content://solutions/security/manage-elastic-defend/automatic-troubleshooting.md
             title: Automatic troubleshooting
           - page: docs-content://solutions/security/manage-elastic-defend/allowlist-elastic-endpoint-in-third-party-antivirus-apps.md
-            title: "Allowlist {{elastic-endpoint}} in third-party antivirus apps"
+            title: "Allowlist Elastic Endpoint in third-party antivirus apps"
           - page: docs-content://solutions/security/manage-elastic-defend/elastic-endpoint-self-protection-features.md
-            title: "{{elastic-endpoint}} self-protection features"
+            title: "Elastic Endpoint self-protection features"
         - group: Endpoint response actions
           page: docs-content://solutions/security/endpoint-response-actions.md
           children:
@@ -2929,7 +4068,7 @@ nav:
           - page: docs-content://solutions/security/cloud/security-posture-management-overview.md
             title: Security posture management overview
           - page: docs-content://solutions/security/cloud/enable-cloud-security-features.md
-            title: "Enable cloud security features in {{serverless-short}}"
+            title: "Enable cloud security features in Serverless"
           - group: Cloud security posture management
             page: docs-content://solutions/security/cloud/cloud-security-posture-management.md
             children:
@@ -3143,147 +4282,6 @@ nav:
           title: Serverless feature tiers
         - page: docs-content://solutions/security/apis.md
           title: APIs
-  #  - label: Reference
-  #    children:
-  #    - toc: elasticsearch://reference/elasticsearch
-  #    - toc: kibana://reference
-  #    - group: Cloud
-  #      children:
-  #      - toc: cloud://reference
-  #      - toc: cloud-on-k8s://reference
-  #    - toc: docs-content://reference/security
-  #    - toc: docs-content://reference/observability
-  #    - toc: ecs://reference
-  #    - toc: docs-content://reference/machine-learning
-  #    - toc: search-ui://reference
-  #    - toc: elasticsearch://reference/aggregations
-  #    - toc: ecctl://reference
-  #    - toc: docs-content://reference/elasticsearch-clients
-  #    - toc: elasticsearch://reference/enrich-processor
-  #    - toc: elasticsearch://reference/query-languages
-  #    - toc: elasticsearch://reference/scripting-languages
-  #    - page: docs-content://explore-analyze/numeral-formatting.md
-  #      title: Numeral formatting
-  #    - toc: elasticsearch://reference/text-analysis
-  #    - toc: docs-content://reference/glossary
-  #  - label: Troubleshooting
-  #    children:
-  #    - group: Troubleshoot Elasticsearch
-  #      children:
-  #      - page: docs-content://troubleshoot/elasticsearch/add-repository.md
-  #        title: Troubleshoot broken repositories
-  #      - page: docs-content://troubleshoot/elasticsearch/add-tier.md
-  #        title: Add a preferred data tier
-  #      - page: docs-content://troubleshoot/elasticsearch/allow-all-cluster-allocation.md
-  #        title: Allow cluster-wide shard allocation
-  #      - page: docs-content://troubleshoot/elasticsearch/allow-all-index-allocation.md
-  #        title: Allow index shard allocation
-  #      - page: docs-content://troubleshoot/elasticsearch/cluster-allocation-api-examples.md
-  #        title: Using the cluster allocation API
-  #      - page: docs-content://troubleshoot/elasticsearch/corruption-troubleshooting.md
-  #        title: Troubleshoot data corruption
-  #      - page: docs-content://troubleshoot/elasticsearch/discovery-troubleshooting.md
-  #        title: Troubleshoot discovery
-  #      - page: docs-content://troubleshoot/elasticsearch/file-based-recovery.md
-  #        title: File-based access recovery
-  #      - page: docs-content://troubleshoot/elasticsearch/fix-common-cluster-issues.md
-  #        title: Fix common cluster issues
-  #      - page: docs-content://troubleshoot/elasticsearch/fix-data-node-out-of-disk.md
-  #        title: Fix data nodes out of disk
-  #      - page: docs-content://troubleshoot/elasticsearch/fix-master-node-out-of-disk.md
-  #        title: Fix master nodes out of disk
-  #      - page: docs-content://troubleshoot/elasticsearch/fix-other-node-out-of-disk.md
-  #        title: Fix other role nodes out of disk
-  #      - page: docs-content://troubleshoot/elasticsearch/fix-watermark-errors.md
-  #        title: Watermark errors
-  #      - page: docs-content://troubleshoot/elasticsearch/increase-cluster-shard-limit.md
-  #        title: Total shards per node has been reached
-  #      - page: docs-content://troubleshoot/elasticsearch/increase-shard-limit.md
-  #        title: Total shards for an index exceeded
-  #      - page: docs-content://troubleshoot/elasticsearch/diagnose-unassigned-shards.md
-  #        title: Not enough nodes to allocate shard replicas
-  #      - page: docs-content://troubleshoot/elasticsearch/index-lifecycle-management-errors.md
-  #        title: Fix index lifecycle management errors
-  #      - page: docs-content://troubleshoot/elasticsearch/monitoring-troubleshooting.md
-  #        title: Troubleshoot monitoring
-  #      - page: docs-content://troubleshoot/elasticsearch/remote-clusters.md
-  #        title: Troubleshoot remote clusters
-  #      - page: docs-content://troubleshoot/elasticsearch/repeated-snapshot-failures.md
-  #        title: Fix repeated snapshot policy failures
-  #      - page: docs-content://troubleshoot/elasticsearch/restore-from-snapshot.md
-  #        title: Restore from snapshot
-  #      - page: docs-content://troubleshoot/elasticsearch/start-ilm.md
-  #        title: Troubleshoot snapshot and ILM
-  #      - page: docs-content://troubleshoot/elasticsearch/transform-troubleshooting.md
-  #        title: Troubleshoot transforms
-  #      - page: docs-content://troubleshoot/elasticsearch/troubleshoot-ingest-pipelines.md
-  #        title: Troubleshoot ingest pipelines
-  #      - page: docs-content://troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
-  #        title: Troubleshoot incomplete migration to data tiers
-  #      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-searches.md
-  #        title: Troubleshoot searches
-  #      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md
-  #        title: Troubleshoot shard capacity health issues
-  #      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-unbalanced-cluster.md
-  #        title: Troubleshoot an unbalanced cluster
-  #      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-unstable-cluster.md
-  #        title: Troubleshoot an unstable cluster
-  #      - page: docs-content://troubleshoot/elasticsearch/watcher-troubleshooting.md
-  #        title: Troubleshoot Watcher
-  #    - group: Troubleshoot Kibana
-  #      children:
-  #      - page: docs-content://troubleshoot/kibana/access.md
-  #        title: Check Kibana server status
-  #      - page: docs-content://troubleshoot/kibana/alerts.md
-  #        title: Troubleshoot Kibana alerts
-  #      - page: docs-content://troubleshoot/kibana/capturing-diagnostics.md
-  #        title: Capture Kibana diagnostics
-  #      - page: docs-content://troubleshoot/kibana/error-server-not-ready.md
-  #        title: "Error: Kibana server is not ready yet"
-  #      - page: docs-content://troubleshoot/kibana/graph.md
-  #        title: Troubleshoot graph analytics
-  #      - page: docs-content://troubleshoot/kibana/maps.md
-  #        title: Troubleshoot Kibana Maps
-  #      - page: docs-content://troubleshoot/kibana/migration-failures.md
-  #        title: Troubleshoot Kibana migration and upgrades
-  #      - page: docs-content://troubleshoot/kibana/monitoring.md
-  #        title: Troubleshoot Kibana monitoring
-  #      - page: docs-content://troubleshoot/kibana/reporting.md
-  #        title: Troubleshoot Kibana reporting
-  #      - page: docs-content://troubleshoot/kibana/task-manager.md
-  #        title: Troubleshoot Kibana Task Manager
-  #      - page: docs-content://troubleshoot/kibana/trace-elasticsearch-query-to-the-origin-in-kibana.md
-  #        title: Trace an Elasticsearch query in Kibana
-  #      - page: docs-content://troubleshoot/kibana/using-kibana-server-logs.md
-  #        title: Using Kibana server logs
-  #    - group: Troubleshoot Observability
-  #      children:
-  #      - page: docs-content://troubleshoot/observability/explore-data.md
-  #        title: Explore data
-  #      - page: docs-content://troubleshoot/observability/inspect.md
-  #        title: Inspect
-  #    - group: Troubleshoot Security
-  #      children:
-  #      - page: docs-content://troubleshoot/security/agentless-integrations.md
-  #        title: Troubleshoot agentless integrations
-  #      - page: docs-content://troubleshoot/security/detection-rules.md
-  #        title: Troubleshoot detection rules
-  #      - page: docs-content://troubleshoot/security/elastic-defend.md
-  #        title: Troubleshoot Elastic Defend
-  #      - page: docs-content://troubleshoot/security/indicators-of-compromise.md
-  #        title: Troubleshoot indicators of compromise
-  #    - group: Troubleshoot ingestion tools
-  #      children:
-  #      - page: docs-content://troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md
-  #        title: Beats logging plugin
-  #      - page: docs-content://troubleshoot/ingest/elastic-serverless-forwarder.md
-  #        title: Troubleshoot Elastic Serverless Forwarder
-  #      - page: docs-content://troubleshoot/ingest/fleet/fleet-elastic-agent.md
-  #        title: Troubleshoot Fleet
-  #      - page: docs-content://troubleshoot/ingest/logstash.md
-  #        title: Troubleshoot Logstash
-  #      - page: docs-content://troubleshoot/ingest/opentelemetry/index.md
-  #        title: Troubleshoot EDOT
 
   - section: Products
     url: /products/
@@ -3302,6 +4300,86 @@ nav:
     url: /reference/
     children:
     - toc: docs-content://reference
+    - toc: elasticsearch://reference/elasticsearch
+    - toc: elasticsearch://reference/elasticsearch-plugins
+    - toc: elasticsearch://reference/community-contributed
+    - toc: kibana://reference
+    - group: Cloud
+      children:
+      - toc: cloud://reference
+      - toc: cloud-on-k8s://reference
+    - group: Elasticsearch clients
+      children:
+      - toc: elasticsearch-java://reference
+      - toc: elasticsearch-js://reference
+      - toc: elasticsearch-dsl-js://reference
+      - toc: elasticsearch-net://reference
+      - toc: elasticsearch-php://reference
+      - toc: elasticsearch-py://reference
+      - toc: elasticsearch-ruby://reference
+      - toc: elasticsearch-rs://reference
+      - toc: eland://reference
+      - toc: go-elasticsearch://reference
+      - toc: curator://reference
+    - group: APM
+      children:
+      - toc: apm-k8s-attacher://reference
+      - toc: apm-aws-lambda://reference
+      - toc: apm-agent-dotnet://reference
+      - toc: apm-agent-go://reference
+      - toc: apm-agent-java://reference
+      - toc: apm-agent-nodejs://reference
+      - toc: apm-agent-php://reference
+      - toc: apm-agent-python://reference
+      - toc: apm-agent-ruby://reference
+      - toc: apm-agent-rum-js://reference
+    - group: OpenTelemetry
+      children:
+      - toc: opentelemetry://reference
+        children:
+        - toc: opentelemetry://reference/motlp
+        - toc: opentelemetry://reference/edot-cloud-forwarder
+          children:
+          - toc: edot-cloud-forwarder-aws://reference/edot-cf-aws
+          - toc: edot-cloud-forwarder-azure://reference/edot-cf-azure
+          - toc: opentelemetry://reference/edot-cloud-forwarder/gcp
+      - toc: elastic-agent://reference/edot-collector
+      - toc: apm-agent-android://reference/edot-android
+      - toc: elastic-otel-dotnet://reference/edot-dotnet
+      - toc: apm-agent-ios://reference/edot-ios
+      - toc: elastic-otel-java://reference/edot-java
+      - toc: elastic-otel-node://reference/edot-node
+      - toc: elastic-otel-php://reference/edot-php
+      - toc: elastic-otel-python://reference/edot-python
+      - toc: elastic-otel-rum-js://reference/edot-browser
+    - group: ECS Logging
+      children:
+      - toc: ecs-logging://reference
+        children:
+        - toc: ecs-dotnet://reference
+        - toc: ecs-logging-go-logrus://reference
+        - toc: ecs-logging-go-zap://reference
+        - toc: ecs-logging-go-zerolog://reference
+        - toc: ecs-logging-java://reference
+        - toc: ecs-logging-nodejs://reference
+        - toc: ecs-logging-php://reference
+        - toc: ecs-logging-python://reference
+        - toc: ecs-logging-ruby://reference
+    - toc: beats://reference
+    - toc: logstash://reference
+    - toc: integration-docs://reference
+    - toc: elasticsearch-hadoop://reference
+    - toc: elastic-serverless-forwarder://reference
+    - toc: ecs://reference
+    - toc: search-ui://reference
+    - toc: elasticsearch://reference/aggregations
+    - toc: ecctl://reference
+    - toc: elasticsearch://reference/enrich-processor
+    - toc: elasticsearch://reference/query-languages
+    - toc: elasticsearch://reference/scripting-languages
+    - page: docs-content://explore-analyze/numeral-formatting.md
+      title: Numeral formatting
+    - toc: elasticsearch://reference/text-analysis
     - island: Logstash plugins
       toc: logstash-docs-md://lsr
     - island: Logstash versioned plugins
@@ -3311,6 +4389,69 @@ nav:
     url: /release-notes/
     children:
     - toc: docs-content://release-notes/intro
+      children:
+        # Elasticsearch
+        - toc: elasticsearch://release-notes
+          children:
+            # Elasticsearch Clients
+            - toc: elasticsearch-java://release-notes
+            - toc: elasticsearch-js://release-notes
+            - toc: elasticsearch-net://release-notes
+            - toc: elasticsearch-php://release-notes
+            - toc: elasticsearch-py://release-notes
+            - toc: elasticsearch-ruby://release-notes
+            # Elasticsearch Hadoop
+            - toc: elasticsearch-hadoop://release-notes
+        # Kibana
+        - toc: kibana://release-notes
+        # Elastic Agent
+        - toc: elastic-agent://release-notes
+        # Fleet Server
+        - toc: fleet-server://release-notes
+        # Logstash
+        - toc: logstash://release-notes
+        # Beats
+        - toc: beats://release-notes
+        # Serverless
+        - toc: docs-content://release-notes/elastic-cloud-serverless
+        # Cloud Hosted
+        - toc: cloud://release-notes/cloud-hosted
+        # Cloud Enterprise
+        - toc: cloud://release-notes/cloud-enterprise
+        # Cloud on Kubernetes
+        - toc: cloud-on-k8s://release-notes
+        # Observability
+        - toc: docs-content://release-notes/elastic-observability
+          children:
+            # EDOT SDKs
+            - toc: apm-agent-android://release-notes
+            - toc: edot-cloud-forwarder-aws://release-notes
+            - toc: apm-agent-ios://release-notes
+            - toc: elastic-otel-java://release-notes
+            - toc: elastic-otel-dotnet://release-notes
+            - toc: elastic-otel-node://release-notes
+            - toc: elastic-otel-python://release-notes
+            - toc: elastic-otel-php://release-notes
+            - toc: elastic-otel-rum-js://release-notes
+            # APM
+            - toc: apm-server://release-notes
+            # APM agents
+            - toc: apm-agent-dotnet://release-notes
+            - toc: apm-agent-go://release-notes
+            - toc: apm-agent-java://release-notes
+            - toc: apm-agent-nodejs://release-notes
+            - toc: apm-agent-php://release-notes
+            - toc: apm-agent-python://release-notes
+            - toc: apm-agent-ruby://release-notes
+            - toc: apm-agent-rum-js://release-notes
+            # APM AWS Lambda Extension
+            - toc: apm-aws-lambda://release-notes
+        # Security
+        - toc: docs-content://release-notes/elastic-security
+        # ECS
+        - toc: ecs://release-notes
+        # ECCTL
+        - toc: ecctl://release-notes
 
   - section: Troubleshoot
     url: /troubleshoot/
@@ -3329,3 +4470,11 @@ nav:
       - toc: elasticsearch://extend
       - toc: integrations://extend
 
+  # Disabled pending a decision on whether to keep the contribute-docs
+  # content in the public site. Re-enable to resurface ~35 pages.
+  # - section: Contribute
+  #   url: /contribute-docs/
+  #   isolated: true
+  #   children:
+  #   - toc: docs-content://contribute-docs
+

From fbc0cd58c84d2575200221a993f1e956c9af3783 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 8 May 2026 10:22:45 +0200
Subject: [PATCH 143/226] Make Products section index a placeholder leaf

The `- page: docs-content://products/index.md / title: Product hubs`
crosslink pointed at a file that does not exist in docs-content, which
caused /products/ to 404. Replace it with `- title: Product hubs` (no
page key) so the placeholder system generates a "Coming soon" stub at
that URL, per the mechanism documented in PR #2927.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 436e1f1469..2a5ba28762 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -4287,8 +4287,7 @@ nav:
     url: /products/
     dropdown: true
     children:
-    - page: docs-content://products/index.md
-      title: Product hubs
+    - title: Product hubs
     - label: Stack products
       children:
       - page: docs-content://products/elasticsearch/v9.md

From 6d5be8b58b9d1e9e523363ea095019a33b51c962 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 8 May 2026 10:23:29 +0200
Subject: [PATCH 144/226] Make Products section index a placeholder leaf

The `- page: docs-content://products/index.md / title: Product hubs`
crosslink pointed at a file that does not exist in docs-content, which
caused /products/ to 404. Replace it with `- title: Product hubs` (no
page key) so the placeholder system generates a "Coming soon" stub at
that URL, per the mechanism documented in PR #2927.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 1969f8185e..823be31735 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -3289,8 +3289,7 @@ nav:
     url: /products/
     dropdown: true
     children:
-    - page: docs-content://products/index.md
-      title: Product hubs
+    - title: Product hubs
     - label: Stack products
       children:
       - page: docs-content://products/elasticsearch/v9.md

From 3b6428b2a1cd1509637d1e66dfc591f306daa981 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri-Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 8 May 2026 10:56:35 +0200
Subject: [PATCH 145/226] Wire most of nav v1 content into nav v2 (#3274)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Backports the YAML fill from demo/findability (PR #3268). Pure additions
to config/navigation-v2.yml within the existing structure — no schema
changes, no new directives. Closes most of the gap between v1 nav and
the nav-v2 prototype.

- Re-enable the commented Reference label and expand it: docs-content
  reference (top-level fanout), elasticsearch core/plugins/community-
  contributed, kibana, Cloud (cloud + cloud-on-k8s), Elasticsearch
  clients (java/js/dsl-js/.net/php/py/ruby/rs, eland, go-elasticsearch,
  curator), APM (k8s-attacher, aws-lambda, all agent libs), OpenTelemetry
  (opentelemetry root + motlp + edot-cloud-forwarder for AWS/Azure/GCP,
  edot-collector, all EDOT SDKs), ECS Logging (root + all per-language
  libs), beats, logstash, integration-docs, elasticsearch-hadoop,
  elastic-serverless-forwarder, ecs, search-ui, ecctl, plus
  aggregations/enrich-processor/query-languages/scripting-languages/
  text-analysis. ~1,200 pages.

- Wire children of 12 deploy-manage landings (security, users-roles,
  monitor, tools, remote-clusters, upgrade, cloud-organization,
  maintenance, api-keys, autoscaling, license, uninstall) under each
  existing `- group:` to preserve curated titles. ~370 pages.

- Convert distributed-architecture leaf entries into groups with
  canonical children: clusters-nodes-shards (node-roles),
  shard-allocation-relocation-recovery (shard-allocation-awareness +
  index-level-shard-allocation w/ delaying-allocation-when-node-leaves),
  discovery-cluster-formation (6 children).

- Convert production-guidance leaf entries into groups with their
  full canonical structure: Run Elasticsearch in production (Design
  for resilience [3 children], Scaling considerations, Performance
  optimizations [6 children]); Run Kibana in production (6 children).

- Convert ingest-reference-architectures leaf into a group with the
  16 canonical children grouped by architecture (Agent to Elasticsearch,
  Agent with Logstash, Agent with Kafka, Air-gapped, Logstash as input,
  Agent through a proxy). Set ingesting-data-for-elastic-solutions.md
  as the "Ingest by solution" group landing. Surface
  manage-data/ingest/tools.md alongside the existing API/upload entries.

- Add Release notes top-level label with the per-product release-notes
  tree (Elasticsearch + clients + Hadoop, Kibana, Elastic Agent,
  Fleet Server, Logstash, Beats, Serverless, Cloud Hosted, Cloud
  Enterprise, Cloud on K8s, Observability with EDOT SDKs and APM
  agents, Security, ECS, ECCTL).

- Add Troubleshoot top-level label as `- toc: docs-content://troubleshoot`
  (covers ~190 pages). Delete the dead Troubleshooting comment block
  whose entries are all already reachable via that toc.

- Replace 57 `{{templated}}` substitution tokens (in titles AND group
  labels) with their literal expansions per docs-content/docset.yml::
  features. The nav renderer does not expand `{{...}}` so leaving
  them caused literal `{{ece}}` etc. to render in the sidebar.

Skipped (depends on features added in later layers of the stack):
- Liam's Search and query rewrite (PR #3094, against this branch).
- Products section (introduced in hub-pages).
- island: entries (Logstash plugins/versioned plugins; needs
  nav-v2-sections).
- Observability page additions on demo (slot under groups added in
  hub-pages stack).

YAML valid. 173/173 navigation tests pass.

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 1110 ++++++++++++++++++++++++++++++++------
 1 file changed, 931 insertions(+), 179 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 1acfbea012..4854f92056 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -29,16 +29,40 @@ nav:
       - group: Distributed architecture
         page: docs-content://deploy-manage/distributed-architecture.md
         children:
-        - page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards.md
-          title: Clusters, nodes, and shards
+        - group: Clusters, nodes, and shards
+          page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards.md
+          children:
+          - page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards/node-roles.md
+            title: Node roles
         - page: docs-content://deploy-manage/distributed-architecture/reading-and-writing-documents.md
           title: Reading and writing documents
-        - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md
-          title: Shard allocation, relocation, and recovery
+        - group: Shard allocation, relocation, and recovery
+          page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md
+          children:
+          - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/shard-allocation-awareness.md
+            title: Shard allocation awareness
+          - group: Index-level shard allocation filtering
+            page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/index-level-shard-allocation.md
+            children:
+            - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/delaying-allocation-when-node-leaves.md
+              title: Delaying allocation when a node leaves
         - page: docs-content://deploy-manage/distributed-architecture/shard-request-cache.md
           title: The shard request cache
-        - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation.md
-          title: Discovery and cluster formation
+        - group: Discovery and cluster formation
+          page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation.md
+          children:
+          - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/discovery-hosts-providers.md
+            title: Discovery hosts providers
+          - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-quorums.md
+            title: Quorum-based decision making
+          - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-voting.md
+            title: Voting configurations
+          - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-bootstrap-cluster.md
+            title: Bootstrapping a cluster
+          - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-state-overview.md
+            title: Cluster state
+          - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-fault-detection.md
+            title: Cluster fault detection
         - page: docs-content://deploy-manage/distributed-architecture/kibana-tasks-management.md
           title: Kibana task management
       - group: Plan your install
@@ -60,10 +84,50 @@ nav:
         - group: Production guidance
           page: docs-content://deploy-manage/production-guidance.md
           children:
-          - page: docs-content://deploy-manage/production-guidance/elasticsearch-in-production-environments.md
-            title: Run Elasticsearch in production
-          - page: docs-content://deploy-manage/production-guidance/kibana-in-production-environments.md
-            title: Run Kibana in production
+          - group: Run Elasticsearch in production
+            page: docs-content://deploy-manage/production-guidance/elasticsearch-in-production-environments.md
+            children:
+            - group: Design for resilience
+              page: docs-content://deploy-manage/production-guidance/availability-and-resilience.md
+              children:
+              - page: docs-content://deploy-manage/production-guidance/availability-and-resilience/resilience-in-small-clusters.md
+                title: Resilience in small clusters
+              - page: docs-content://deploy-manage/production-guidance/availability-and-resilience/resilience-in-larger-clusters.md
+                title: Resilience in larger clusters
+              - page: docs-content://deploy-manage/production-guidance/availability-and-resilience/resilience-in-ech.md
+                title: Resilience in ECH and ECE
+            - page: docs-content://deploy-manage/production-guidance/scaling-considerations.md
+              title: Scaling considerations
+            - group: Performance optimizations
+              page: docs-content://deploy-manage/production-guidance/optimize-performance.md
+              children:
+              - page: docs-content://deploy-manage/production-guidance/general-recommendations.md
+                title: General recommendations
+              - page: docs-content://deploy-manage/production-guidance/optimize-performance/indexing-speed.md
+                title: Tune for indexing speed
+              - page: docs-content://deploy-manage/production-guidance/optimize-performance/search-speed.md
+                title: Tune for search speed
+              - page: docs-content://deploy-manage/production-guidance/optimize-performance/approximate-knn-search.md
+                title: Tune approximate kNN search
+              - page: docs-content://deploy-manage/production-guidance/optimize-performance/disk-usage.md
+                title: Tune for disk usage
+              - page: docs-content://deploy-manage/production-guidance/optimize-performance/size-shards.md
+                title: Size your shards
+          - group: Run Kibana in production
+            page: docs-content://deploy-manage/production-guidance/kibana-in-production-environments.md
+            children:
+            - page: docs-content://deploy-manage/production-guidance/kibana-load-balance-traffic.md
+              title: High availability and load balancing
+            - page: docs-content://deploy-manage/production-guidance/kibana-configure-memory.md
+              title: Configure memory
+            - page: docs-content://deploy-manage/production-guidance/kibana-task-manager-scaling-considerations.md
+              title: Manage background tasks
+            - page: docs-content://deploy-manage/production-guidance/kibana-traffic-scaling-considerations.md
+              title: Traffic scaling considerations
+            - page: docs-content://deploy-manage/production-guidance/kibana-alerting-production-considerations.md
+              title: Optimize alerting performance
+            - page: docs-content://deploy-manage/production-guidance/kibana-reporting-production-considerations.md
+              title: Reporting production considerations
       - group: Install and deploy Elasticsearch
         page: docs-content://deploy-manage/deploy.md
         children:
@@ -694,26 +758,561 @@ nav:
         - label: ───
         - group: Security and encryption
           page: docs-content://deploy-manage/security.md
+          children:
+          - page: docs-content://deploy-manage/security/secure-hosting-environment.md
+            children:
+            - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation.md
+              title: "Elastic Cloud Enterprise"
+              children:
+              - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/manage-security-certificates.md
+              - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/allow-x509-certificates-signed-with-sha-1.md
+              - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/configure-tls-version.md
+              - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/migrate-ece-on-podman-hosts-to-selinux-enforce.md
+            - page: docs-content://deploy-manage/security/secure-your-eck-installation.md
+              title: "Elastic Cloud on Kubernetes"
+          - page: docs-content://deploy-manage/security/secure-your-cluster-deployment.md
+            children:
+            - page: docs-content://deploy-manage/security/self-setup.md
+              title: "Self-managed security setup"
+              children:
+              - page: docs-content://deploy-manage/security/self-auto-setup.md
+                title: "Automatic security setup"
+              - page: docs-content://deploy-manage/security/set-up-minimal-security.md
+                title: "Minimal security setup"
+              - page: docs-content://deploy-manage/security/set-up-basic-security.md
+                title: "Set up transport TLS"
+              - page: docs-content://deploy-manage/security/set-up-basic-security-plus-https.md
+                title: "Set up HTTPS"
+              - page: docs-content://deploy-manage/security/using-kibana-with-security.md
+            - page: docs-content://deploy-manage/security/secure-cluster-communications.md
+              title: "Manage TLS encryption"
+              children:
+              - page: docs-content://deploy-manage/security/self-tls.md
+                title: "Self-managed"
+                children:
+                - page: docs-content://deploy-manage/security/updating-certificates.md
+                  title: "Update TLS certificates"
+                  children:
+                  - page: docs-content://deploy-manage/security/same-ca.md
+                    title: "With the same CA"
+                  - page: docs-content://deploy-manage/security/different-ca.md
+                    title: "With a different CA"
+                - page: docs-content://deploy-manage/security/kibana-es-mutual-tls.md
+                  title: "Mutual authentication"
+                - page: docs-content://deploy-manage/security/supported-ssltls-versions-by-jdk-version.md
+                - page: docs-content://deploy-manage/security/enabling-cipher-suites-for-stronger-encryption.md
+              - page: docs-content://deploy-manage/security/eck-tls.md
+                title: "ECK"
+                children:
+                - page: docs-content://deploy-manage/security/k8s-https-settings.md
+                - page: docs-content://deploy-manage/security/k8s-transport-settings.md
+              - page: docs-content://deploy-manage/security/external-ca-transport.md
+                title: "External CA for TLS"
+            - page: docs-content://deploy-manage/security/network-security.md
+              title: "Network security"
+              children:
+              - page: docs-content://deploy-manage/security/network-security-policies.md
+                title: "How network security policies work in Cloud"
+              - page: docs-content://deploy-manage/security/ece-filter-rules.md
+                title: "How IP filtering rules work in ECE"
+              - page: docs-content://deploy-manage/security/ip-filtering.md
+                title: "Add IP filters"
+                children:
+                - page: docs-content://deploy-manage/security/ip-filtering-cloud.md
+                  title: "In ECH or Serverless"
+                - page: docs-content://deploy-manage/security/ip-filtering-ece.md
+                  title: "In ECE"
+                - page: docs-content://deploy-manage/security/ip-filtering-basic.md
+                  title: "In ECK and Self Managed"
+              - page: docs-content://deploy-manage/security/remote-cluster-filtering.md
+                title: "Remote cluster filters"
+              - page: docs-content://deploy-manage/security/private-connectivity.md
+                children:
+                - page: docs-content://deploy-manage/security/private-connectivity-aws.md
+                  title: "AWS PrivateLink"
+                - page: docs-content://deploy-manage/security/private-connectivity-azure.md
+                  title: "Azure Private Link"
+                - page: docs-content://deploy-manage/security/private-connectivity-gcp.md
+                  title: "GCP Private Service Connect"
+                - page: docs-content://deploy-manage/security/claim-private-connection-api.md
+              - page: docs-content://deploy-manage/security/network-security-api.md
+                title: "Through the API"
+              - page: docs-content://deploy-manage/security/k8s-network-policies.md
+            - page: docs-content://deploy-manage/security/elastic-cloud-static-ips.md
+            - page: docs-content://deploy-manage/security/kibana-session-management.md
+            - page: docs-content://deploy-manage/security/data-security.md
+              children:
+              - page: docs-content://deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md
+            - page: docs-content://deploy-manage/security/secure-settings.md
+              children:
+              - page: docs-content://deploy-manage/security/k8s-secure-settings.md
+            - page: docs-content://deploy-manage/security/secure-saved-objects.md
+            - page: docs-content://deploy-manage/security/logging-configuration/security-event-audit-logging.md
+              children:
+              - page: docs-content://deploy-manage/security/logging-configuration/enabling-audit-logs.md
+              - page: docs-content://deploy-manage/security/logging-configuration/configuring-audit-logs.md
+                children:
+                - page: docs-content://deploy-manage/security/logging-configuration/logfile-audit-events-ignore-policies.md
+                  title: "Elasticsearch audit events ignore policies"
+                - page: docs-content://deploy-manage/security/logging-configuration/logfile-audit-output.md
+                  title: "Elasticsearch logfile output"
+              - page: docs-content://deploy-manage/security/logging-configuration/auditing-search-queries.md
+              - page: docs-content://deploy-manage/security/logging-configuration/correlating-kibana-elasticsearch-audit-logs.md
+                title: "Correlate audit events"
+          - page: docs-content://deploy-manage/security/secure-clients-integrations.md
+          - page: docs-content://deploy-manage/security/httprest-clients-security.md
+          - page: docs-content://deploy-manage/security/limitations.md
+            title: "Limitations"
+          - page: docs-content://deploy-manage/security/fips.md
+            children:
+            - page: docs-content://deploy-manage/security/fips-es.md
+            - page: docs-content://deploy-manage/security/fips-kib.md
+            - page: docs-content://deploy-manage/security/fips-ingest.md
         - group: Authentication and authorization
           page: docs-content://deploy-manage/users-roles.md
+          children:
+          - page: docs-content://deploy-manage/users-roles/cloud-organization.md
+            title: "Cloud organization"
+            children:
+            - page: docs-content://deploy-manage/users-roles/cloud-organization/manage-users.md
+            - page: docs-content://deploy-manage/users-roles/cloud-organization/user-roles.md
+            - page: docs-content://deploy-manage/users-roles/cloud-organization/configure-saml-authentication.md
+              title: "Configure SAML SSO"
+              children:
+              - page: docs-content://deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-okta.md
+                title: "Okta"
+              - page: docs-content://deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-microsoft-entra-id.md
+                title: "Microsoft Entra ID"
+          - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator.md
+            title: "ECE orchestrator"
+            children:
+            - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-system-passwords.md
+            - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-users-roles.md
+              children:
+              - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/native-user-authentication.md
+              - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/active-directory.md
+              - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/ldap.md
+              - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/saml.md
+            - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/configure-sso-for-deployments.md
+          - page: docs-content://deploy-manage/users-roles/serverless-custom-roles.md
+          - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth.md
+            title: "Cluster or deployment"
+            children:
+            - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/quickstart.md
+              title: "Quickstart"
+            - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/user-authentication.md
+              children:
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/authentication-realms.md
+                children:
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/realm-chains.md
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/security-domains.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/internal-authentication.md
+                children:
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/native.md
+                  title: "Native"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/file-based.md
+                  title: "File-based"
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/external-authentication.md
+                children:
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/active-directory.md
+                  title: "Active Directory"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/jwt.md
+                  title: "JWT"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md
+                  title: "Kerberos"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/ldap.md
+                  title: "LDAP"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/openid-connect.md
+                  title: "OpenID Connect"
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/oidc-examples.md
+                    title: "With Azure, Google, or Okta"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/saml.md
+                  title: "SAML"
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/saml-entra.md
+                    title: "With Microsoft Entra ID"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/pki.md
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/custom.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/built-in-users.md
+                title: "Built-in users"
+                children:
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/built-in-sm.md
+                  title: "Change passwords"
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/orchestrator-managed-users-overview.md
+                title: "Orchestrator-managed users"
+                children:
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/manage-elastic-user-cloud.md
+                  title: "ECH and ECE"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/managed-credentials-eck.md
+                  title: "ECK managed credentials"
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kibana-authentication.md
+                title: "Kibana authentication"
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/access-agreement.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/anonymous-access.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/token-based-authentication-services.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/service-accounts.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/internal-users.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges.md
+                children:
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/configure-operator-privileges.md
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/operator-only-functionality.md
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges-for-snapshot-restore.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/user-profiles.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/looking-up-users-without-authentication.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/controlling-user-cache.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/manage-authentication-for-multiple-clusters.md
+            - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/user-roles.md
+              children:
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/defining-roles.md
+                children:
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/role-structure.md
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/granting-privileges-for-data-streams-aliases.md
+                  title: "For data streams and aliases"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kibana-role-management.md
+                  title: "Using Kibana"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/role-restriction.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kibana-privileges.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/mapping-users-groups-to-roles.md
+                title: "Map users and groups to roles"
+                children:
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/role-mapping-resources.md
+                  title: "Role mapping properties"
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/authorization-delegation.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/authorization-plugins.md
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/controlling-access-at-document-field-level.md
+                title: "Control access at the document and field level"
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/submitting-requests-on-behalf-of-other-users.md
+                title: "Submit requests on behalf of other users"
         - group: API keys
           page: docs-content://deploy-manage/api-keys.md
+          children:
+          - page: docs-content://deploy-manage/api-keys/elasticsearch-api-keys.md
+          - page: docs-content://deploy-manage/api-keys/serverless-project-api-keys.md
+          - page: docs-content://deploy-manage/api-keys/elastic-cloud-api-keys.md
+          - page: docs-content://deploy-manage/api-keys/elastic-cloud-enterprise-api-keys.md
         - group: Spaces
           page: docs-content://deploy-manage/manage-spaces.md
         - group: Monitoring
           page: docs-content://deploy-manage/monitor.md
+          children:
+          - page: docs-content://deploy-manage/monitor/autoops.md
+            children:
+            - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-how-to-access.md
+              title: "For Elastic Cloud Hosted"
+            - page: docs-content://deploy-manage/monitor/autoops/autoops-for-serverless.md
+              title: "For Elastic Cloud Serverless"
+              children:
+              - page: docs-content://deploy-manage/monitor/autoops/access-autoops-for-serverless.md
+                title: "Access AutoOps in your project"
+              - page: docs-content://deploy-manage/monitor/autoops/search-tier-view-autoops-serverless.md
+                title: "Search Tier view"
+              - page: docs-content://deploy-manage/monitor/autoops/indexing-tier-view-autoops-serverless.md
+                title: "Indexing Tier view"
+              - page: docs-content://deploy-manage/monitor/autoops/search-ai-lake-view-autoops-serverless.md
+                title: "Search AI Lake view"
+            - page: docs-content://deploy-manage/monitor/autoops/cc-autoops-as-cloud-connected.md
+              title: "For ECE, ECK, and self-managed clusters"
+              children:
+              - page: docs-content://deploy-manage/monitor/autoops/cc-connect-self-managed-to-autoops.md
+                title: "Connect your cluster"
+              - page: docs-content://deploy-manage/monitor/autoops/cc-connect-local-dev-to-autoops.md
+                title: "Connect your local development cluster"
+              - page: docs-content://deploy-manage/monitor/autoops/autoops-sm-custom-certification.md
+                title: "Configure Elastic agent with custom certificate"
+              - page: docs-content://deploy-manage/monitor/autoops/autoops-disable-metrics-collection.md
+                title: "Disable certain types of data collection"
+              - page: docs-content://deploy-manage/monitor/autoops/cc-manage-users.md
+                title: "Manage connected cluster users"
+              - page: docs-content://deploy-manage/monitor/autoops/cc-cloud-connect-autoops-troubleshooting.md
+                title: "Troubleshooting"
+                children:
+                - page: docs-content://deploy-manage/monitor/autoops/autoops-connectivity-check.md
+                  title: "Run the Connectivity Check"
+                - page: docs-content://deploy-manage/monitor/autoops/autoops-sm-troubleshoot-firewalls.md
+                  title: "Firewalls blocking Elastic Agent"
+                - page: docs-content://deploy-manage/monitor/autoops/autoops-sm-troubleshoot-eck-no-clusters.md
+                  title: "Connected clusters not appearing with ECK"
+            - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-regions.md
+              title: "Regions"
+            - page: docs-content://deploy-manage/monitor/autoops/views.md
+              title: "Views"
+              children:
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-overview-view.md
+                title: "Overview"
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-deployment-view.md
+                title: "Deployment or Cluster"
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-nodes-view.md
+                title: "Nodes"
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-index-view.md
+                title: "Indices"
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-shards-view.md
+                title: "Shards"
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-template-optimizer.md
+                title: "Template Optimizer"
+            - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-events.md
+              title: "Events"
+              children:
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-event-settings.md
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-notifications-settings.md
+            - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-faq.md
+              title: "FAQ"
+          - page: docs-content://deploy-manage/monitor/stack-monitoring.md
+            children:
+            - page: docs-content://deploy-manage/monitor/stack-monitoring/ece-ech-stack-monitoring.md
+              title: "Enable on ECH and ECE"
+            - page: docs-content://deploy-manage/monitor/stack-monitoring/eck-stack-monitoring.md
+              title: "Enable on ECK"
+            - page: docs-content://deploy-manage/monitor/stack-monitoring/elasticsearch-monitoring-self-managed.md
+              title: "Self-managed: Elasticsearch"
+              children:
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-elastic-agent.md
+                title: "Collecting monitoring data with Elastic Agent"
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-metricbeat.md
+                title: "Collecting monitoring data with Metricbeat"
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/collecting-log-data-with-filebeat.md
+                title: "Collecting log data with Filebeat"
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/es-self-monitoring-prod.md
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/es-legacy-collection-methods.md
+                title: "Legacy collection methods"
+                children:
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/es-monitoring-collectors.md
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/es-monitoring-exporters.md
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/es-local-exporter.md
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/es-http-exporter.md
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/es-pause-export.md
+            - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-self-managed.md
+              title: "Self-managed: Kibana"
+              children:
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-elastic-agent.md
+                title: "Collect monitoring data with Elastic Agent"
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-metricbeat.md
+                title: "Collect monitoring data with Metricbeat"
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-legacy.md
+                title: "Legacy collection methods"
+            - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
+            - page: docs-content://deploy-manage/monitor/monitoring-data/visualizing-monitoring-data.md
+              children:
+              - page: docs-content://deploy-manage/monitor/monitoring-data/beats-page.md
+              - page: docs-content://deploy-manage/monitor/monitoring-data/elasticsearch-metrics.md
+              - page: docs-content://deploy-manage/monitor/monitoring-data/kibana-page.md
+              - page: docs-content://deploy-manage/monitor/monitoring-data/integrations-server-page.md
+              - page: docs-content://deploy-manage/monitor/monitoring-data/logstash-page.md
+              - page: docs-content://deploy-manage/monitor/monitoring-data/monitor-troubleshooting.md
+                title: "Troubleshooting"
+            - page: docs-content://deploy-manage/monitor/monitoring-data/configure-stack-monitoring-alerts.md
+            - page: docs-content://deploy-manage/monitor/monitoring-data/configuring-data-streamsindices-for-monitoring.md
+              children:
+              - page: docs-content://deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-elastic-agent.md
+              - page: docs-content://deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-metricbeat-8.md
+              - page: docs-content://deploy-manage/monitor/monitoring-data/config-monitoring-indices-metricbeat-7-internal-collection.md
+          - page: docs-content://deploy-manage/monitor/autoops-vs-stack-monitoring.md
+            title: "AutoOps vs. Stack Monitoring"
+          - page: docs-content://deploy-manage/monitor/cloud-health-perf.md
+            title: "Cloud deployment health"
+            children:
+            - page: docs-content://deploy-manage/monitor/access-performance-metrics-on-elastic-cloud.md
+            - page: docs-content://deploy-manage/monitor/ec-memory-pressure.md
+          - page: docs-content://deploy-manage/monitor/kibana-task-manager-health-monitoring.md
+            title: "Kibana task manager monitoring"
+          - page: docs-content://deploy-manage/monitor/orchestrators.md
+            children:
+            - page: docs-content://deploy-manage/monitor/orchestrators/eck-metrics-configuration.md
+              children:
+              - page: docs-content://deploy-manage/monitor/orchestrators/k8s-enabling-metrics-endpoint.md
+              - page: docs-content://deploy-manage/monitor/orchestrators/k8s-securing-metrics-endpoint.md
+              - page: docs-content://deploy-manage/monitor/orchestrators/k8s-prometheus-requirements.md
+            - page: docs-content://deploy-manage/monitor/orchestrators/ece-platform-monitoring.md
+              children:
+              - page: docs-content://deploy-manage/monitor/orchestrators/ece-monitoring-ece-access.md
+              - page: docs-content://deploy-manage/monitor/orchestrators/ece-proxy-log-fields.md
+              - page: docs-content://deploy-manage/monitor/orchestrators/ece-monitoring-ece-set-retention.md
+          - page: docs-content://deploy-manage/monitor/logging-configuration.md
+            children:
+            - page: docs-content://deploy-manage/monitor/logging-configuration/elasticsearch-log4j-configuration-self-managed.md
+            - page: docs-content://deploy-manage/monitor/logging-configuration/update-elasticsearch-logging-levels.md
+            - page: docs-content://deploy-manage/monitor/logging-configuration/elasticsearch-deprecation-logs.md
+            - page: docs-content://deploy-manage/monitor/logging-configuration/slow-logs.md
+            - page: docs-content://deploy-manage/monitor/logging-configuration/kibana-logging.md
+              children:
+              - page: docs-content://deploy-manage/monitor/logging-configuration/kibana-log-levels.md
+              - page: docs-content://deploy-manage/monitor/logging-configuration/kib-advanced-logging.md
+                children:
+                - page: docs-content://deploy-manage/monitor/logging-configuration/kibana-log-settings-examples.md
+                  title: "Examples"
         - page: docs-content://deploy-manage/kibana-reporting-configuration.md
           title: Configure Kibana reporting
         - group: Backup, high availability, and resilience tools
           page: docs-content://deploy-manage/tools.md
+          children:
+          - page: docs-content://deploy-manage/tools/snapshot-and-restore.md
+            children:
+            - page: docs-content://deploy-manage/tools/snapshot-and-restore/manage-snapshot-repositories.md
+              children:
+              - page: docs-content://deploy-manage/tools/snapshot-and-restore/self-managed.md
+                title: "Self-managed"
+                children:
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/azure-repository.md
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/google-cloud-storage-repository.md
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/s3-repository.md
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/shared-file-system-repository.md
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/read-only-url-repository.md
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/source-only-repository.md
+              - page: docs-content://deploy-manage/tools/snapshot-and-restore/elastic-cloud-hosted.md
+                title: "Elastic Cloud Hosted"
+                children:
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md
+                  title: "AWS S3"
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ec-gcs-snapshotting.md
+                  title: "Google Cloud Storage"
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ec-azure-snapshotting.md
+                  title: "Azure Blob Storage"
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/access-isolation-for-found-snapshots-repository.md
+                  children:
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/repository-isolation-on-azure.md
+                    title: "Azure"
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/repository-isolation-on-aws-gcp.md
+                    title: "AWS and GCP"
+              - page: docs-content://deploy-manage/tools/snapshot-and-restore/cloud-enterprise.md
+                title: "Elastic Cloud Enterprise"
+                children:
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md
+                  title: "AWS S3"
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/google-cloud-storage-gcs-repository.md
+                  title: "Google Cloud Storage"
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/azure-storage-repository.md
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/minio-on-premise-repository.md
+              - page: docs-content://deploy-manage/tools/snapshot-and-restore/cloud-on-k8s.md
+                title: "Elastic Cloud on Kubernetes"
+            - page: docs-content://deploy-manage/tools/snapshot-and-restore/create-snapshots.md
+            - page: docs-content://deploy-manage/tools/snapshot-and-restore/restore-snapshot.md
+              children:
+              - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-across-clusters.md
+                children:
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-new-deployment.md
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-existing-deployment.md
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-containing-searchable-snapshots-indices-across-clusters.md
+            - page: docs-content://deploy-manage/tools/snapshot-and-restore/searchable-snapshots.md
+          - page: docs-content://deploy-manage/tools/cross-cluster-replication.md
+            children:
+            - page: docs-content://deploy-manage/tools/cross-cluster-replication/set-up-cross-cluster-replication.md
+              title: "Set up cross-cluster replication"
+              children:
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-getting-started-prerequisites.md
+                title: "Prerequisites"
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_connect_to_a_remote_cluster.md
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_configure_privileges_for_cross_cluster_replication_2.md
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-getting-started-follower-index.md
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-getting-started-auto-follow.md
+            - page: docs-content://deploy-manage/tools/cross-cluster-replication/manage-cross-cluster-replication.md
+              children:
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-inspect-progress.md
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-pause-replication.md
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-recreate-follower-index.md
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-terminate-replication.md
+            - page: docs-content://deploy-manage/tools/cross-cluster-replication/manage-auto-follow-patterns.md
+              children:
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-create.md
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-retrieve.md
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-pause.md
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-delete.md
+            - page: docs-content://deploy-manage/tools/cross-cluster-replication/upgrading-clusters.md
+              title: "Upgrading clusters"
+              children:
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-uni-directional-upgrade.md
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-bi-directional-upgrade.md
+            - page: docs-content://deploy-manage/tools/cross-cluster-replication/uni-directional-disaster-recovery.md
+              title: "Uni-directional disaster recovery"
+              children:
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_prerequisites_14.md
+                title: "Prerequisites"
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down.md
+                title: "Failover when clusterA is down"
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back.md
+                title: "Failback when clusterA comes back"
+            - page: docs-content://deploy-manage/tools/cross-cluster-replication/bi-directional-disaster-recovery.md
+              title: "Bi-directional disaster recovery"
+              children:
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-tutorial-initial-setup.md
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down_2.md
+                title: "Failover when clusterA is down"
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back_2.md
+                title: "Failback when clusterA comes back"
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_perform_update_or_delete_by_query.md
         - group: Autoscaling
           page: docs-content://deploy-manage/autoscaling.md
+          children:
+          - page: docs-content://deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md
+            title: "In ECE and ECH"
+          - page: docs-content://deploy-manage/autoscaling/autoscaling-in-eck.md
+            title: "In ECK"
+          - page: docs-content://deploy-manage/autoscaling/autoscaling-deciders.md
+          - page: docs-content://deploy-manage/autoscaling/trained-model-autoscaling.md
         - page: docs-content://deploy-manage/stack-settings.md
           title: Stack settings
         - page: docs-content://deploy-manage/manage-connectors.md
           title: Connectors
         - group: Remote clusters
           page: docs-content://deploy-manage/remote-clusters.md
+          children:
+          - page: docs-content://deploy-manage/remote-clusters/security-models.md
+            title: "Security models"
+          - page: docs-content://deploy-manage/remote-clusters/connection-modes.md
+            title: "Connection modes"
+          - page: docs-content://deploy-manage/remote-clusters/ec-enable-ccs.md
+            title: "On Elastic Cloud Hosted"
+            children:
+            - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-same-ess.md
+              title: "To the same Elastic Cloud organization"
+            - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-other-ess.md
+              title: "To a different Elastic Cloud organization"
+            - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-ece.md
+              title: "To Elastic Cloud Enterprise"
+            - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-self-managed.md
+              title: "To a self-managed cluster"
+            - page: docs-content://deploy-manage/remote-clusters/ec-enable-ccs-for-eck.md
+              title: "To Elastic Cloud on Kubernetes"
+            - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-strong-identity.md
+              title: "Strong identity verification"
+            - page: docs-content://deploy-manage/remote-clusters/ec-edit-remove-trusted-environment.md
+              title: "Manage trusted environments"
+            - page: docs-content://deploy-manage/remote-clusters/ec-migrate-ccs.md
+              title: "Migrate from the CCS deployment template"
+          - page: docs-content://deploy-manage/remote-clusters/ece-enable-ccs.md
+            title: "On Elastic Cloud Enterprise"
+            children:
+            - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-same-ece.md
+              title: "To the same ECE environment"
+            - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-other-ece.md
+              title: "To a different ECE environment"
+            - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-ece-ess.md
+              title: "To Elastic Cloud"
+            - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-self-managed.md
+              title: "To a self-managed cluster"
+            - page: docs-content://deploy-manage/remote-clusters/ece-enable-ccs-for-eck.md
+              title: "To Elastic Cloud on Kubernetes"
+            - page: docs-content://deploy-manage/remote-clusters/ece-edit-remove-trusted-environment.md
+              title: "Manage trusted environments"
+            - page: docs-content://deploy-manage/remote-clusters/ece-migrate-ccs.md
+              title: "Migrate from the CCS deployment template"
+          - page: docs-content://deploy-manage/remote-clusters/remote-clusters-self-managed.md
+            title: "On self-managed Elastic Stack"
+            children:
+            - page: docs-content://deploy-manage/remote-clusters/remote-clusters-api-key.md
+            - page: docs-content://deploy-manage/remote-clusters/remote-clusters-cert.md
+            - page: docs-content://deploy-manage/remote-clusters/self-remote-cluster-eck.md
+              title: "To Elastic Cloud on Kubernetes"
+            - page: docs-content://deploy-manage/remote-clusters/remote-clusters-migrate.md
+              title: "Migrate from certificate to API key authentication"
+          - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-landing.md
+            title: "On Elastic Cloud on Kubernetes"
+            children:
+            - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters.md
+              title: "To the same ECK environment"
+            - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-to-other-eck.md
+              title: "To a different ECK environment"
+            - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-to-external.md
+              title: "To an external cluster or deployment"
         - group: Cross-project search
           page: docs-content://deploy-manage/cross-project-search-config.md
           children:
@@ -726,14 +1325,115 @@ nav:
         - label: ───
         - group: Maintenance
           page: docs-content://deploy-manage/maintenance.md
+          children:
+          - page: docs-content://deploy-manage/maintenance/ece.md
+            children:
+            - page: docs-content://deploy-manage/maintenance/ece/deployments-maintenance.md
+              children:
+              - page: docs-content://deploy-manage/maintenance/ece/pause-instance.md
+            - page: docs-content://deploy-manage/maintenance/ece/maintenance-activities.md
+              children:
+              - page: docs-content://deploy-manage/maintenance/ece/enable-maintenance-mode.md
+              - page: docs-content://deploy-manage/maintenance/ece/scale-out-installation.md
+              - page: docs-content://deploy-manage/maintenance/ece/move-nodes-instances-from-allocators.md
+              - page: docs-content://deploy-manage/maintenance/ece/perform-ece-hosts-maintenance.md
+              - page: docs-content://deploy-manage/maintenance/ece/delete-ece-hosts.md
+          - page: docs-content://deploy-manage/maintenance/start-stop-services.md
+            children:
+            - page: docs-content://deploy-manage/maintenance/start-stop-services/start-stop-elasticsearch.md
+            - page: docs-content://deploy-manage/maintenance/start-stop-services/start-stop-kibana.md
+            - page: docs-content://deploy-manage/maintenance/start-stop-services/restart-cloud-hosted-deployment.md
+            - page: docs-content://deploy-manage/maintenance/start-stop-services/restart-an-ece-deployment.md
+            - page: docs-content://deploy-manage/maintenance/start-stop-services/full-cluster-restart-rolling-restart-procedures.md
+          - page: docs-content://deploy-manage/maintenance/start-stop-routing-requests.md
+          - page: docs-content://deploy-manage/maintenance/add-and-remove-elasticsearch-nodes.md
         - group: Upgrade
           page: docs-content://deploy-manage/upgrade.md
+          children:
+          - page: docs-content://deploy-manage/upgrade/plan-upgrade.md
+          - page: docs-content://deploy-manage/upgrade/prepare-to-upgrade.md
+            title: "Preparation steps"
+            children:
+            - page: docs-content://deploy-manage/upgrade/prepare-to-upgrade/upgrade-assistant.md
+          - page: docs-content://deploy-manage/upgrade/deployment-or-cluster.md
+            children:
+            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-717.md
+            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ech.md
+              title: "Upgrade on Elastic Cloud Hosted"
+            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ece.md
+              title: "Upgrade on Elastic Cloud Enterprise"
+            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-on-eck.md
+              title: "Upgrade on Elastic Cloud on Kubernetes"
+            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/self-managed.md
+              title: "Upgrade Elastic on a self-managed cluster"
+              children:
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/elasticsearch.md
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-elasticsearch-docker.md
+                title: "Upgrade Elasticsearch running on Docker"
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/kibana.md
+                children:
+                - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/saved-object-migrations.md
+                - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/kibana-roll-back.md
+                  title: "Roll back to a previous version"
+            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/archived-settings.md
+              title: "Archived settings"
+            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/reading-indices-from-older-elasticsearch-versions.md
+              title: "Reading indices from older versions"
+            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/enterprise-search.md
+          - page: docs-content://deploy-manage/upgrade/ingest-components.md
+          - page: docs-content://deploy-manage/upgrade/orchestrator.md
+            title: "Upgrade your ECE or ECK orchestrator"
+            children:
+            - page: docs-content://deploy-manage/upgrade/orchestrator/upgrade-cloud-enterprise.md
+              children:
+              - page: docs-content://deploy-manage/upgrade/orchestrator/re-running-the-ece-upgrade.md
+            - page: docs-content://deploy-manage/upgrade/orchestrator/upgrade-cloud-on-k8s.md
         - group: Uninstall
           page: docs-content://deploy-manage/uninstall.md
+          children:
+          - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md
+          - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-on-kubernetes.md
+          - page: docs-content://deploy-manage/uninstall/delete-a-cloud-deployment.md
+            title: "Delete an orchestrated deployment"
         - group: Licenses and subscriptions
           page: docs-content://deploy-manage/license.md
+          children:
+          - page: docs-content://deploy-manage/license/manage-your-license-in-ece.md
+            title: "Elastic Cloud Enterprise"
+          - page: docs-content://deploy-manage/license/manage-your-license-in-eck.md
+            title: "Elastic Cloud on Kubernetes"
+          - page: docs-content://deploy-manage/license/manage-your-license-in-self-managed-cluster.md
+            title: "Self-managed cluster"
         - group: Manage your Cloud organization
           page: docs-content://deploy-manage/cloud-organization.md
+          children:
+          - page: docs-content://deploy-manage/cloud-organization/billing.md
+            children:
+            - page: docs-content://deploy-manage/cloud-organization/billing/cloud-hosted-deployment-billing-dimensions.md
+              title: "Hosted billing dimensions"
+            - page: docs-content://deploy-manage/cloud-organization/billing/serverless-project-billing-dimensions.md
+              title: "Serverless billing dimensions"
+              children:
+              - page: docs-content://deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md
+                title: "Elasticsearch projects"
+              - page: docs-content://deploy-manage/cloud-organization/billing/elastic-observability-billing-dimensions.md
+                title: "Observability projects"
+              - page: docs-content://deploy-manage/cloud-organization/billing/security-billing-dimensions.md
+                title: "Security projects"
+            - page: docs-content://deploy-manage/cloud-organization/billing/billing-models.md
+            - page: docs-content://deploy-manage/cloud-organization/billing/add-billing-details.md
+            - page: docs-content://deploy-manage/cloud-organization/billing/view-billing-history.md
+            - page: docs-content://deploy-manage/cloud-organization/billing/manage-billing-notifications.md
+              title: "Manage notifications"
+            - page: docs-content://deploy-manage/cloud-organization/billing/manage-subscription.md
+            - page: docs-content://deploy-manage/cloud-organization/billing/monitor-analyze-usage.md
+            - page: docs-content://deploy-manage/cloud-organization/billing/ecu.md
+            - page: docs-content://deploy-manage/cloud-organization/billing/billing-faq.md
+          - page: docs-content://deploy-manage/cloud-organization/operational-emails.md
+          - page: docs-content://deploy-manage/cloud-organization/billing/update-billing-operational-contacts.md
+          - page: docs-content://deploy-manage/cloud-organization/service-status.md
+          - page: docs-content://deploy-manage/cloud-organization/tools-and-apis.md
+            title: "Tools and APIs"
       - group: Deployment and administration tools
         children:
         - toc: ecctl://reference
@@ -747,9 +1447,47 @@ nav:
         children:
         - page: docs-content://manage-data/ingest.md
           title: Choose/Plan your ingest method
-        - page: docs-content://manage-data/ingest/ingest-reference-architectures.md
-          title: Ingest architectures
+        - group: Ingest architectures
+          page: docs-content://manage-data/ingest/ingest-reference-architectures.md
+          children:
+          - group: Agent to Elasticsearch
+            page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-to-es.md
+            children:
+            - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-installed.md
+              title: Elastic Agent (installed)
+            - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-apis.md
+              title: Elastic Agent via APIs
+          - group: Agent with Logstash
+            page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-ls.md
+            children:
+            - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-enrich.md
+              title: Logstash for enrichment
+            - page: docs-content://manage-data/ingest/ingest-reference-architectures/lspq.md
+              title: Logstash persistent queue
+            - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-networkbridge.md
+              title: Logstash as a network bridge
+            - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-multi.md
+              title: Logstash for multiple destinations
+          - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-proxy.md
+            title: Agent through a proxy
+          - group: Agent with Kafka
+            page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-kafka-es.md
+            children:
+            - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-kafka-ls.md
+              title: Agent to Kafka via Logstash
+            - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-kafka-essink.md
+              title: Agent to Kafka with Elasticsearch sink
+          - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-for-input.md
+            title: Logstash as input
+          - group: Air-gapped environments
+            page: docs-content://manage-data/ingest/ingest-reference-architectures/airgapped-env.md
+            children:
+            - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-es-airgapped.md
+              title: Agent to Elasticsearch (air-gapped)
+            - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-ls-airgapped.md
+              title: Agent with Logstash (air-gapped)
         - group: Ingest by solution
+          page: docs-content://manage-data/ingest/ingesting-data-for-elastic-solutions.md
           children:
           - page: docs-content://solutions/search/ingest-for-search.md
             title: Ingesting data for search use cases
@@ -828,6 +1566,8 @@ nav:
           - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-nodejs-web-application-using-filebeat.md
             title: Ingest logs from a Node.js web application using Filebeat
         - title: Ingest data using the API
+        - page: docs-content://manage-data/ingest/tools.md
+          title: Ingest tools overview
         - page: docs-content://manage-data/ingest/upload-data-files.md
           title: Upload data files
         - page: docs-content://manage-data/ingest/sample-data.md
@@ -2149,7 +2889,7 @@ nav:
               title: Reduce storage
             - page: docs-content://solutions/observability/apm/explore-data-in-elasticsearch.md
               title: Explore data in Elasticsearch
-          - group: "Work with {{apm-server}}"
+          - group: "Work with APM Server"
             page: docs-content://solutions/observability/apm/apm-server/index.md
             children:
             - group: Set up
@@ -2184,7 +2924,7 @@ nav:
                 - page: docs-content://solutions/observability/apm/apm-server/configure-elasticsearch-output.md
                   title: Elasticsearch
                 - page: docs-content://solutions/observability/apm/apm-server/configure-logstash-output.md
-                  title: "{{ls}}"
+                  title: "Logstash"
                 - page: docs-content://solutions/observability/apm/apm-server/configure-kafka-output.md
                   title: Kafka
                 - page: docs-content://solutions/observability/apm/apm-server/configure-redis-output.md
@@ -2232,7 +2972,7 @@ nav:
                 - page: docs-content://solutions/observability/apm/apm-server/use-internal-collection-to-send-monitoring-data.md
                   title: Use internal collection
                 - page: docs-content://solutions/observability/apm/apm-server/use-metricbeat-to-send-monitoring-data.md
-                  title: "Use {{metricbeat}} collection"
+                  title: "Use Metricbeat collection"
                 - page: docs-content://solutions/observability/apm/apm-server/use-select-metrics-emitted-directly-to-monitoring-cluster.md
                   title: Use local collection
           - group: APM APIs
@@ -2240,7 +2980,7 @@ nav:
             children:
             - page: docs-content://solutions/observability/apm/apm-ui-api.md
               title: APM UI API
-            - group: "{{apm-server}} API"
+            - group: "APM Server API"
               page: docs-content://solutions/observability/apm/apm-server/api.md
               children:
               - page: docs-content://solutions/observability/apm/apm-server/information-api.md
@@ -2268,16 +3008,16 @@ nav:
               - page: docs-content://solutions/observability/apm/upgrade-self-installation-of-apm-integration-to-9.md
                 title: Self-installation APM integration
               - page: docs-content://solutions/observability/apm/upgrade-elastic-cloud-apm-server-standalone-to-9.md
-                title: "{{ecloud}} standalone"
+                title: "Elastic Cloud standalone"
               - page: docs-content://solutions/observability/apm/upgrade-elastic-cloud-with-apm-integration-to-9.md
-                title: "{{ecloud}} APM integration"
+                title: "Elastic Cloud APM integration"
             - group: Switch to the Elastic APM integration
               page: docs-content://solutions/observability/apm/switch-to-elastic-apm-integration.md
               children:
               - page: docs-content://solutions/observability/apm/switch-self-installation-to-apm-integration.md
                 title: Switch a self-installation
               - page: docs-content://solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md
-                title: "Switch an {{ecloud}} cluster"
+                title: "Switch an Elastic Cloud cluster"
         - group: Synthetic monitoring
           page: docs-content://solutions/observability/synthetics/index.md
           children:
@@ -2371,7 +3111,7 @@ nav:
           children:
           - page: docs-content://solutions/observability/cloud/ingestion-options.md
             title: Ingestion options
-          - group: "Monitor {{aws}} with Elastic Agent"
+          - group: "Monitor AWS with Elastic Agent"
             page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-agent.md
             children:
             - page: docs-content://solutions/observability/cloud/monitor-amazon-cloud-compute-ec2.md
@@ -2383,8 +3123,8 @@ nav:
             - page: docs-content://solutions/observability/cloud/monitor-amazon-simple-queue-service-sqs.md
               title: SQS
           - page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md
-            title: "Monitor {{aws}} with {{beats}}"
-          - group: "Monitor {{aws}} with Amazon Data Firehose"
+            title: "Monitor AWS with Beats"
+          - group: "Monitor AWS with Amazon Data Firehose"
             page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-amazon-data-firehose.md
             children:
             - page: docs-content://solutions/observability/cloud/monitor-virtual-private-cloud-vpc-flow-logs.md
@@ -2398,7 +3138,7 @@ nav:
             - page: docs-content://solutions/observability/cloud/monitor-cloudwatch-logs.md
               title: CloudWatch logs
           - page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-serverless-forwarder.md
-            title: "Monitor {{aws}} with Elastic Serverless Forwarder"
+            title: "Monitor AWS with Elastic Serverless Forwarder"
         - group: Azure
           page: docs-content://solutions/observability/cloud/azure-monitoring.md
           children:
@@ -2694,9 +3434,9 @@ nav:
           page: docs-content://solutions/security/get-started/spaces-elastic-security.md
           children:
           - page: docs-content://solutions/security/get-started/spaces-defend-faq.md
-            title: "Spaces and {{elastic-defend}} FAQ"
+            title: "Spaces and Elastic Defend FAQ"
         - page: docs-content://solutions/security/get-started/data-views-elastic-security.md
-          title: "{{data-sources-cap}} and Elastic Security"
+          title: "Data views and Elastic Security"
         - page: docs-content://solutions/security/get-started/create-runtime-fields-in-elastic-security.md
           title: Create runtime fields in Elastic Security
         - page: docs-content://solutions/security/get-started/configure-advanced-settings.md
@@ -2796,7 +3536,7 @@ nav:
             - page: docs-content://solutions/security/detect-and-alert/threshold.md
               title: Threshold rules
             - page: docs-content://solutions/security/detect-and-alert/machine-learning.md
-              title: "{{ml-cap}} rules"
+              title: "Machine learning rules"
             - page: docs-content://solutions/security/detect-and-alert/new-terms.md
               title: New terms rules
           - page: docs-content://solutions/security/detect-and-alert/using-the-rule-ui.md
@@ -2843,12 +3583,12 @@ nav:
             title: View detection alert details
           - page: docs-content://solutions/security/detect-and-alert/query-alert-indices.md
             title: Query alert indices
-      - group: "Configure endpoint protection with {{elastic-defend}}"
+      - group: "Configure endpoint protection with Elastic Defend"
         page: docs-content://solutions/security/configure-elastic-defend.md
         children:
         - page: docs-content://solutions/security/configure-elastic-defend/elastic-defend-requirements.md
-          title: "{{elastic-defend}} requirements"
-        - group: "Install {{elastic-defend}}"
+          title: "Elastic Defend requirements"
+        - group: "Install Elastic Defend"
           page: docs-content://solutions/security/configure-elastic-defend/install-elastic-defend.md
           children:
           - page: docs-content://solutions/security/configure-elastic-defend/enable-access-for-macos.md
@@ -2858,14 +3598,14 @@ nav:
           - page: docs-content://solutions/security/configure-elastic-defend/prevent-elastic-agent-uninstallation.md
             title: Prevent Elastic Agent uninstallation
         - page: docs-content://solutions/security/configure-elastic-defend/elastic-defend-feature-privileges.md
-          title: "{{elastic-defend}} feature privileges"
-        - group: "Configure an integration policy for {{elastic-defend}}"
+          title: "Elastic Defend feature privileges"
+        - group: "Configure an integration policy for Elastic Defend"
           page: docs-content://solutions/security/configure-elastic-defend/configure-an-integration-policy-for-elastic-defend.md
           children:
           - page: docs-content://solutions/security/configure-elastic-defend/configure-updates-for-protection-artifacts.md
             title: Configure updates for protection artifacts
           - page: docs-content://solutions/security/configure-elastic-defend/turn-off-diagnostic-data-for-elastic-defend.md
-            title: "Turn off diagnostic data for {{elastic-defend}}"
+            title: "Turn off diagnostic data for Elastic Defend"
           - page: docs-content://solutions/security/configure-elastic-defend/configure-self-healing-rollback-for-windows-endpoints.md
             title: Configure self-healing rollback for Windows endpoints
           - page: docs-content://solutions/security/configure-elastic-defend/configure-linux-file-system-monitoring.md
@@ -2878,7 +3618,7 @@ nav:
           title: Configure offline endpoints and air-gapped environments
         - page: docs-content://solutions/security/configure-elastic-defend/uninstall-elastic-agent.md
           title: Uninstall Elastic Agent
-      - group: "Manage {{elastic-defend}}"
+      - group: "Manage Elastic Defend"
         page: docs-content://solutions/security/manage-elastic-defend.md
         children:
         - page: docs-content://solutions/security/manage-elastic-defend/endpoints.md
@@ -2896,17 +3636,17 @@ nav:
         - page: docs-content://solutions/security/manage-elastic-defend/blocklist.md
           title: Blocklist
         - page: docs-content://solutions/security/manage-elastic-defend/optimize-elastic-defend.md
-          title: "Optimize {{elastic-defend}}"
+          title: "Optimize Elastic Defend"
         - page: docs-content://solutions/security/manage-elastic-defend/event-capture-elastic-defend.md
-          title: "Event capture and {{elastic-defend}}"
+          title: "Event capture and Elastic Defend"
         - page: docs-content://solutions/security/manage-elastic-defend/endpoint-protection-rules.md
           title: Endpoint protection rules
         - page: docs-content://solutions/security/manage-elastic-defend/automatic-troubleshooting.md
           title: Automatic troubleshooting
         - page: docs-content://solutions/security/manage-elastic-defend/allowlist-elastic-endpoint-in-third-party-antivirus-apps.md
-          title: "Allowlist {{elastic-endpoint}} in third-party antivirus apps"
+          title: "Allowlist Elastic Endpoint in third-party antivirus apps"
         - page: docs-content://solutions/security/manage-elastic-defend/elastic-endpoint-self-protection-features.md
-          title: "{{elastic-endpoint}} self-protection features"
+          title: "Elastic Endpoint self-protection features"
       - group: Endpoint response actions
         page: docs-content://solutions/security/endpoint-response-actions.md
         children:
@@ -2926,7 +3666,7 @@ nav:
         - page: docs-content://solutions/security/cloud/security-posture-management-overview.md
           title: Security posture management overview
         - page: docs-content://solutions/security/cloud/enable-cloud-security-features.md
-          title: "Enable cloud security features in {{serverless-short}}"
+          title: "Enable cloud security features in Serverless"
         - group: Cloud security posture management
           page: docs-content://solutions/security/cloud/cloud-security-posture-management.md
           children:
@@ -3140,144 +3880,156 @@ nav:
         title: Serverless feature tiers
       - page: docs-content://solutions/security/apis.md
         title: APIs
-#  - label: Reference
-#    children:
-#    - toc: elasticsearch://reference/elasticsearch
-#    - toc: kibana://reference
-#    - group: Cloud
-#      children:
-#      - toc: cloud://reference
-#      - toc: cloud-on-k8s://reference
-#    - toc: docs-content://reference/security
-#    - toc: docs-content://reference/observability
-#    - toc: ecs://reference
-#    - toc: docs-content://reference/machine-learning
-#    - toc: search-ui://reference
-#    - toc: elasticsearch://reference/aggregations
-#    - toc: ecctl://reference
-#    - toc: docs-content://reference/elasticsearch-clients
-#    - toc: elasticsearch://reference/enrich-processor
-#    - toc: elasticsearch://reference/query-languages
-#    - toc: elasticsearch://reference/scripting-languages
-#    - page: docs-content://explore-analyze/numeral-formatting.md
-#      title: Numeral formatting
-#    - toc: elasticsearch://reference/text-analysis
-#    - toc: docs-content://reference/glossary
-#  - label: Troubleshooting
-#    children:
-#    - group: Troubleshoot Elasticsearch
-#      children:
-#      - page: docs-content://troubleshoot/elasticsearch/add-repository.md
-#        title: Troubleshoot broken repositories
-#      - page: docs-content://troubleshoot/elasticsearch/add-tier.md
-#        title: Add a preferred data tier
-#      - page: docs-content://troubleshoot/elasticsearch/allow-all-cluster-allocation.md
-#        title: Allow cluster-wide shard allocation
-#      - page: docs-content://troubleshoot/elasticsearch/allow-all-index-allocation.md
-#        title: Allow index shard allocation
-#      - page: docs-content://troubleshoot/elasticsearch/cluster-allocation-api-examples.md
-#        title: Using the cluster allocation API
-#      - page: docs-content://troubleshoot/elasticsearch/corruption-troubleshooting.md
-#        title: Troubleshoot data corruption
-#      - page: docs-content://troubleshoot/elasticsearch/discovery-troubleshooting.md
-#        title: Troubleshoot discovery
-#      - page: docs-content://troubleshoot/elasticsearch/file-based-recovery.md
-#        title: File-based access recovery
-#      - page: docs-content://troubleshoot/elasticsearch/fix-common-cluster-issues.md
-#        title: Fix common cluster issues
-#      - page: docs-content://troubleshoot/elasticsearch/fix-data-node-out-of-disk.md
-#        title: Fix data nodes out of disk
-#      - page: docs-content://troubleshoot/elasticsearch/fix-master-node-out-of-disk.md
-#        title: Fix master nodes out of disk
-#      - page: docs-content://troubleshoot/elasticsearch/fix-other-node-out-of-disk.md
-#        title: Fix other role nodes out of disk
-#      - page: docs-content://troubleshoot/elasticsearch/fix-watermark-errors.md
-#        title: Watermark errors
-#      - page: docs-content://troubleshoot/elasticsearch/increase-cluster-shard-limit.md
-#        title: Total shards per node has been reached
-#      - page: docs-content://troubleshoot/elasticsearch/increase-shard-limit.md
-#        title: Total shards for an index exceeded
-#      - page: docs-content://troubleshoot/elasticsearch/diagnose-unassigned-shards.md
-#        title: Not enough nodes to allocate shard replicas
-#      - page: docs-content://troubleshoot/elasticsearch/index-lifecycle-management-errors.md
-#        title: Fix index lifecycle management errors
-#      - page: docs-content://troubleshoot/elasticsearch/monitoring-troubleshooting.md
-#        title: Troubleshoot monitoring
-#      - page: docs-content://troubleshoot/elasticsearch/remote-clusters.md
-#        title: Troubleshoot remote clusters
-#      - page: docs-content://troubleshoot/elasticsearch/repeated-snapshot-failures.md
-#        title: Fix repeated snapshot policy failures
-#      - page: docs-content://troubleshoot/elasticsearch/restore-from-snapshot.md
-#        title: Restore from snapshot
-#      - page: docs-content://troubleshoot/elasticsearch/start-ilm.md
-#        title: Troubleshoot snapshot and ILM
-#      - page: docs-content://troubleshoot/elasticsearch/transform-troubleshooting.md
-#        title: Troubleshoot transforms
-#      - page: docs-content://troubleshoot/elasticsearch/troubleshoot-ingest-pipelines.md
-#        title: Troubleshoot ingest pipelines
-#      - page: docs-content://troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
-#        title: Troubleshoot incomplete migration to data tiers
-#      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-searches.md
-#        title: Troubleshoot searches
-#      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md
-#        title: Troubleshoot shard capacity health issues
-#      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-unbalanced-cluster.md
-#        title: Troubleshoot an unbalanced cluster
-#      - page: docs-content://troubleshoot/elasticsearch/troubleshooting-unstable-cluster.md
-#        title: Troubleshoot an unstable cluster
-#      - page: docs-content://troubleshoot/elasticsearch/watcher-troubleshooting.md
-#        title: Troubleshoot Watcher
-#    - group: Troubleshoot Kibana
-#      children:
-#      - page: docs-content://troubleshoot/kibana/access.md
-#        title: Check Kibana server status
-#      - page: docs-content://troubleshoot/kibana/alerts.md
-#        title: Troubleshoot Kibana alerts
-#      - page: docs-content://troubleshoot/kibana/capturing-diagnostics.md
-#        title: Capture Kibana diagnostics
-#      - page: docs-content://troubleshoot/kibana/error-server-not-ready.md
-#        title: "Error: Kibana server is not ready yet"
-#      - page: docs-content://troubleshoot/kibana/graph.md
-#        title: Troubleshoot graph analytics
-#      - page: docs-content://troubleshoot/kibana/maps.md
-#        title: Troubleshoot Kibana Maps
-#      - page: docs-content://troubleshoot/kibana/migration-failures.md
-#        title: Troubleshoot Kibana migration and upgrades
-#      - page: docs-content://troubleshoot/kibana/monitoring.md
-#        title: Troubleshoot Kibana monitoring
-#      - page: docs-content://troubleshoot/kibana/reporting.md
-#        title: Troubleshoot Kibana reporting
-#      - page: docs-content://troubleshoot/kibana/task-manager.md
-#        title: Troubleshoot Kibana Task Manager
-#      - page: docs-content://troubleshoot/kibana/trace-elasticsearch-query-to-the-origin-in-kibana.md
-#        title: Trace an Elasticsearch query in Kibana
-#      - page: docs-content://troubleshoot/kibana/using-kibana-server-logs.md
-#        title: Using Kibana server logs
-#    - group: Troubleshoot Observability
-#      children:
-#      - page: docs-content://troubleshoot/observability/explore-data.md
-#        title: Explore data
-#      - page: docs-content://troubleshoot/observability/inspect.md
-#        title: Inspect
-#    - group: Troubleshoot Security
-#      children:
-#      - page: docs-content://troubleshoot/security/agentless-integrations.md
-#        title: Troubleshoot agentless integrations
-#      - page: docs-content://troubleshoot/security/detection-rules.md
-#        title: Troubleshoot detection rules
-#      - page: docs-content://troubleshoot/security/elastic-defend.md
-#        title: Troubleshoot Elastic Defend
-#      - page: docs-content://troubleshoot/security/indicators-of-compromise.md
-#        title: Troubleshoot indicators of compromise
-#    - group: Troubleshoot ingestion tools
-#      children:
-#      - page: docs-content://troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md
-#        title: Beats logging plugin
-#      - page: docs-content://troubleshoot/ingest/elastic-serverless-forwarder.md
-#        title: Troubleshoot Elastic Serverless Forwarder
-#      - page: docs-content://troubleshoot/ingest/fleet/fleet-elastic-agent.md
-#        title: Troubleshoot Fleet
-#      - page: docs-content://troubleshoot/ingest/logstash.md
-#        title: Troubleshoot Logstash
-#      - page: docs-content://troubleshoot/ingest/opentelemetry/index.md
-#        title: Troubleshoot EDOT
+  - label: Reference
+    children:
+    - toc: docs-content://reference
+    - toc: elasticsearch://reference/elasticsearch
+    - toc: elasticsearch://reference/elasticsearch-plugins
+    - toc: elasticsearch://reference/community-contributed
+    - toc: kibana://reference
+    - group: Cloud
+      children:
+      - toc: cloud://reference
+      - toc: cloud-on-k8s://reference
+    - group: Elasticsearch clients
+      children:
+      - toc: elasticsearch-java://reference
+      - toc: elasticsearch-js://reference
+      - toc: elasticsearch-dsl-js://reference
+      - toc: elasticsearch-net://reference
+      - toc: elasticsearch-php://reference
+      - toc: elasticsearch-py://reference
+      - toc: elasticsearch-ruby://reference
+      - toc: elasticsearch-rs://reference
+      - toc: eland://reference
+      - toc: go-elasticsearch://reference
+      - toc: curator://reference
+    - group: APM
+      children:
+      - toc: apm-k8s-attacher://reference
+      - toc: apm-aws-lambda://reference
+      - toc: apm-agent-dotnet://reference
+      - toc: apm-agent-go://reference
+      - toc: apm-agent-java://reference
+      - toc: apm-agent-nodejs://reference
+      - toc: apm-agent-php://reference
+      - toc: apm-agent-python://reference
+      - toc: apm-agent-ruby://reference
+      - toc: apm-agent-rum-js://reference
+    - group: OpenTelemetry
+      children:
+      - toc: opentelemetry://reference
+        children:
+        - toc: opentelemetry://reference/motlp
+        - toc: opentelemetry://reference/edot-cloud-forwarder
+          children:
+          - toc: edot-cloud-forwarder-aws://reference/edot-cf-aws
+          - toc: edot-cloud-forwarder-azure://reference/edot-cf-azure
+          - toc: opentelemetry://reference/edot-cloud-forwarder/gcp
+      - toc: elastic-agent://reference/edot-collector
+      - toc: apm-agent-android://reference/edot-android
+      - toc: elastic-otel-dotnet://reference/edot-dotnet
+      - toc: apm-agent-ios://reference/edot-ios
+      - toc: elastic-otel-java://reference/edot-java
+      - toc: elastic-otel-node://reference/edot-node
+      - toc: elastic-otel-php://reference/edot-php
+      - toc: elastic-otel-python://reference/edot-python
+      - toc: elastic-otel-rum-js://reference/edot-browser
+    - group: ECS Logging
+      children:
+      - toc: ecs-logging://reference
+        children:
+        - toc: ecs-dotnet://reference
+        - toc: ecs-logging-go-logrus://reference
+        - toc: ecs-logging-go-zap://reference
+        - toc: ecs-logging-go-zerolog://reference
+        - toc: ecs-logging-java://reference
+        - toc: ecs-logging-nodejs://reference
+        - toc: ecs-logging-php://reference
+        - toc: ecs-logging-python://reference
+        - toc: ecs-logging-ruby://reference
+    - toc: beats://reference
+    - toc: logstash://reference
+    - toc: integration-docs://reference
+    - toc: elasticsearch-hadoop://reference
+    - toc: elastic-serverless-forwarder://reference
+    - toc: ecs://reference
+    - toc: search-ui://reference
+    - toc: elasticsearch://reference/aggregations
+    - toc: ecctl://reference
+    - toc: elasticsearch://reference/enrich-processor
+    - toc: elasticsearch://reference/query-languages
+    - toc: elasticsearch://reference/scripting-languages
+    - page: docs-content://explore-analyze/numeral-formatting.md
+      title: Numeral formatting
+    - toc: elasticsearch://reference/text-analysis
+  - label: Release notes
+    children:
+    - toc: docs-content://release-notes/intro
+      children:
+        # Elasticsearch
+        - toc: elasticsearch://release-notes
+          children:
+            # Elasticsearch Clients
+            - toc: elasticsearch-java://release-notes
+            - toc: elasticsearch-js://release-notes
+            - toc: elasticsearch-net://release-notes
+            - toc: elasticsearch-php://release-notes
+            - toc: elasticsearch-py://release-notes
+            - toc: elasticsearch-ruby://release-notes
+            # Elasticsearch Hadoop
+            - toc: elasticsearch-hadoop://release-notes
+        # Kibana
+        - toc: kibana://release-notes
+        # Elastic Agent
+        - toc: elastic-agent://release-notes
+        # Fleet Server
+        - toc: fleet-server://release-notes
+        # Logstash
+        - toc: logstash://release-notes
+        # Beats
+        - toc: beats://release-notes
+        # Serverless
+        - toc: docs-content://release-notes/elastic-cloud-serverless
+        # Cloud Hosted
+        - toc: cloud://release-notes/cloud-hosted
+        # Cloud Enterprise
+        - toc: cloud://release-notes/cloud-enterprise
+        # Cloud on Kubernetes
+        - toc: cloud-on-k8s://release-notes
+        # Observability
+        - toc: docs-content://release-notes/elastic-observability
+          children:
+            # EDOT SDKs
+            - toc: apm-agent-android://release-notes
+            - toc: edot-cloud-forwarder-aws://release-notes
+            - toc: apm-agent-ios://release-notes
+            - toc: elastic-otel-java://release-notes
+            - toc: elastic-otel-dotnet://release-notes
+            - toc: elastic-otel-node://release-notes
+            - toc: elastic-otel-python://release-notes
+            - toc: elastic-otel-php://release-notes
+            - toc: elastic-otel-rum-js://release-notes
+            # APM
+            - toc: apm-server://release-notes
+            # APM agents
+            - toc: apm-agent-dotnet://release-notes
+            - toc: apm-agent-go://release-notes
+            - toc: apm-agent-java://release-notes
+            - toc: apm-agent-nodejs://release-notes
+            - toc: apm-agent-php://release-notes
+            - toc: apm-agent-python://release-notes
+            - toc: apm-agent-ruby://release-notes
+            - toc: apm-agent-rum-js://release-notes
+            # APM AWS Lambda Extension
+            - toc: apm-aws-lambda://release-notes
+        # Security
+        - toc: docs-content://release-notes/elastic-security
+        # ECS
+        - toc: ecs://release-notes
+        # ECCTL
+        - toc: ecctl://release-notes
+
+  - label: Troubleshoot
+    children:
+    - toc: docs-content://troubleshoot

From 80a366e5c8592577f6f69b6375bae292b393a5a8 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 8 May 2026 11:17:51 +0200
Subject: [PATCH 146/226] Revert "Make Products section index a placeholder
 leaf"

This reverts commit 6d5be8b58b9d1e9e523363ea095019a33b51c962.

The Products dropdown is the discovery surface, so /products/ doesn't
need a placeholder landing page. Drops the index entry from the
Products section's children entirely, and switches the dropdown
summary in _SecondaryNav.cshtml from an <a> to a non-clickable
<span> so clicking the title row toggles the dropdown instead of
trying to navigate to a non-existent landing.
---
 config/navigation-v2.yml                                 | 1 -
 .../Layout/_SecondaryNav.cshtml                          | 9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 823be31735..1d2b98bd1d 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -3289,7 +3289,6 @@ nav:
     url: /products/
     dropdown: true
     children:
-    - title: Product hubs
     - label: Stack products
       children:
       - page: docs-content://products/elasticsearch/v9.md
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index 0f9dea550c..596898c90c 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -24,14 +24,7 @@
 						{
 							<details class="secondary-nav-dropdown">
 								<summary class="inline-flex items-center gap-1 cursor-pointer select-none">
-									<a
-										href="@Model.Link(navTab.Url)"
-										@Model.Htmx.GetHxAttributes(
-											hxSwapOob: "#main-container,#secondary-nav"
-										)
-									>
-										@navTab.Label
-									</a>
+									<span class="secondary-nav-dropdown-label">@navTab.Label</span>
 									<svg width="11" height="11" viewBox="0 0 16 16" fill="none" aria-hidden="true" class="secondary-nav-dropdown-chevron">
 										<path d="M4 6l4 4 4-4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 									</svg>

From 113403af1cf85b16d09a16212a290077b5aecb00 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 8 May 2026 11:43:51 +0200
Subject: [PATCH 147/226] Drop all-caps from dropdown subsection labels

The secondary-nav-dropdown-group-label was rendering as uppercase
with letter-spacing (UI-pattern look), which Florent didn't want.
Plain title case at 12px / weight 700 / grey-80 reads cleaner and
matches the rest of the menu typography.
---
 .../Assets/secondary-nav-dropdown.css                       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css b/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css
index ea82bd88da..48580da254 100644
--- a/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css
+++ b/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css
@@ -46,11 +46,9 @@
 
 	.secondary-nav-dropdown-group-label {
 		padding: 8px 14px 4px 14px;
-		font-size: 11px;
+		font-size: 12px;
 		font-weight: 700;
-		letter-spacing: 0.06em;
-		text-transform: uppercase;
-		color: var(--color-grey-70);
+		color: var(--color-grey-80);
 		user-select: none;
 	}
 	.secondary-nav-dropdown-group-label:not(:first-child) {

From d842694e460225868ab79b6d79b37cbcc3d93b8e Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Fri, 8 May 2026 12:03:56 +0200
Subject: [PATCH 148/226] fix(nav-v2): refine folder click activation and
 parent state

Ensure folder rows stay expanded on first re-activation click and introduce an explicit immediate-parent active marker while preserving full ancestor state styling.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/pages-nav-v2.ts                    | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 4dd13f6c51..4ec2a0fc1f 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -72,9 +72,9 @@ function linkPathMatchesCurrentPage(anchor: HTMLAnchorElement) {
 /**
  * Primary click on a folder row link:
  * - When the current page matches the folder row href, toggle expand/collapse only (preventDefault).
- * - When the folder is already expanded but the URL does not match (typical for placeholder
- *   groups like `/_placeholder/...`), toggle closed so a second click collapses the section.
- * - Otherwise open the folder and allow navigation to the row href (e.g. section index).
+ * - Otherwise, ensure the folder is expanded and allow navigation to the row href (e.g. section index).
+ *   This keeps re-activation single-click after a manual collapse; collapsing comes on the next click
+ *   once the folder row becomes current.
  * Skips modified clicks (new tab, etc.). Collapsed folder ids are stored for expandToCurrentPage.
  */
 function ensureNavV2FolderLinkToggle() {
@@ -128,18 +128,11 @@ function ensureNavV2FolderLinkToggle() {
                 return
             }
 
-            if (cb.checked) {
-                cb.checked = false
+            if (!cb.checked) {
+                cb.checked = true
                 cb.dispatchEvent(new Event('change', { bubbles: true }))
                 persistFolderCheckboxCollapsedState(cb)
-                e.preventDefault()
-                e.stopPropagation()
-                return
             }
-
-            cb.checked = true
-            cb.dispatchEvent(new Event('change', { bubbles: true }))
-            persistFolderCheckboxCollapsedState(cb)
         },
         true
     )
@@ -389,12 +382,13 @@ function initNavV2FolderLayoutWarmup(nav: HTMLElement) {
 
 function clearActiveSubtreeHighlight(nav: HTMLElement) {
     nav.querySelectorAll(
-        '.nav-v2-active-subtree, .nav-v2-active-leaf, .nav-v2-active-ancestor'
+        '.nav-v2-active-subtree, .nav-v2-active-leaf, .nav-v2-active-ancestor, .nav-v2-active-parent'
     ).forEach((el) => {
         el.classList.remove(
             'nav-v2-active-subtree',
             'nav-v2-active-leaf',
-            'nav-v2-active-ancestor'
+            'nav-v2-active-ancestor',
+            'nav-v2-active-parent'
         )
     })
 }
@@ -475,10 +469,11 @@ function applyActiveSubtreeHighlight(nav: HTMLElement) {
     }
 
     /*
-     * Walk DOM ancestors: folder rows (li.group-navigation) whose own link is not .current
-     * get nav-v2-active-ancestor (CSS: semibold + #1D2A3E on clickable rows only).
+     * Keep ancestor-state styling across the full chain, but mark only the nearest parent
+     * with nav-v2-active-parent so background treatment can stay scoped to one level.
      */
     let walk: Element | null = hostLi
+    let markedImmediateParent = false
     while (walk && walk !== nav) {
         if (walk.matches('li.group-navigation')) {
             const ancestorRow = walk.querySelector<HTMLAnchorElement>(
@@ -486,6 +481,10 @@ function applyActiveSubtreeHighlight(nav: HTMLElement) {
             )
             if (ancestorRow && ancestorRow !== current) {
                 walk.classList.add('nav-v2-active-ancestor')
+                if (!markedImmediateParent) {
+                    walk.classList.add('nav-v2-active-parent')
+                    markedImmediateParent = true
+                }
             }
         }
 

From f035fad0ff15e5224604f7893cacfb261b01c580 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Fri, 8 May 2026 12:04:03 +0200
Subject: [PATCH 149/226] style(nav-v2): tune sidebar spacing and active/toc
 colors

Align top-level label spacing and active-row visuals with the latest nav spec, and make the right-side On this page links/border keep the nav text color on hover.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/styles.css                         | 76 ++++++++++++++-----
 1 file changed, 57 insertions(+), 19 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index ea2fb59acd..92dbbe380f 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -147,6 +147,17 @@ body {
 			display: block;
 			width: 100%;
 			box-sizing: border-box;
+			color: #516381;
+		}
+
+		& #toc-nav .toc-progress-container a.sidebar-link:hover,
+		& #toc-nav .toc-progress-container a.sidebar-link.current,
+		& #toc-nav .toc-progress-container a.sidebar-link.current:hover {
+			color: #516381;
+		}
+
+		& #toc-nav .toc-progress-container li:hover {
+			border-left-color: #516381 !important;
 		}
 	}
 }
@@ -293,6 +304,13 @@ body:has([data-nav-v2]) aside.sidebar {
 	padding: 0 0 24px 0;
 }
 
+#pages-nav
+	nav[data-nav-v2]
+	ul.docs-sidebar-nav-v2__tree
+	> li:has(> .docs-sidebar-nav-v2__label--top):last-child {
+	padding: 0 0 22px 0;
+}
+
 /* Breathing room when sticky chrome is empty (no search, no product dropdown). */
 #pages-nav
 	nav[data-nav-v2]
@@ -323,10 +341,20 @@ nav.docs-sidebar-nav-v2 {
 	overflow: hidden;
 }
 
+#pages-nav
+	nav.docs-sidebar-nav-v2:has(> ul > li:first-child):not(
+		:has(> ul > li:first-child > .docs-sidebar-nav-v2__label)
+	) {
+	padding: 0 0 22px 0;
+}
+
 /* Nav V2: top-level section titles (with icon) — inherit body font stack */
 nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--top {
-	font-weight: 600;
-	margin: 12px 0 16px 0;
+	font-weight: 700;
+	font-size: 16px;
+	line-height: 24px;
+	color: #343741;
+	margin: 10px 0 10px;
 }
 
 /*
@@ -337,7 +365,7 @@ nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--top {
 #pages-nav
 	nav[data-nav-v2]
 	.docs-sidebar-nav-v2__label--top:has(+ ul.docs-sidebar-nav-v2__subsection) {
-	margin: 12px 0 8px 0;
+	margin: 12px 0 6px;
 }
 
 /* Nav V2: nested subgroup section titles (non-clickable; color never overridden by active path) */
@@ -424,24 +452,22 @@ nav.docs-sidebar-nav-v2
 	position: relative;
 	color: #0b64dd !important;
 	font-weight: 600 !important;
-	background-color: #f6f9fc !important;
+	background-color: #ecf1f9 !important;
 }
 
 #pages-nav nav[data-nav-v2] a.sidebar-link.current:hover {
 	color: #0b64dd;
-	background-color: #f6f9fc !important;
+	background-color: #ecf1f9 !important;
 }
 
 /* Vertical accent on the active page row (blue bar + blue title; chevron uses parent-path ink). */
 #pages-nav nav[data-nav-v2] a.sidebar-link.current::before {
 	content: '';
 	position: absolute;
-	inset-inline-start: 1px;
-	top: 50%;
-	transform: translateY(-50%);
+	inset-inline-start: 3px;
+	top: 6px;
+	bottom: 6px;
 	width: 3px;
-	height: 1.125rem;
-	max-height: calc(100% - 10px);
 	border-radius: 9999px;
 	background-color: var(--color-blue-elastic);
 	pointer-events: none;
@@ -450,7 +476,7 @@ nav.docs-sidebar-nav-v2
 
 /* Nav V2: active section background — subtree vs leaf driven by pages-nav-v2.ts */
 #pages-nav nav[data-nav-v2] li.nav-v2-active-subtree {
-	background-color: transparent;
+	background-color: #f6f9fc;
 	border-radius: 8px;
 }
 
@@ -468,7 +494,7 @@ nav.docs-sidebar-nav-v2
 	nav[data-nav-v2]
 	li.nav-v2-active-subtree
 	a.sidebar-link:not(.current):hover {
-	background-color: #f6f9fc !important;
+	background-color: #ecf1f9 !important;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-subtree a.sidebar-link.current,
@@ -476,14 +502,14 @@ nav.docs-sidebar-nav-v2
 	nav[data-nav-v2]
 	li.nav-v2-active-subtree
 	a.sidebar-link.current:hover {
-	background-color: #f6f9fc !important;
+	background-color: #ecf1f9 !important;
 }
 
 #pages-nav
 	nav[data-nav-v2]
 	li.nav-v2-active-leaf
 	> a.sidebar-link:not(.current):hover {
-	background-color: #f6f9fc !important;
+	background-color: #ecf1f9 !important;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-leaf > a.sidebar-link.current,
@@ -491,7 +517,7 @@ nav.docs-sidebar-nav-v2
 	nav[data-nav-v2]
 	li.nav-v2-active-leaf
 	> a.sidebar-link.current:hover {
-	background-color: #f6f9fc !important;
+	background-color: #ecf1f9 !important;
 }
 
 /*
@@ -507,6 +533,11 @@ nav.docs-sidebar-nav-v2
 	font-weight: 600 !important;
 }
 
+#pages-nav nav[data-nav-v2] li.nav-v2-active-parent {
+	background-color: #f6f9fc;
+	border-radius: 8px;
+}
+
 #pages-nav
 	nav[data-nav-v2]
 	li.nav-v2-active-ancestor
@@ -537,10 +568,17 @@ nav.docs-sidebar-nav-v2
 
 #pages-nav
 	nav[data-nav-v2]
-	li.nav-v2-active-ancestor
+	li.nav-v2-active-parent
+	a.sidebar-link:not(.current):hover {
+	background-color: #ecf1f9 !important;
+}
+
+#pages-nav
+	nav[data-nav-v2]
+	li.nav-v2-active-parent
 	> .nav-folder-peer
 	> a.sidebar-link:not(.current):hover {
-	background-color: #f6f9fc;
+	background-color: #ecf1f9;
 }
 
 #pages-nav
@@ -555,7 +593,7 @@ nav.docs-sidebar-nav-v2
 	min-width: 0;
 }
 
-/* Chevrons: muted by default; active folder row keeps parent-path ink on the icon, not link blue. */
+/* Chevrons: muted by default; active folder row icon follows active blue. */
 #pages-nav nav[data-nav-v2] .nav-folder-chevron {
 	color: #a2b1c9;
 }
@@ -565,7 +603,7 @@ nav.docs-sidebar-nav-v2
 	.nav-folder-peer
 	> a.sidebar-link.current
 	.nav-folder-chevron {
-	color: #1d2a3e;
+	color: #0b64dd;
 }
 
 #pages-nav

From 5defb053b71de5eb6e8b4f6b5a9d5bc93e7b7c1e Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Fri, 8 May 2026 12:04:14 +0200
Subject: [PATCH 150/226] style(toc): use body font and regular utility link
 weight

Switch sidebar utility links and the On this page heading container to the body font stack and normal weight to match the rest of the navigation typography.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Markdown/Layout/_TableOfContents.cshtml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Elastic.Markdown/Layout/_TableOfContents.cshtml b/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
index 57b8bd11fa..8435867997 100644
--- a/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
+++ b/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
@@ -30,7 +30,7 @@
 		
 		<ul class="mt-4 hidden md:flex items-center lg:block gap-4">
 			<li class="view-as-markdown hidden lg:block lg:not-first:mt-1">
-				<a href="@Model.MarkdownUrl" class="link text-sm" target="_blank">
+				<a href="@Model.MarkdownUrl" class="link text-sm font-body font-normal" target="_blank">
 					<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 -1 24 24">
 						<path fill="currentColor" d="M22.131725 19.247H1.9386225C1.0239525 19.247 0.25 18.47305 0.25 17.558375v-11.11675c0 -0.914675 0.7739525 -1.688625 1.6886225 -1.688625H22.061375c0.914675 0 1.688625 0.77395 1.688625 1.688625v11.11675c0 0.914675 -0.7036 1.688625 -1.618275 1.688625ZM1.9386225 5.87875c-0.2814375 0 -0.562875 0.281425 -0.562875 0.562875v11.11675c0 0.3518 0.2814375 0.562875 0.562875 0.562875H22.061375c0.3518 0 0.562875 -0.281425 0.562875 -0.562875v-11.11675c0 -0.3518 -0.281425 -0.562875 -0.562875 -0.562875l-20.1227525 0ZM3.62725 15.86975V8.130225h2.2515l2.2515 2.814375 2.251475 -2.814375h2.2515V15.86975h-2.2515V11.437125L8.13025 14.2515l-2.2515 -2.814375V15.86975h-2.2515Zm14.1422 0L14.392225 12.140725h2.251475v-4.0105h2.2515v3.940125h2.2515L17.76945 15.86975Z" stroke-width="0.25"></path>
 					</svg>
@@ -40,7 +40,7 @@
 			@if (Model.Features.PrimaryNavEnabled && Model.BuildType != BuildType.Codex)
 			{
 				<li class="report-an-issue lg:not-first:mt-1">
-					<a href="@Model.ReportIssueUrl" class="link text-sm" target="_blank">
+					<a href="@Model.ReportIssueUrl" class="link text-sm font-body font-normal" target="_blank">
 						<svg class="link-icon" viewBox="0 0 98 96" xmlns="http://www.w3.org/2000/svg">
 							<path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="currentColor"/>
 						</svg>
@@ -51,7 +51,7 @@
 			@if (!string.IsNullOrEmpty(Model.GithubEditUrl))
 			{
 				<li class="edit-this-page lg:not-first:mt-1 @(Model.HideEditThisPage ? "hidden" : string.Empty)">
-					<a href="@Model.GithubEditUrl" class="link text-sm" target="_blank">
+					<a href="@Model.GithubEditUrl" class="link text-sm font-body font-normal" target="_blank">
 						<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
 							<path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125"/>
 						</svg>
@@ -62,7 +62,7 @@
 			@if (Model.Features.PrimaryNavEnabled && Model.BuildType != BuildType.Codex)
 			{
 				<li class="learn-how-to-contribute hidden lg:block lg:not-first:mt-1">
-					<a href="https://www.elastic.co/docs/contribute-docs/" class="link text-sm" target="_blank">
+					<a href="https://www.elastic.co/docs/contribute-docs/" class="link text-sm font-body font-normal" target="_blank">
 						<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
 							<path fill="currentColor" d="M8.8,0 C9.074,0 9.337,0.113 9.526,0.312 L12.726,3.74 C12.902,3.926 13,4.173 13,4.429 L13,13 C13,13.552 12.552,14 12,14 L2,14 C1.448,14 1,13.552 1,13 L1,1 C1,0.448 1.448,0 2,0 L8.8,0 Z M12,5 L8.5,5 C8.224,5 8,4.776 8,4.5 L8,1 L2,1 L2,13 L12,13 L12,5 Z M4.5,11 C4.22385763,11 4,10.7761424 4,10.5 C4,10.2238576 4.22385763,10 4.5,10 L9.5,10 C9.7761424,10 10,10.2238576 10,10.5 C10,10.7761424 9.7761424,11 9.5,11 L4.5,11 Z M4.5,8 C4.22385763,8 4,7.77614237 4,7.5 C4,7.22385763 4.22385763,7 4.5,7 L9.5,7 C9.7761424,7 10,7.22385763 10,7.5 C10,7.77614237 9.7761424,8 9.5,8 L4.5,8 Z M5.5,16 C5.22385763,16 5,15.7761424 5,15.5 C5,15.2238576 5.22385763,15 5.5,15 L14,15 L14,6.5 C14,6.22385763 14.2238576,6 14.5,6 C14.7761424,6 15,6.22385763 15,6.5 L15,15 C15,15.5522847 14.5522847,16 14,16 L5.5,16 Z"/>
 						</svg>
@@ -100,7 +100,7 @@
 		<div class="pt-6 hidden lg:block">
 			@if (Model.PageTocItems.Count > 0)
 			{
-				<div class="font-sans">
+				<div class="font-body">
 					<div class="font-bold mb-2">On this page</div>
 					<div class="relative toc-progress-container font-body">
 						<div class="toc-progress-indicator absolute top-0 h-0 w-[1px] bg-blue-elastic transition-all duration-200 ease-out "></div>

From 5cbebb3c20777e5faacfba257c231340a560e5ae Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Fri, 8 May 2026 13:17:18 +0200
Subject: [PATCH 151/226] fix(nav-v2): gate first-row top padding override to
 search state

Keep 12px top padding on the first nav-v2 tree item by default, and only collapse it to 0 when navigation search is present in sticky chrome.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Documentation.Site/Assets/styles.css | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index a670b94eb0..f9cbee2455 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -319,18 +319,12 @@ body:has([data-nav-v2]) aside.sidebar {
 	padding-top: 12px;
 }
 
-/* Search / dropdown already add top chrome; drop extra padding on first tree row. */
+/* Search already adds top chrome; drop extra padding on first tree row. */
 #pages-nav
 	#pages-nav-sticky-chrome:has(navigation-search)
 	+ .pages-nav-menu
 	nav[data-nav-v2]
 	ul.docs-sidebar-nav-v2__tree
-	> li:first-child:has(> .docs-sidebar-nav-v2__label--top),
-#pages-nav
-	#pages-nav-sticky-chrome:has(#pages-dropdown)
-	+ .pages-nav-menu
-	nav[data-nav-v2]
-	ul.docs-sidebar-nav-v2__tree
 	> li:first-child:has(> .docs-sidebar-nav-v2__label--top) {
 	padding-top: 0;
 }

From 037f1385e983f0e765abd209e0609d66dc197c45 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Fri, 8 May 2026 12:04:03 +0200
Subject: [PATCH 152/226] style(nav-v2): tune sidebar spacing and active/toc
 colors

Align top-level label spacing and active-row visuals with the latest nav spec, and make the right-side On this page links/border keep the nav text color on hover.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/styles.css                         | 76 ++++++++++++++-----
 1 file changed, 57 insertions(+), 19 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 039ffc2ceb..e56d29d8e2 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -150,6 +150,17 @@ body {
 			display: block;
 			width: 100%;
 			box-sizing: border-box;
+			color: #516381;
+		}
+
+		& #toc-nav .toc-progress-container a.sidebar-link:hover,
+		& #toc-nav .toc-progress-container a.sidebar-link.current,
+		& #toc-nav .toc-progress-container a.sidebar-link.current:hover {
+			color: #516381;
+		}
+
+		& #toc-nav .toc-progress-container li:hover {
+			border-left-color: #516381 !important;
 		}
 	}
 }
@@ -296,6 +307,13 @@ body:has([data-nav-v2]) aside.sidebar {
 	padding: 0 0 24px 0;
 }
 
+#pages-nav
+	nav[data-nav-v2]
+	ul.docs-sidebar-nav-v2__tree
+	> li:has(> .docs-sidebar-nav-v2__label--top):last-child {
+	padding: 0 0 22px 0;
+}
+
 /* Breathing room when sticky chrome is empty (no search, no product dropdown). */
 #pages-nav
 	nav[data-nav-v2]
@@ -326,10 +344,20 @@ nav.docs-sidebar-nav-v2 {
 	overflow: hidden;
 }
 
+#pages-nav
+	nav.docs-sidebar-nav-v2:has(> ul > li:first-child):not(
+		:has(> ul > li:first-child > .docs-sidebar-nav-v2__label)
+	) {
+	padding: 0 0 22px 0;
+}
+
 /* Nav V2: top-level section titles (with icon) — inherit body font stack */
 nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--top {
-	font-weight: 600;
-	margin: 12px 0 16px 0;
+	font-weight: 700;
+	font-size: 16px;
+	line-height: 24px;
+	color: #343741;
+	margin: 10px 0 10px;
 }
 
 /*
@@ -340,7 +368,7 @@ nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--top {
 #pages-nav
 	nav[data-nav-v2]
 	.docs-sidebar-nav-v2__label--top:has(+ ul.docs-sidebar-nav-v2__subsection) {
-	margin: 12px 0 8px 0;
+	margin: 12px 0 6px;
 }
 
 /* Nav V2: nested subgroup section titles (non-clickable; color never overridden by active path) */
@@ -427,24 +455,22 @@ nav.docs-sidebar-nav-v2
 	position: relative;
 	color: #0b64dd !important;
 	font-weight: 600 !important;
-	background-color: #f6f9fc !important;
+	background-color: #ecf1f9 !important;
 }
 
 #pages-nav nav[data-nav-v2] a.sidebar-link.current:hover {
 	color: #0b64dd;
-	background-color: #f6f9fc !important;
+	background-color: #ecf1f9 !important;
 }
 
 /* Vertical accent on the active page row (blue bar + blue title; chevron uses parent-path ink). */
 #pages-nav nav[data-nav-v2] a.sidebar-link.current::before {
 	content: '';
 	position: absolute;
-	inset-inline-start: 1px;
-	top: 50%;
-	transform: translateY(-50%);
+	inset-inline-start: 3px;
+	top: 6px;
+	bottom: 6px;
 	width: 3px;
-	height: 1.125rem;
-	max-height: calc(100% - 10px);
 	border-radius: 9999px;
 	background-color: var(--color-blue-elastic);
 	pointer-events: none;
@@ -453,7 +479,7 @@ nav.docs-sidebar-nav-v2
 
 /* Nav V2: active section background — subtree vs leaf driven by pages-nav-v2.ts */
 #pages-nav nav[data-nav-v2] li.nav-v2-active-subtree {
-	background-color: transparent;
+	background-color: #f6f9fc;
 	border-radius: 8px;
 }
 
@@ -471,7 +497,7 @@ nav.docs-sidebar-nav-v2
 	nav[data-nav-v2]
 	li.nav-v2-active-subtree
 	a.sidebar-link:not(.current):hover {
-	background-color: #f6f9fc !important;
+	background-color: #ecf1f9 !important;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-subtree a.sidebar-link.current,
@@ -479,14 +505,14 @@ nav.docs-sidebar-nav-v2
 	nav[data-nav-v2]
 	li.nav-v2-active-subtree
 	a.sidebar-link.current:hover {
-	background-color: #f6f9fc !important;
+	background-color: #ecf1f9 !important;
 }
 
 #pages-nav
 	nav[data-nav-v2]
 	li.nav-v2-active-leaf
 	> a.sidebar-link:not(.current):hover {
-	background-color: #f6f9fc !important;
+	background-color: #ecf1f9 !important;
 }
 
 #pages-nav nav[data-nav-v2] li.nav-v2-active-leaf > a.sidebar-link.current,
@@ -494,7 +520,7 @@ nav.docs-sidebar-nav-v2
 	nav[data-nav-v2]
 	li.nav-v2-active-leaf
 	> a.sidebar-link.current:hover {
-	background-color: #f6f9fc !important;
+	background-color: #ecf1f9 !important;
 }
 
 /*
@@ -510,6 +536,11 @@ nav.docs-sidebar-nav-v2
 	font-weight: 600 !important;
 }
 
+#pages-nav nav[data-nav-v2] li.nav-v2-active-parent {
+	background-color: #f6f9fc;
+	border-radius: 8px;
+}
+
 #pages-nav
 	nav[data-nav-v2]
 	li.nav-v2-active-ancestor
@@ -540,10 +571,17 @@ nav.docs-sidebar-nav-v2
 
 #pages-nav
 	nav[data-nav-v2]
-	li.nav-v2-active-ancestor
+	li.nav-v2-active-parent
+	a.sidebar-link:not(.current):hover {
+	background-color: #ecf1f9 !important;
+}
+
+#pages-nav
+	nav[data-nav-v2]
+	li.nav-v2-active-parent
 	> .nav-folder-peer
 	> a.sidebar-link:not(.current):hover {
-	background-color: #f6f9fc;
+	background-color: #ecf1f9;
 }
 
 #pages-nav
@@ -558,7 +596,7 @@ nav.docs-sidebar-nav-v2
 	min-width: 0;
 }
 
-/* Chevrons: muted by default; active folder row keeps parent-path ink on the icon, not link blue. */
+/* Chevrons: muted by default; active folder row icon follows active blue. */
 #pages-nav nav[data-nav-v2] .nav-folder-chevron {
 	color: #a2b1c9;
 }
@@ -568,7 +606,7 @@ nav.docs-sidebar-nav-v2
 	.nav-folder-peer
 	> a.sidebar-link.current
 	.nav-folder-chevron {
-	color: #1d2a3e;
+	color: #0b64dd;
 }
 
 #pages-nav

From 9f87d1880dc00e92c3a9841081d1d5af969d51c5 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Fri, 8 May 2026 12:04:14 +0200
Subject: [PATCH 153/226] style(toc): use body font and regular utility link
 weight

Switch sidebar utility links and the On this page heading container to the body font stack and normal weight to match the rest of the navigation typography.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Markdown/Layout/_TableOfContents.cshtml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Elastic.Markdown/Layout/_TableOfContents.cshtml b/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
index 7694b6cfa3..e4f07622eb 100644
--- a/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
+++ b/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
@@ -30,7 +30,7 @@
 		
 		<ul class="mt-4 hidden md:flex items-center lg:block gap-4">
 			<li class="view-as-markdown hidden lg:block lg:not-first:mt-1">
-				<a href="@Model.MarkdownUrl" class="link text-sm" target="_blank">
+				<a href="@Model.MarkdownUrl" class="link text-sm font-body font-normal" target="_blank">
 					<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 -1 24 24">
 						<path fill="currentColor" d="M22.131725 19.247H1.9386225C1.0239525 19.247 0.25 18.47305 0.25 17.558375v-11.11675c0 -0.914675 0.7739525 -1.688625 1.6886225 -1.688625H22.061375c0.914675 0 1.688625 0.77395 1.688625 1.688625v11.11675c0 0.914675 -0.7036 1.688625 -1.618275 1.688625ZM1.9386225 5.87875c-0.2814375 0 -0.562875 0.281425 -0.562875 0.562875v11.11675c0 0.3518 0.2814375 0.562875 0.562875 0.562875H22.061375c0.3518 0 0.562875 -0.281425 0.562875 -0.562875v-11.11675c0 -0.3518 -0.281425 -0.562875 -0.562875 -0.562875l-20.1227525 0ZM3.62725 15.86975V8.130225h2.2515l2.2515 2.814375 2.251475 -2.814375h2.2515V15.86975h-2.2515V11.437125L8.13025 14.2515l-2.2515 -2.814375V15.86975h-2.2515Zm14.1422 0L14.392225 12.140725h2.251475v-4.0105h2.2515v3.940125h2.2515L17.76945 15.86975Z" stroke-width="0.25"></path>
 					</svg>
@@ -40,7 +40,7 @@
 			@if (Model.Features.PrimaryNavEnabled && Model.BuildType != BuildType.Codex && Model.Branding is null)
 			{
 				<li class="report-an-issue lg:not-first:mt-1">
-					<a href="@Model.ReportIssueUrl" class="link text-sm" target="_blank">
+					<a href="@Model.ReportIssueUrl" class="link text-sm font-body font-normal" target="_blank">
 						<svg class="link-icon" viewBox="0 0 98 96" xmlns="http://www.w3.org/2000/svg">
 							<path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="currentColor"/>
 						</svg>
@@ -51,7 +51,7 @@
 			@if (!string.IsNullOrEmpty(Model.GithubEditUrl))
 			{
 				<li class="edit-this-page lg:not-first:mt-1 @(Model.HideEditThisPage ? "hidden" : string.Empty)">
-					<a href="@Model.GithubEditUrl" class="link text-sm" target="_blank">
+					<a href="@Model.GithubEditUrl" class="link text-sm font-body font-normal" target="_blank">
 						<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
 							<path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125"/>
 						</svg>
@@ -62,7 +62,7 @@
 			@if (Model.Features.PrimaryNavEnabled && Model.BuildType != BuildType.Codex && Model.Branding is null)
 			{
 				<li class="learn-how-to-contribute hidden lg:block lg:not-first:mt-1">
-					<a href="https://www.elastic.co/docs/contribute-docs/" class="link text-sm" target="_blank">
+					<a href="https://www.elastic.co/docs/contribute-docs/" class="link text-sm font-body font-normal" target="_blank">
 						<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
 							<path fill="currentColor" d="M8.8,0 C9.074,0 9.337,0.113 9.526,0.312 L12.726,3.74 C12.902,3.926 13,4.173 13,4.429 L13,13 C13,13.552 12.552,14 12,14 L2,14 C1.448,14 1,13.552 1,13 L1,1 C1,0.448 1.448,0 2,0 L8.8,0 Z M12,5 L8.5,5 C8.224,5 8,4.776 8,4.5 L8,1 L2,1 L2,13 L12,13 L12,5 Z M4.5,11 C4.22385763,11 4,10.7761424 4,10.5 C4,10.2238576 4.22385763,10 4.5,10 L9.5,10 C9.7761424,10 10,10.2238576 10,10.5 C10,10.7761424 9.7761424,11 9.5,11 L4.5,11 Z M4.5,8 C4.22385763,8 4,7.77614237 4,7.5 C4,7.22385763 4.22385763,7 4.5,7 L9.5,7 C9.7761424,7 10,7.22385763 10,7.5 C10,7.77614237 9.7761424,8 9.5,8 L4.5,8 Z M5.5,16 C5.22385763,16 5,15.7761424 5,15.5 C5,15.2238576 5.22385763,15 5.5,15 L14,15 L14,6.5 C14,6.22385763 14.2238576,6 14.5,6 C14.7761424,6 15,6.22385763 15,6.5 L15,15 C15,15.5522847 14.5522847,16 14,16 L5.5,16 Z"/>
 						</svg>
@@ -100,7 +100,7 @@
 		<div class="pt-6 hidden lg:block">
 			@if (Model.PageTocItems.Count > 0)
 			{
-				<div class="font-sans">
+				<div class="font-body">
 					<div class="font-bold mb-2">On this page</div>
 					<div class="relative toc-progress-container font-body">
 						<div class="toc-progress-indicator absolute top-0 h-0 w-[1px] bg-blue-elastic transition-all duration-200 ease-out "></div>

From ebe87e3c343ae239fa0a53e25e3d24b7eec10c47 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Fri, 8 May 2026 13:17:18 +0200
Subject: [PATCH 154/226] fix(nav-v2): gate first-row top padding override to
 search state

Keep 12px top padding on the first nav-v2 tree item by default, and only collapse it to 0 when navigation search is present in sticky chrome.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Documentation.Site/Assets/styles.css | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index e56d29d8e2..d3779d4fd3 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -322,18 +322,12 @@ body:has([data-nav-v2]) aside.sidebar {
 	padding-top: 12px;
 }
 
-/* Search / dropdown already add top chrome; drop extra padding on first tree row. */
+/* Search already adds top chrome; drop extra padding on first tree row. */
 #pages-nav
 	#pages-nav-sticky-chrome:has(navigation-search)
 	+ .pages-nav-menu
 	nav[data-nav-v2]
 	ul.docs-sidebar-nav-v2__tree
-	> li:first-child:has(> .docs-sidebar-nav-v2__label--top),
-#pages-nav
-	#pages-nav-sticky-chrome:has(#pages-dropdown)
-	+ .pages-nav-menu
-	nav[data-nav-v2]
-	ul.docs-sidebar-nav-v2__tree
 	> li:first-child:has(> .docs-sidebar-nav-v2__label--top) {
 	padding-top: 0;
 }

From fabad787ef81102fd1131daae2767a31e65ac319 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Fri, 8 May 2026 12:03:56 +0200
Subject: [PATCH 155/226] fix(nav-v2): refine folder click activation and
 parent state

Ensure folder rows stay expanded on first re-activation click and introduce an explicit immediate-parent active marker while preserving full ancestor state styling.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/pages-nav-v2.ts                    | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 7582c5e01b..71c6fb610d 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -89,9 +89,9 @@ function linkPathMatchesCurrentPage(anchor: HTMLAnchorElement) {
 /**
  * Primary click on a folder row link:
  * - When the current page matches the folder row href, toggle expand/collapse only (preventDefault).
- * - When the folder is already expanded but the URL does not match (typical for placeholder
- *   groups like `/_placeholder/...`), toggle closed so a second click collapses the section.
- * - Otherwise open the folder and allow navigation to the row href (e.g. section index).
+ * - Otherwise, ensure the folder is expanded and allow navigation to the row href (e.g. section index).
+ *   This keeps re-activation single-click after a manual collapse; collapsing comes on the next click
+ *   once the folder row becomes current.
  * Skips modified clicks (new tab, etc.). Collapsed folder ids are stored for expandToCurrentPage.
  */
 function ensureNavV2FolderLinkToggle() {
@@ -145,18 +145,11 @@ function ensureNavV2FolderLinkToggle() {
                 return
             }
 
-            if (cb.checked) {
-                cb.checked = false
+            if (!cb.checked) {
+                cb.checked = true
                 cb.dispatchEvent(new Event('change', { bubbles: true }))
                 persistFolderCheckboxCollapsedState(cb)
-                e.preventDefault()
-                e.stopPropagation()
-                return
             }
-
-            cb.checked = true
-            cb.dispatchEvent(new Event('change', { bubbles: true }))
-            persistFolderCheckboxCollapsedState(cb)
         },
         true
     )
@@ -406,12 +399,13 @@ function initNavV2FolderLayoutWarmup(nav: HTMLElement) {
 
 function clearActiveSubtreeHighlight(nav: HTMLElement) {
     nav.querySelectorAll(
-        '.nav-v2-active-subtree, .nav-v2-active-leaf, .nav-v2-active-ancestor'
+        '.nav-v2-active-subtree, .nav-v2-active-leaf, .nav-v2-active-ancestor, .nav-v2-active-parent'
     ).forEach((el) => {
         el.classList.remove(
             'nav-v2-active-subtree',
             'nav-v2-active-leaf',
-            'nav-v2-active-ancestor'
+            'nav-v2-active-ancestor',
+            'nav-v2-active-parent'
         )
     })
 }
@@ -495,10 +489,11 @@ function applyActiveSubtreeHighlight(nav: HTMLElement) {
     }
 
     /*
-     * Walk DOM ancestors: folder rows (li.group-navigation) whose own link is not .current
-     * get nav-v2-active-ancestor (CSS: semibold + #1D2A3E on clickable rows only).
+     * Keep ancestor-state styling across the full chain, but mark only the nearest parent
+     * with nav-v2-active-parent so background treatment can stay scoped to one level.
      */
     let walk: Element | null = hostLi
+    let markedImmediateParent = false
     while (walk && walk !== nav) {
         if (walk.matches('li.group-navigation')) {
             const ancestorRow = walk.querySelector<HTMLAnchorElement>(
@@ -506,6 +501,10 @@ function applyActiveSubtreeHighlight(nav: HTMLElement) {
             )
             if (ancestorRow && ancestorRow !== current) {
                 walk.classList.add('nav-v2-active-ancestor')
+                if (!markedImmediateParent) {
+                    walk.classList.add('nav-v2-active-parent')
+                    markedImmediateParent = true
+                }
             }
         }
 

From 7705629160de60b4b221070e6f9148760cad8ab6 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 8 May 2026 11:17:51 +0200
Subject: [PATCH 156/226] Revert "Make Products section index a placeholder
 leaf"

This reverts commit 6d5be8b58b9d1e9e523363ea095019a33b51c962.

The Products dropdown is the discovery surface, so /products/ doesn't
need a placeholder landing page. Drops the index entry from the
Products section's children entirely, and switches the dropdown
summary in _SecondaryNav.cshtml from an <a> to a non-clickable
<span> so clicking the title row toggles the dropdown instead of
trying to navigate to a non-existent landing.
---
 config/navigation-v2.yml                                 | 1 -
 .../Layout/_SecondaryNav.cshtml                          | 9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 2a5ba28762..b0c86962ed 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -4287,7 +4287,6 @@ nav:
     url: /products/
     dropdown: true
     children:
-    - title: Product hubs
     - label: Stack products
       children:
       - page: docs-content://products/elasticsearch/v9.md
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index 0f9dea550c..596898c90c 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -24,14 +24,7 @@
 						{
 							<details class="secondary-nav-dropdown">
 								<summary class="inline-flex items-center gap-1 cursor-pointer select-none">
-									<a
-										href="@Model.Link(navTab.Url)"
-										@Model.Htmx.GetHxAttributes(
-											hxSwapOob: "#main-container,#secondary-nav"
-										)
-									>
-										@navTab.Label
-									</a>
+									<span class="secondary-nav-dropdown-label">@navTab.Label</span>
 									<svg width="11" height="11" viewBox="0 0 16 16" fill="none" aria-hidden="true" class="secondary-nav-dropdown-chevron">
 										<path d="M4 6l4 4 4-4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 									</svg>

From 2bae01fbf24060fbbbc784c1d4a324de6736af24 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 8 May 2026 11:43:51 +0200
Subject: [PATCH 157/226] Drop all-caps from dropdown subsection labels

The secondary-nav-dropdown-group-label was rendering as uppercase
with letter-spacing (UI-pattern look), which Florent didn't want.
Plain title case at 12px / weight 700 / grey-80 reads cleaner and
matches the rest of the menu typography.
---
 .../Assets/secondary-nav-dropdown.css                       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css b/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css
index ea82bd88da..48580da254 100644
--- a/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css
+++ b/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css
@@ -46,11 +46,9 @@
 
 	.secondary-nav-dropdown-group-label {
 		padding: 8px 14px 4px 14px;
-		font-size: 11px;
+		font-size: 12px;
 		font-weight: 700;
-		letter-spacing: 0.06em;
-		text-transform: uppercase;
-		color: var(--color-grey-70);
+		color: var(--color-grey-80);
 		user-select: none;
 	}
 	.secondary-nav-dropdown-group-label:not(:first-child) {

From 30f393b0ebaa7b792b6f563e5f6ac396b7b4b59b Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Fri, 8 May 2026 19:33:33 +0200
Subject: [PATCH 158/226] Fix Nav V2 previous and next order

Use the V2 navigation tree for footer neighbors so Guides pages remapped through navigation-v2.yml do not fall back to unrelated V1 positions.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../V2/SiteNavigationV2.cs                    | 76 ++++++++++++++++++-
 .../Assembler/SiteNavigationTests.cs          | 76 +++++++++++++++++++
 2 files changed, 151 insertions(+), 1 deletion(-)

diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index c07e24a304..9c2310e9c3 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -19,10 +19,12 @@ namespace Elastic.Documentation.Navigation.V2;
 /// Sections marked <c>isolated: true</c> do not appear in the top bar and render with a back arrow.
 /// </para>
 /// </summary>
-public class SiteNavigationV2 : SiteNavigation
+public class SiteNavigationV2 : SiteNavigation, INavigationTraversable
 {
 	private readonly Dictionary<string, NavigationSection> _urlToSection = new(StringComparer.OrdinalIgnoreCase);
 	private readonly Dictionary<string, NavigationIsland> _tocRootToIsland = new(StringComparer.Ordinal);
+	private readonly Dictionary<int, INavigationItem> _v2NavigationIndexedByOrder;
+	private readonly Dictionary<INavigationItem, int> _v2NavigationIndexByItem;
 
 	public SiteNavigationV2(
 		NavigationV2File v2File,
@@ -34,6 +36,7 @@ public SiteNavigationV2(
 	{
 		var prefix = sitePrefix ?? string.Empty;
 		V2NavigationItems = BuildV2Items(v2File.Nav, Nodes, this, prefix);
+		(_v2NavigationIndexedByOrder, _v2NavigationIndexByItem) = BuildV2NavigationOrder(V2NavigationItems);
 		RegisterV2PageLookups();
 		Sections = BuildSections(V2NavigationItems);
 		Islands = BuildIslands(Sections);
@@ -66,6 +69,18 @@ public SiteNavigationV2(
 	public NavigationIsland? GetIslandForTocRoot(IRootNavigationItem<INavigationModel, INavigationItem> tocRoot) =>
 		_tocRootToIsland.GetValueOrDefault(tocRoot.Id);
 
+	INavigationItem? INavigationTraversable.GetPrevious(IDocumentationFile current)
+	{
+		var currentNavigation = GetNavigationForFile(current);
+		return GetAdjacent(currentNavigation, direction: -1);
+	}
+
+	INavigationItem? INavigationTraversable.GetNext(IDocumentationFile current)
+	{
+		var currentNavigation = GetNavigationForFile(current);
+		return GetAdjacent(currentNavigation, direction: 1);
+	}
+
 	/// <summary>
 	/// Resolves which section a page belongs to by its URL.
 	/// Returns the first non-isolated section as fallback for unresolved URLs.
@@ -83,6 +98,65 @@ public SiteNavigationV2(
 		return Sections.FirstOrDefault(s => !s.Isolated);
 	}
 
+	private INavigationItem GetNavigationForFile(IDocumentationFile file) =>
+		NavigationDocumentationFileLookup.TryGetValue(file, out var navigation)
+			? navigation : throw new InvalidOperationException($"Could not find {file.NavigationTitle} in navigation");
+
+	private INavigationItem? GetAdjacent(INavigationItem currentNavigation, int direction)
+	{
+		var order = GetNavigationOrder(currentNavigation, out var index);
+		for (var nextIndex = index + direction; nextIndex >= 0 && nextIndex <= order.Count - 1; nextIndex += direction)
+		{
+			if (order.TryGetValue(nextIndex, out var adjacent) && IsNavigableAdjacent(adjacent, currentNavigation))
+				return adjacent;
+		}
+
+		return null;
+	}
+
+	private IReadOnlyDictionary<int, INavigationItem> GetNavigationOrder(INavigationItem currentNavigation, out int index)
+	{
+		if (_v2NavigationIndexByItem.TryGetValue(currentNavigation, out index))
+			return _v2NavigationIndexedByOrder;
+
+		index = currentNavigation.NavigationIndex;
+		return NavigationIndexedByOrder;
+	}
+
+	private static bool IsNavigableAdjacent(INavigationItem adjacent, INavigationItem current) =>
+		!adjacent.Hidden && !string.IsNullOrEmpty(adjacent.Url) && adjacent.Url != current.Url;
+
+	private static (Dictionary<int, INavigationItem> ByOrder, Dictionary<INavigationItem, int> ByItem) BuildV2NavigationOrder(IReadOnlyList<INavigationItem> items)
+	{
+		var byOrder = new Dictionary<int, INavigationItem>();
+		var byItem = new Dictionary<INavigationItem, int>(ReferenceEqualityComparer.Instance);
+		var index = -1;
+
+		foreach (var item in items)
+			AddItem(item);
+
+		return (byOrder, byItem);
+
+		void AddItem(INavigationItem item)
+		{
+			var currentIndex = ++index;
+			byOrder.Add(currentIndex, item);
+			_ = byItem.TryAdd(item, currentIndex);
+
+			switch (item)
+			{
+				case INodeNavigationItem<IDocumentationFile, INavigationItem> documentationNode:
+					foreach (var child in documentationNode.NavigationItems)
+						AddItem(child);
+					break;
+				case INodeNavigationItem<INavigationModel, INavigationItem> node:
+					foreach (var child in node.NavigationItems)
+						AddItem(child);
+					break;
+			}
+		}
+	}
+
 	private static IReadOnlyList<NavigationSection> BuildSections(IReadOnlyList<INavigationItem> items) =>
 		items
 			.OfType<SectionNavigationNode>()
diff --git a/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs b/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs
index 27daf3f7cb..33fd14d392 100644
--- a/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs
+++ b/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs
@@ -382,6 +382,82 @@ public void SiteNavigationV2PageEntriesResolveFilesFromUnseenChildTocs()
 		navigationItem.Url.Should().Be("/docs/products/elasticsearch/v9");
 	}
 
+	[Fact]
+	public void SiteNavigationV2PageEntriesUseV2OrderForPrevNext()
+	{
+		var fileSystem = new MockFileSystem();
+		var docsContentDir = "/checkouts/current/docs-content";
+
+		// language=yaml
+		var docsetYaml = """
+		                 project: Docs content
+		                 toc:
+		                   - file: index.md
+		                   - file: archive.md
+		                   - file: first.md
+		                   - file: second.md
+		                 """;
+		fileSystem.AddFile($"{docsContentDir}/docs/docset.yml", new MockFileData(docsetYaml));
+		fileSystem.AddFile($"{docsContentDir}/docs/index.md", new MockFileData("# Docs content"));
+		fileSystem.AddFile($"{docsContentDir}/docs/archive.md", new MockFileData("# Documentation archive"));
+		fileSystem.AddFile($"{docsContentDir}/docs/first.md", new MockFileData("# First page"));
+		fileSystem.AddFile($"{docsContentDir}/docs/second.md", new MockFileData("# Second page"));
+
+		// language=yaml
+		var siteNavYaml = """
+		                  toc:
+		                    - toc: docs-content://
+		                      path_prefix: /
+		                  """;
+		var siteNavFile = SiteNavigationFile.Deserialize(siteNavYaml);
+
+		// language=yaml
+		var v2NavYaml = """
+		                nav:
+		                  - section: Guides
+		                    url: /
+		                    children:
+		                      - page: docs-content://first.md
+		                        title: First page
+		                      - page: docs-content://second.md
+		                        title: Second page
+		                """;
+		var v2File = NavigationV2File.Deserialize(v2NavYaml);
+
+		var docsContentContext = SiteNavigationTestFixture.CreateAssemblerContext(fileSystem, docsContentDir, output);
+		var docset = DocumentationSetFile.LoadAndResolve(
+			docsContentContext.Collector,
+			fileSystem.FileInfo.New($"{docsContentDir}/docs/docset.yml"),
+			FileSystemFactory.ScopeSourceDirectory(fileSystem, "/checkouts")
+		);
+		var docsContentNav = new DocumentationSetNavigation<IDocumentationFile>(
+			docset,
+			docsContentContext,
+			GenericDocumentationFileFactory.Instance
+		);
+
+		var siteContext = SiteNavigationTestFixture.CreateAssemblerContext(fileSystem, docsContentDir, output);
+		var navigation = new SiteNavigationV2(v2File, siteNavFile, siteContext, [docsContentNav], sitePrefix: "docs");
+		var docsContentRoot = navigation.Nodes[new Uri("docs-content://")];
+		var v1Pages = docsContentRoot.NavigationItems
+			.OfType<ILeafNavigationItem<IDocumentationFile>>()
+			.ToArray();
+		var firstFile = v1Pages.Single(i => i.Model.NavigationTitle == "First page").Model;
+		var secondFile = v1Pages.Single(i => i.Model.NavigationTitle == "Second page").Model;
+
+		var next = ((INavigationTraversable)navigation).GetNext(firstFile);
+		var previous = ((INavigationTraversable)navigation).GetPrevious(secondFile);
+
+		next.Should().NotBeNull();
+		var nextItem = next ?? throw new InvalidOperationException("Expected a V2 next navigation item.");
+		nextItem.NavigationTitle.Should().Be("Second page");
+		nextItem.Url.Should().Be("/docs/second");
+		previous.Should().NotBeNull();
+		var previousItem = previous ?? throw new InvalidOperationException("Expected a V2 previous navigation item.");
+		previousItem.NavigationTitle.Should().Be("First page");
+		previousItem.Url.Should().Be("/docs/first");
+	}
+
 	[Fact]
 	public void SiteNavigationResolvesFilesFromUnseenChildTocs()
 	{

From 88976b8719ed4e18e469b510afab738647142513 Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Fri, 8 May 2026 17:39:41 -0500
Subject: [PATCH 159/226] Redesign landing page with tabbed navigation and
 simplified layout

Replaces section-based layout with a tab-driven design:
- Search-first hero with no subtitle
- Platform / Solutions / Deploy tabs with product cards
- Streamlined Get started section (concepts, local, cloud trial)
- Flat all-products grid categorized by platform, solutions, deploy,
  ingest tools, query languages, APM agents, and developer tools

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Layout/_LandingPage.cshtml                | 752 ++++++++----------
 1 file changed, 325 insertions(+), 427 deletions(-)

diff --git a/src/Elastic.Markdown/Layout/_LandingPage.cshtml b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
index 4f45273501..e93c7870f1 100644
--- a/src/Elastic.Markdown/Layout/_LandingPage.cshtml
+++ b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
@@ -47,11 +47,6 @@
     letter-spacing: -0.02em;
     margin-bottom: 10px;
   }
-  .hero p {
-    font-size: 15px;
-    color: var(--text-secondary);
-    margin-bottom: 28px;
-  }
   .search-wrap {
     max-width: 640px;
     margin: 0 auto 16px;
@@ -65,26 +60,8 @@
     color: var(--text-muted);
     pointer-events: none;
   }
-  .search-wrap input {
-    width: 100%;
-    height: 52px;
-    border: 2px solid var(--border);
-    border-radius: var(--radius);
-    padding: 0 16px 0 48px;
-    font-size: 16px;
-    font-family: var(--font);
-    background: var(--surface);
-    color: var(--text);
-    transition: border-color 0.15s, box-shadow 0.15s;
-    outline: none;
-  }
-  .search-wrap input::placeholder { color: var(--text-muted); }
-  .search-wrap input:focus {
-    border-color: var(--accent);
-    box-shadow: 0 0 0 3px rgba(0,119,204,0.12);
-  }
 
-  /* ── Quick destinations ── */
+  /* ── Section layout ── */
   .section { max-width: var(--max-w); margin: 0 auto; padding: 40px 24px 0; }
   .section-header {
     display: flex;
@@ -95,43 +72,6 @@
   .section-header h2 { font-size: 17px; font-weight: 700; letter-spacing: -0.01em; }
   .section-header a { font-size: 13px; font-weight: 500; }
 
-  .quick-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
-    gap: 12px;
-  }
-  .quick-card {
-    background: var(--surface);
-    border: 1px solid var(--border-light);
-    border-radius: var(--radius);
-    padding: 18px 20px;
-    display: flex;
-    align-items: flex-start;
-    gap: 14px;
-    transition: box-shadow 0.15s, border-color 0.15s;
-    cursor: pointer;
-    text-decoration: none;
-    color: var(--text);
-  }
-  .quick-card:hover {
-    border-color: var(--accent);
-    box-shadow: var(--shadow);
-    color: var(--text);
-  }
-  .quick-card .icon {
-    width: 40px;
-    height: 40px;
-    border-radius: var(--radius-sm);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-shrink: 0;
-    font-size: 18px;
-  }
-  .quick-card .card-text h3 { font-size: 14px; font-weight: 600; margin-bottom: 3px; }
-  .quick-card .card-text p { font-size: 13px; color: var(--text-secondary); line-height: 1.4; }
-  .quick-card .card-text .meta { font-size: 12px; color: var(--text-muted); margin-top: 4px; }
-
   /* Icon color variants */
   .icon-blue { background: var(--accent-bg); color: var(--accent); }
   .icon-green { background: var(--green-bg); color: var(--green); }
@@ -139,147 +79,86 @@
   .icon-purple { background: var(--purple-bg); color: var(--purple); }
   .icon-pink { background: var(--pink-bg); color: var(--pink); }
 
-  /* ── Version banner ── */
-  .version-banner {
-    max-width: var(--max-w);
-    margin: 40px auto 0;
-    padding: 0 24px;
-  }
-  .version-banner-inner {
-    background: linear-gradient(135deg, #f8f9fb 0%, #eef2f7 100%);
-    border: 1px solid var(--border);
-    border-radius: var(--radius);
-    padding: 20px 24px;
+  /* ── Tabbed products ── */
+  .tabs-nav {
     display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 20px;
-    flex-wrap: wrap;
-  }
-  .version-banner-inner .vb-text { flex: 1; min-width: 200px; }
-  .version-banner-inner .vb-text h3 { font-size: 14px; font-weight: 600; margin-bottom: 3px; }
-  .version-banner-inner .vb-text p { font-size: 13px; color: var(--text-secondary); }
-  .version-banner-inner .vb-actions { display: flex; gap: 10px; flex-wrap: wrap; }
-  .btn {
-    display: inline-flex;
-    align-items: center;
-    gap: 6px;
-    padding: 8px 18px;
-    border-radius: var(--radius-sm);
+    gap: 0;
+    border-bottom: 2px solid var(--border);
+    margin-bottom: 20px;
+    overflow-x: auto;
+    -webkit-overflow-scrolling: touch;
+  }
+  .tabs-nav button {
+    background: none;
+    border: none;
+    border-bottom: 2px solid transparent;
+    margin-bottom: -2px;
+    padding: 10px 18px;
+    font-family: var(--font);
     font-size: 13px;
     font-weight: 600;
-    font-family: var(--font);
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+    color: var(--text-muted);
     cursor: pointer;
-    transition: background 0.15s, box-shadow 0.15s;
-    border: none;
-    text-decoration: none;
-  }
-  .btn-primary { background: var(--accent); color: #fff; }
-  .btn-primary:hover { background: var(--accent-hover); color: #fff; }
-  .btn-outline { background: var(--surface); color: var(--text-secondary); border: 1px solid var(--border); }
-  .btn-outline:hover { border-color: var(--accent); color: var(--accent); background: var(--accent-bg); }
-
-  /* ── Product sections ── */
-  .products-grid {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    gap: 16px;
-  }
-  @@media (max-width: 800px) {
-    .products-grid { grid-template-columns: 1fr; }
-  }
-  .product-card {
-    background: var(--surface);
-    border: 1px solid var(--border-light);
-    border-radius: var(--radius);
-    padding: 24px;
-    transition: box-shadow 0.15s;
-  }
-  .product-card:hover { box-shadow: var(--shadow); }
-  .product-card h3 {
-    font-size: 16px;
-    font-weight: 700;
-    margin-bottom: 6px;
-    display: flex;
-    align-items: center;
-    gap: 8px;
+    white-space: nowrap;
+    transition: color 0.15s, border-color 0.15s;
   }
-  .product-card h3 .dot {
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    flex-shrink: 0;
+  .tabs-nav button:hover { color: var(--text-secondary); }
+  .tabs-nav button.active {
+    color: var(--accent);
+    border-bottom-color: var(--accent);
   }
-  .product-card > p { font-size: 13px; color: var(--text-secondary); margin-bottom: 16px; line-height: 1.5; }
-  .product-card ul { list-style: none; }
-  .product-card ul li { border-top: 1px solid var(--border-light); }
-  .product-card ul li a {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 10px 0;
-    font-size: 14px;
-    color: var(--text);
-    transition: color 0.15s;
-  }
-  .product-card ul li a:hover { color: var(--accent); }
-  .product-card ul li a .arrow { color: var(--text-muted); font-size: 14px; transition: transform 0.15s, color 0.15s; }
-  .product-card ul li a:hover .arrow { transform: translateX(3px); color: var(--accent); }
+  .tab-panel { display: none; }
+  .tab-panel.active { display: flex; flex-wrap: wrap; gap: 10px; }
 
-  /* ── Product index (categorized) ── */
-  .product-index {
+  /* Tab cards */
+  .tab-cards {
     display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    gap: 16px;
-  }
-  @@media (max-width: 800px) {
-    .product-index { grid-template-columns: 1fr; }
+    grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+    gap: 14px;
+    width: 100%;
   }
-  .pi-category {
+  .tab-card {
     background: var(--surface);
     border: 1px solid var(--border-light);
     border-radius: var(--radius);
-    padding: 18px 20px;
+    padding: 20px;
+    transition: box-shadow 0.15s, border-color 0.15s;
   }
-  .pi-category h4 {
-    font-size: 12px;
+  .tab-card:hover { border-color: var(--border); box-shadow: var(--shadow-sm); }
+  .tab-card h4 {
+    font-size: 15px;
     font-weight: 700;
-    text-transform: uppercase;
-    letter-spacing: 0.06em;
-    color: var(--text-muted);
     margin-bottom: 10px;
   }
-  .pi-category ul { list-style: none; }
-  .pi-category ul li + li { border-top: 1px solid var(--border-light); }
-  .pi-category ul li a {
+  .tab-card ul { list-style: none; }
+  .tab-card ul li + li { border-top: 1px solid var(--border-light); }
+  .tab-card ul li a {
     display: block;
-    padding: 8px 0;
-    font-size: 14px;
-    font-weight: 500;
-    color: var(--text);
+    padding: 7px 0;
+    font-size: 13px;
+    color: var(--accent);
     text-decoration: none;
     transition: color 0.12s;
   }
-  .pi-category ul li a:hover { color: var(--accent); }
+  .tab-card ul li a:hover { color: var(--accent-hover); }
 
-  /* ── Reference & API strip ── */
-  .ref-strip {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
-    gap: 12px;
+  /* ── Top tabs (below search) ── */
+  .top-tabs {
+    max-width: var(--max-w);
+    margin: 0 auto;
+    padding: 0 24px 8px;
   }
-  .ref-item {
-    background: var(--surface);
-    border: 1px solid var(--border-light);
-    border-radius: var(--radius-sm);
-    padding: 16px;
-    text-decoration: none;
-    color: var(--text);
-    transition: box-shadow 0.15s, border-color 0.15s;
+  .top-tabs .tabs-nav { margin-bottom: 20px; justify-content: center; }
+
+  /* ── Page layout ── */
+  .page-layout {
+    max-width: var(--max-w);
+    margin: 0 auto;
+    padding: 0 24px;
   }
-  .ref-item:hover { border-color: var(--accent); box-shadow: var(--shadow-sm); color: var(--text); }
-  .ref-item h4 { font-size: 14px; font-weight: 600; margin-bottom: 3px; }
-  .ref-item p { font-size: 12px; color: var(--text-muted); }
+  .page-main .section { padding: 40px 0 0; max-width: none; margin: 0; }
 
   /* ── Getting started ── */
   .gs-grid {
@@ -314,8 +193,33 @@
     flex-shrink: 0;
   }
   .gs-card h3 { font-size: 15px; font-weight: 700; }
-  .gs-card p { font-size: 13px; color: var(--text-secondary); line-height: 1.45; flex: 1; }
-  .gs-card .gs-cta { font-size: 13px; font-weight: 600; color: var(--accent); }
+
+  /* ── All products (categorized list) ── */
+  .all-products-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
+    gap: 28px 40px;
+  }
+  .all-products-grid .cat-heading {
+    font-size: 12px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.06em;
+    color: var(--text-muted);
+    margin-bottom: 10px;
+  }
+  .all-products-grid .cat-list { list-style: none; }
+  .all-products-grid .cat-list li + li { margin-top: 2px; }
+  .all-products-grid .cat-list a {
+    display: block;
+    padding: 5px 0;
+    font-size: 14px;
+    font-weight: 500;
+    color: var(--text);
+    text-decoration: none;
+    transition: color 0.15s;
+  }
+  .all-products-grid .cat-list a:hover { color: var(--accent); }
 
   /* ── Footer ── */
   .landing-footer {
@@ -333,291 +237,275 @@
   }
   .landing-footer a { color: var(--text-secondary); }
 
-  /* ── What's new ribbon ── */
-  .whats-new {
-    max-width: var(--max-w);
-    margin: 32px auto 0;
-    padding: 0 24px;
-  }
-  .whats-new-inner {
-    background: linear-gradient(135deg, #eef2ff 0%, #f0edff 100%);
-    border: 1px solid #d8d0ff;
-    border-radius: var(--radius);
-    padding: 14px 20px;
-    display: flex;
-    align-items: center;
-    gap: 12px;
-    font-size: 14px;
-  }
-  .whats-new-inner .badge {
-    background: var(--purple);
-    color: #fff;
-    font-size: 11px;
-    font-weight: 700;
-    padding: 3px 10px;
-    border-radius: 20px;
-    white-space: nowrap;
-    letter-spacing: 0.03em;
-  }
-  .whats-new-inner a { font-weight: 500; }
-
   /* ── Responsive ── */
   @@media (max-width: 680px) {
     .hero h1 { font-size: 22px; }
-    .quick-grid { grid-template-columns: 1fr; }
-    .version-banner-inner { flex-direction: column; align-items: flex-start; }
-    .gs-grid { grid-template-columns: 1fr; }
   }
 </style>
 
 <div hx-select-oob="#main-container" hx-swap="none" class="w-full max-w-[100vw] relative overflow-x-hidden">
 
-  <!-- ── Version disambiguation ── -->
-  <div class="version-banner">
-    <div class="version-banner-inner">
-      <div class="vb-text">
-        <h3>You're viewing docs for Elastic Stack 9.0+ (latest @Model.CurrentVersion)</h3>
-        <p>Need docs for an earlier version?</p>
-      </div>
-      <div class="vb-actions">
-        <a href="https://www.elastic.co/guide" class="btn btn-outline" hx-disable="true">8.x docs (elastic.co/guide) →</a>
-        @if (Model.AllVersionsUrl is not null)
-        {
-          <a href="@Model.AllVersionsUrl" class="btn btn-outline">All versions</a>
-        }
-      </div>
-    </div>
-  </div>
-
   <!-- ── Hero: Search-first ── -->
   <div class="hero">
     <h1>Elastic documentation</h1>
-    <p>Find guides, API references, and tutorials for the Elastic Stack.</p>
     <div class="search-wrap">
       <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="7"/><path d="M21 21l-4.35-4.35"/></svg>
       <navigation-search></navigation-search>
     </div>
   </div>
 
-  <!-- ── What's new ── -->
-  <div class="whats-new">
-    <div class="whats-new-inner">
-      <span class="badge">NEW</span>
-      <span>Elasticsearch @Model.CurrentVersion is out — <a href="@Model.Link("/release-notes/")">check out what's new →</a></span>
+  <!-- ── Top tabs: Platform / Solutions / Deploy ── -->
+  <div class="top-tabs">
+    <div class="tabs-nav">
+      <button class="active" onclick="switchTopTab(event, 'top-tab-platform')">Platform</button>
+      <button onclick="switchTopTab(event, 'top-tab-solutions')">Solutions</button>
+      <button onclick="switchTopTab(event, 'top-tab-deploy')">Deploy</button>
     </div>
-  </div>
 
-  <!-- ── Popular destinations ── -->
-  <div class="section">
-    <div class="section-header">
-      <h2>Popular destinations</h2>
-    </div>
-    <div class="quick-grid">
-      <a class="quick-card" href="@Model.Link("/solutions/search")">
-        <div class="icon icon-blue">
-          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="7"/><path d="M21 21l-4.35-4.35"/></svg>
+    <div id="top-tab-platform" class="tab-panel active">
+      <div class="tab-cards">
+        <div class="tab-card">
+          <h4>Elasticsearch</h4>
+          <ul>
+            <li><a href="@Model.Link("/deploy-manage/deploy/self-managed/installing-elasticsearch")">Install Elasticsearch →</a></li>
+            <li><a href="https://www.elastic.co/docs/api" target="_blank" rel="noopener noreferrer" hx-disable="true">REST APIs →</a></li>
+            <li><a href="@Model.Link("/reference/query-languages/")">Query DSL →</a></li>
+            <li><a href="@Model.Link("/reference/query-languages/")">Aggregations →</a></li>
+            <li><a href="@Model.Link("/manage-data")">Index management →</a></li>
+          </ul>
         </div>
-        <div class="card-text">
-          <h3>Elasticsearch</h3>
-          <p>Store, search, and analyze your data</p>
+        <div class="tab-card">
+          <h4>Kibana</h4>
+          <ul>
+            <li><a href="@Model.Link("/deploy-manage")">Install Kibana →</a></li>
+            <li><a href="@Model.Link("/explore-analyze")">Dashboards →</a></li>
+            <li><a href="@Model.Link("/explore-analyze")">Visualizations →</a></li>
+            <li><a href="@Model.Link("/explore-analyze")">Discover →</a></li>
+            <li><a href="@Model.Link("/explore-analyze")">Alerting →</a></li>
+          </ul>
         </div>
-      </a>
-      <a class="quick-card" href="@Model.Link("/deploy-manage/deploy/self-managed/installing-elasticsearch")">
-        <div class="icon icon-orange">
-          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/></svg>
+        <div class="tab-card">
+          <h4>Logstash</h4>
+          <ul>
+            <li><a href="@Model.Link("/manage-data")">Getting started →</a></li>
+            <li><a href="@Model.Link("/manage-data")">Input plugins →</a></li>
+            <li><a href="@Model.Link("/manage-data")">Filter plugins →</a></li>
+            <li><a href="@Model.Link("/manage-data")">Output plugins →</a></li>
+            <li><a href="@Model.Link("/manage-data")">Pipeline configuration →</a></li>
+          </ul>
         </div>
-        <div class="card-text">
-          <h3>Install with Docker</h3>
-          <p>Run Elasticsearch in containers</p>
+        <div class="tab-card">
+          <h4>Beats</h4>
+          <ul>
+            <li><a href="@Model.Link("/manage-data")">Filebeat →</a></li>
+            <li><a href="@Model.Link("/manage-data")">Metricbeat →</a></li>
+            <li><a href="@Model.Link("/manage-data")">Packetbeat →</a></li>
+            <li><a href="@Model.Link("/manage-data")">Heartbeat →</a></li>
+            <li><a href="@Model.Link("/manage-data")">Auditbeat →</a></li>
+          </ul>
         </div>
-      </a>
-      <a class="quick-card" href="@Model.Link("/reference/query-languages/")">
-        <div class="icon icon-purple">
-          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M16 18l6-6-6-6"/><path d="M8 6l-6 6 6 6"/></svg>
+      </div>
+    </div>
+
+    <div id="top-tab-solutions" class="tab-panel">
+      <div class="tab-cards">
+        <div class="tab-card">
+          <h4>Elasticsearch</h4>
+          <ul>
+            <li><a href="@Model.Link("/solutions/search")">Get started with Search →</a></li>
+            <li><a href="@Model.Link("/solutions/search")">Semantic &amp; vector search →</a></li>
+            <li><a href="@Model.Link("/solutions/search")">Search applications →</a></li>
+            <li><a href="@Model.Link("/solutions/search")">Agent Builder →</a></li>
+            <li><a href="@Model.Link("/solutions/search")">AI agent skills →</a></li>
+          </ul>
         </div>
-        <div class="card-text">
-          <h3>Query DSL</h3>
-          <p>Full-text search, filters, and aggregations</p>
+        <div class="tab-card">
+          <h4>Elastic Observability</h4>
+          <ul>
+            <li><a href="@Model.Link("/solutions/observability")">Get started with Observability →</a></li>
+            <li><a href="@Model.Link("/solutions/observability")">APM →</a></li>
+            <li><a href="@Model.Link("/solutions/observability")">Log monitoring →</a></li>
+            <li><a href="@Model.Link("/solutions/observability")">Infrastructure monitoring →</a></li>
+            <li><a href="@Model.Link("/solutions/observability")">Synthetics →</a></li>
+          </ul>
         </div>
-      </a>
-      <a class="quick-card" href="@Model.Link("/get-started")">
-        <div class="icon icon-green">
-          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 2L2 7l10 5 10-5-10-5z"/><path d="M2 17l10 5 10-5"/><path d="M2 12l10 5 10-5"/></svg>
+        <div class="tab-card">
+          <h4>Elastic Security</h4>
+          <ul>
+            <li><a href="@Model.Link("/solutions/security")">Get started with Security →</a></li>
+            <li><a href="@Model.Link("/solutions/security")">Detection rules →</a></li>
+            <li><a href="@Model.Link("/solutions/security")">Endpoint protection →</a></li>
+            <li><a href="@Model.Link("/solutions/security")">Cases &amp; investigations →</a></li>
+            <li><a href="@Model.Link("/solutions/security")">Cloud security →</a></li>
+          </ul>
         </div>
-        <div class="card-text">
-          <h3>The Elastic Stack</h3>
-          <p>Learn about the open-source tools to search, analyze, and visualize data in real time</p>
+      </div>
+    </div>
+
+    <div id="top-tab-deploy" class="tab-panel">
+      <div class="tab-cards">
+        <div class="tab-card">
+          <h4>Elastic Cloud Serverless</h4>
+          <ul>
+            <li><a href="@Model.Link("/deploy-manage")">Getting started →</a></li>
+            <li><a href="@Model.Link("/deploy-manage")">Project management →</a></li>
+            <li><a href="@Model.Link("/cloud-account")">Billing &amp; usage →</a></li>
+          </ul>
         </div>
-      </a>
-      <a class="quick-card" href="https://www.elastic.co/docs/api" target="_blank" rel="noopener noreferrer" hx-disable="true">
-        <div class="icon icon-pink">
-          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/><polyline points="14 2 14 8 20 8"/></svg>
+        <div class="tab-card">
+          <h4>Elastic Cloud Hosted</h4>
+          <ul>
+            <li><a href="@Model.Link("/deploy-manage")">Getting started →</a></li>
+            <li><a href="@Model.Link("/deploy-manage")">Deployment management →</a></li>
+            <li><a href="@Model.Link("/deploy-manage")">Monitoring →</a></li>
+            <li><a href="@Model.Link("/cloud-account")">Billing →</a></li>
+          </ul>
         </div>
-        <div class="card-text">
-          <h3>Elasticsearch API</h3>
-          <p>REST endpoints</p>
+        <div class="tab-card">
+          <h4>Self-managed</h4>
+          <ul>
+            <li><a href="@Model.Link("/deploy-manage/deploy/self-managed/installing-elasticsearch")">Install Elasticsearch →</a></li>
+            <li><a href="@Model.Link("/deploy-manage")">Install Kibana →</a></li>
+            <li><a href="@Model.Link("/deploy-manage")">Configure →</a></li>
+            <li><a href="@Model.Link("/deploy-manage")">Secure a cluster →</a></li>
+            <li><a href="@Model.Link("/deploy-manage/upgrade")">Upgrade →</a></li>
+          </ul>
         </div>
-      </a>
-      <a class="quick-card" href="@Model.Link("/explore-analyze")">
-        <div class="icon icon-orange">
-          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M3 9h18"/><path d="M9 21V9"/></svg>
+        <div class="tab-card">
+          <h4>Elastic Cloud Enterprise (ECE)</h4>
+          <ul>
+            <li><a href="@Model.Link("/deploy-manage")">Install ECE →</a></li>
+            <li><a href="@Model.Link("/deploy-manage")">Manage deployments →</a></li>
+            <li><a href="@Model.Link("/deploy-manage")">Security &amp; users →</a></li>
+            <li><a href="@Model.Link("/deploy-manage/upgrade")">Upgrade →</a></li>
+          </ul>
         </div>
-        <div class="card-text">
-          <h3>Kibana</h3>
-          <p>Visualize your Elasticsearch data</p>
+        <div class="tab-card">
+          <h4>Elastic Cloud on Kubernetes (ECK)</h4>
+          <ul>
+            <li><a href="@Model.Link("/deploy-manage")">Quickstart →</a></li>
+            <li><a href="@Model.Link("/deploy-manage")">Operator configuration →</a></li>
+            <li><a href="@Model.Link("/deploy-manage")">Manage resources →</a></li>
+            <li><a href="@Model.Link("/deploy-manage/upgrade")">Upgrade →</a></li>
+          </ul>
         </div>
-      </a>
+      </div>
     </div>
   </div>
 
-  <!-- ── Get started ── -->
-  <div class="section">
-    <div class="section-header">
-      <h2>Get started</h2>
-    </div>
-    <div class="gs-grid">
-      <a class="gs-card" href="@Model.Link("/get-started")">
-        <div class="gs-card-icon icon-green">
-          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/></svg>
-        </div>
-        <h3>Try locally</h3>
-        <p>One command. Elasticsearch + Kibana on your machine in under two minutes. No account, no credit card.</p>
-        <span class="gs-cta">Run locally →</span>
-      </a>
-      <a class="gs-card" href="https://cloud.elastic.co/registration?page=docs&placement=docs-body" target="_blank" rel="noopener noreferrer" hx-disable="true">
-        <div class="gs-card-icon icon-blue">
-          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M17.5 19H9a7 7 0 1 1 6.71-9h1.79a4.5 4.5 0 1 1 0 9z"/></svg>
+  <div class="page-layout">
+    <div class="page-main">
+
+      <!-- ── Get started ── -->
+      <div class="section">
+        <div class="section-header">
+          <h2>Get started</h2>
         </div>
-        <h3>Free cloud trial</h3>
-        <p>Fully managed on AWS, GCP, or Azure. Production-ready in minutes. Search, Observability, and Security all included.</p>
-        <span class="gs-cta">Start free trial →</span>
-      </a>
-      <a class="gs-card" href="@Model.Link("/get-started")">
-        <div class="gs-card-icon icon-purple">
-          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M2 3h6a4 4 0 0 1 4 4v14a3 3 0 0 0-3-3H2z"/><path d="M22 3h-6a4 4 0 0 0-4 4v14a3 3 0 0 1 3-3h7z"/></svg>
+        <div class="gs-grid">
+          <a class="gs-card" href="@Model.Link("/get-started")">
+            <div class="gs-card-icon icon-purple">
+              <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M2 3h6a4 4 0 0 1 4 4v14a3 3 0 0 0-3-3H2z"/><path d="M22 3h-6a4 4 0 0 0-4 4v14a3 3 0 0 1 3-3h7z"/></svg>
+            </div>
+            <h3>Elasticsearch concepts</h3>
+          </a>
+          <a class="gs-card" href="@Model.Link("/get-started")">
+            <div class="gs-card-icon icon-green">
+              <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="4 17 10 11 4 5"/><line x1="12" y1="19" x2="20" y2="19"/></svg>
+            </div>
+            <h3>Try locally</h3>
+          </a>
+          <a class="gs-card" href="https://cloud.elastic.co/registration?page=docs&placement=docs-body" target="_blank" rel="noopener noreferrer" hx-disable="true">
+            <div class="gs-card-icon icon-blue">
+              <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M17.5 19H9a7 7 0 1 1 6.71-9h1.79a4.5 4.5 0 1 1 0 9z"/></svg>
+            </div>
+            <h3>Start free trial</h3>
+          </a>
         </div>
-        <h3>Elastic fundamentals</h3>
-        <p>Learn about Elasticsearch concepts and how to get up and running.</p>
-        <span class="gs-cta">Learn the basics →</span>
-      </a>
-    </div>
-  </div>
-
-  <!-- ── Browse by solution ── -->
-  <div class="section">
-    <div class="section-header">
-      <h2>Browse by solution</h2>
-    </div>
-    <div class="products-grid">
-      <div class="product-card">
-        <h3><span class="dot" style="background:#0077cc"></span> Search</h3>
-        <p>Build search experiences powered by Elasticsearch — from full-text search to vector and hybrid retrieval.</p>
-        <ul>
-          <li><a href="@Model.Link("/solutions/search")">Get started with Search <span class="arrow">→</span></a></li>
-          <li><a href="@Model.Link("/solutions/search")">Semantic &amp; vector search <span class="arrow">→</span></a></li>
-          <li><a href="@Model.Link("/solutions/search")">Search applications <span class="arrow">→</span></a></li>
-          <li><a href="@Model.Link("/solutions/search")">Agent Builder <span class="arrow">→</span></a></li>
-          <li><a href="@Model.Link("/solutions/search")">AI agent skills <span class="arrow">→</span></a></li>
-        </ul>
-      </div>
-      <div class="product-card">
-        <h3><span class="dot" style="background:#00bfb3"></span> Observability</h3>
-        <p>Logs, metrics, APM, and uptime monitoring in a unified platform.</p>
-        <ul>
-          <li><a href="@Model.Link("/solutions/observability")">Get started with Observability <span class="arrow">→</span></a></li>
-          <li><a href="@Model.Link("/solutions/observability")">APM <span class="arrow">→</span></a></li>
-          <li><a href="@Model.Link("/solutions/observability")">Log monitoring <span class="arrow">→</span></a></li>
-          <li><a href="@Model.Link("/solutions/observability")">Synthetics <span class="arrow">→</span></a></li>
-          <li><a href="@Model.Link("/solutions/observability")">Infrastructure monitoring <span class="arrow">→</span></a></li>
-        </ul>
       </div>
-      <div class="product-card">
-        <h3><span class="dot" style="background:#ff4081"></span> Security</h3>
-        <p>SIEM, endpoint protection, and threat hunting for your organization.</p>
-        <ul>
-          <li><a href="@Model.Link("/solutions/security")">Get started with Security <span class="arrow">→</span></a></li>
-          <li><a href="@Model.Link("/solutions/security")">Detection rules <span class="arrow">→</span></a></li>
-          <li><a href="@Model.Link("/solutions/security")">Endpoint protection <span class="arrow">→</span></a></li>
-          <li><a href="@Model.Link("/solutions/security")">Cases &amp; investigations <span class="arrow">→</span></a></li>
-          <li><a href="@Model.Link("/solutions/security")">Cloud security <span class="arrow">→</span></a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
 
-  <!-- ── All products ── -->
-  <div class="section">
-    <div class="section-header">
-      <h2>All products</h2>
-    </div>
-    <div class="product-index">
-      <div class="pi-category">
-        <h4>Elastic Stack</h4>
-        <ul>
-          <li><a href="@Model.Link("/solutions/search")">Elasticsearch</a></li>
-          <li><a href="@Model.Link("/explore-analyze")">Kibana</a></li>
-          <li><a href="@Model.Link("/manage-data")">Logstash</a></li>
-          <li><a href="@Model.Link("/manage-data")">Beats</a></li>
-          <li><a href="@Model.Link("/explore-analyze")">Machine Learning</a></li>
-          <li><a href="@Model.Link("/manage-data")">Elasticsearch for Apache Hadoop &amp; Spark</a></li>
-        </ul>
-      </div>
-      <div class="pi-category">
-        <h4>Cloud &amp; orchestration</h4>
-        <ul>
-          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Serverless</a></li>
-          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Hosted</a></li>
-          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud on Kubernetes (ECK)</a></li>
-          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Enterprise (ECE)</a></li>
-          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud control (ecctl)</a></li>
-        </ul>
-      </div>
-      <div class="pi-category">
-        <h4>Ingest tools</h4>
-        <ul>
-          <li><a href="@Model.Link("/manage-data")">Integrations</a></li>
-          <li><a href="@Model.Link("/reference/opentelemetry/")">Elastic Distributions for OpenTelemetry</a></li>
-          <li><a href="@Model.Link("/manage-data")">Fleet &amp; Elastic Agent</a></li>
-          <li><a href="@Model.Link("/solutions/observability")">APM</a></li>
-          <li><a href="@Model.Link("/solutions/security")">Elastic Defend</a></li>
-          <li><a href="@Model.Link("/manage-data")">Elastic Serverless Forwarder for AWS</a></li>
-          <li><a href="@Model.Link("/manage-data")">Connectors</a></li>
-          <li><a href="@Model.Link("/manage-data")">Web crawler</a></li>
-        </ul>
-      </div>
-      <div class="pi-category">
-        <h4>Query languages</h4>
-        <ul>
-          <li><a href="@Model.Link("/reference/query-languages/")">Query DSL</a></li>
-          <li><a href="@Model.Link("/reference/query-languages/")">ES|QL</a></li>
-          <li><a href="@Model.Link("/reference/query-languages/")">KQL</a></li>
-          <li><a href="@Model.Link("/reference/query-languages/")">SQL</a></li>
-          <li><a href="@Model.Link("/reference/query-languages/")">EQL</a></li>
-          <li><a href="@Model.Link("/reference/query-languages/")">Lucene</a></li>
-        </ul>
-      </div>
-      <div class="pi-category">
-        <h4>APM agents</h4>
-        <ul>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Java Agent</a></li>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">&#46;NET Agent</a></li>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Node.js Agent</a></li>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Python Agent</a></li>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Ruby Agent</a></li>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Go Agent</a></li>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">PHP Agent</a></li>
-        </ul>
-      </div>
-      <div class="pi-category">
-        <h4>Developer tools &amp; standards</h4>
-        <ul>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Elasticsearch clients</a></li>
-          <li><a href="@Model.Link("/reference")">Elastic Common Schema (ECS)</a></li>
-          <li><a href="@Model.Link("/reference")">Search UI</a></li>
-        </ul>
+      <!-- ── All products ── -->
+      <div class="section">
+        <div class="section-header">
+          <h2>All products</h2>
+        </div>
+        <div class="all-products-grid">
+          <div>
+            <h3 class="cat-heading">Platform</h3>
+            <ul class="cat-list">
+              <li><a href="@Model.Link("/solutions/search")">Elasticsearch</a></li>
+              <li><a href="@Model.Link("/explore-analyze")">Kibana</a></li>
+              <li><a href="@Model.Link("/manage-data")">Logstash</a></li>
+              <li><a href="@Model.Link("/manage-data")">Beats</a></li>
+              <li><a href="@Model.Link("/explore-analyze")">Machine Learning</a></li>
+            </ul>
+          </div>
+          <div>
+            <h3 class="cat-heading">Solutions</h3>
+            <ul class="cat-list">
+              <li><a href="@Model.Link("/solutions/search")">Elasticsearch</a></li>
+              <li><a href="@Model.Link("/solutions/observability")">Elastic Observability</a></li>
+              <li><a href="@Model.Link("/solutions/security")">Elastic Security</a></li>
+            </ul>
+          </div>
+          <div>
+            <h3 class="cat-heading">Deploy</h3>
+            <ul class="cat-list">
+              <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Serverless</a></li>
+              <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Hosted</a></li>
+              <li><a href="@Model.Link("/deploy-manage")">Self-managed</a></li>
+              <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Enterprise (ECE)</a></li>
+              <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud on Kubernetes (ECK)</a></li>
+            </ul>
+          </div>
+          <div>
+            <h3 class="cat-heading">Ingest tools</h3>
+            <ul class="cat-list">
+              <li><a href="@Model.Link("/manage-data")">Integrations</a></li>
+              <li><a href="@Model.Link("/reference/opentelemetry/")">Elastic Distributions for OpenTelemetry</a></li>
+              <li><a href="@Model.Link("/manage-data")">Fleet &amp; Elastic Agent</a></li>
+              <li><a href="@Model.Link("/solutions/observability")">APM</a></li>
+              <li><a href="@Model.Link("/solutions/security")">Elastic Defend</a></li>
+              <li><a href="@Model.Link("/manage-data")">Elastic Serverless Forwarder for AWS</a></li>
+              <li><a href="@Model.Link("/manage-data")">Connectors</a></li>
+              <li><a href="@Model.Link("/manage-data")">Web crawler</a></li>
+            </ul>
+          </div>
+          <div>
+            <h3 class="cat-heading">Query languages</h3>
+            <ul class="cat-list">
+              <li><a href="@Model.Link("/reference/query-languages/")">Query DSL</a></li>
+              <li><a href="@Model.Link("/reference/query-languages/")">ES|QL</a></li>
+              <li><a href="@Model.Link("/reference/query-languages/")">KQL</a></li>
+              <li><a href="@Model.Link("/reference/query-languages/")">SQL</a></li>
+              <li><a href="@Model.Link("/reference/query-languages/")">EQL</a></li>
+              <li><a href="@Model.Link("/reference/query-languages/")">Lucene</a></li>
+            </ul>
+          </div>
+          <div>
+            <h3 class="cat-heading">APM agents</h3>
+            <ul class="cat-list">
+              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Java</a></li>
+              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">&#46;NET</a></li>
+              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Node.js</a></li>
+              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Python</a></li>
+              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Ruby</a></li>
+              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Go</a></li>
+              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">PHP</a></li>
+            </ul>
+          </div>
+          <div>
+            <h3 class="cat-heading">Developer tools &amp; standards</h3>
+            <ul class="cat-list">
+              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Elasticsearch clients</a></li>
+              <li><a href="@Model.Link("/reference")">Elastic Common Schema (ECS)</a></li>
+              <li><a href="@Model.Link("/reference")">Search UI</a></li>
+            </ul>
+          </div>
+        </div>
       </div>
-    </div>
-  </div>
+
+    </div><!-- /.page-main -->
+  </div><!-- /.page-layout -->
 
   <!-- ── Footer ── -->
   <footer class="landing-footer">
@@ -626,3 +514,13 @@
   </footer>
 
 </div>
+
+<script>
+  function switchTopTab(e, tabId) {
+    var container = e.currentTarget.closest('.top-tabs');
+    container.querySelectorAll('.tab-panel').forEach(function(p) { p.classList.remove('active'); });
+    container.querySelectorAll('.tabs-nav button').forEach(function(b) { b.classList.remove('active'); });
+    document.getElementById(tabId).classList.add('active');
+    e.currentTarget.classList.add('active');
+  }
+</script>

From d23fa4c2f09d53dc0aa1a974deb641dd0c25fbcb Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Mon, 11 May 2026 11:52:16 +0200
Subject: [PATCH 160/226] Tune Nav V2 sidebar label spacing and typography

Align top section labels, subsection gaps, tree padding, and nested
heading text with updated Nav V2 visual spec.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/styles.css                         | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index f9cbee2455..f792718884 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -235,7 +235,7 @@ body:has([data-nav-v2]) aside.sidebar {
 	+ ul.docs-sidebar-nav-v2__subsection:has(
 		> li > .docs-sidebar-nav-v2__label--nested
 	) {
-	gap: 0.5rem !important;
+	gap: 8px !important;
 }
 
 /*
@@ -301,14 +301,14 @@ body:has([data-nav-v2]) aside.sidebar {
 	ul.docs-sidebar-nav-v2__tree
 	> li:has(> .docs-sidebar-nav-v2__label--top) {
 	margin-top: 0;
-	padding: 0 0 24px 0;
+	padding: 0 0 16px;
 }
 
 #pages-nav
 	nav[data-nav-v2]
 	ul.docs-sidebar-nav-v2__tree
 	> li:has(> .docs-sidebar-nav-v2__label--top):last-child {
-	padding: 0 0 22px 0;
+	padding: 0 0 16px;
 }
 
 /* Breathing room when sticky chrome is empty (no search, no product dropdown). */
@@ -347,8 +347,8 @@ nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--top {
 	font-weight: 700;
 	font-size: 16px;
 	line-height: 24px;
-	color: #343741;
-	margin: 10px 0 10px;
+	color: #1c1e23;
+	margin: 16px 0;
 }
 
 /*
@@ -359,7 +359,7 @@ nav.docs-sidebar-nav-v2 .docs-sidebar-nav-v2__label--top {
 #pages-nav
 	nav[data-nav-v2]
 	.docs-sidebar-nav-v2__label--top:has(+ ul.docs-sidebar-nav-v2__subsection) {
-	margin: 12px 0 6px;
+	margin: 12px 0 8px;
 }
 
 /* Nav V2: nested subgroup section titles (non-clickable; color never overridden by active path) */
@@ -386,6 +386,19 @@ nav.docs-sidebar-nav-v2
 	width: 100%;
 }
 
+/*
+ * Subsection heading copy (nested label + nav-text). Scoped to nested only so link/folder
+ * rows keep normal body styling.
+ */
+#pages-nav
+	nav[data-nav-v2]
+	.docs-sidebar-nav-v2__label--nested.docs-sidebar-nav-v2__nav-text {
+	font-size: 12px;
+	color: #8a919e;
+	margin: 16px 0 8px;
+	font-weight: 700;
+}
+
 #pages-nav nav[data-nav-v2] .docs-sidebar-nav-v2__nav-text {
 	min-width: 0;
 	max-width: 100%;

From 180d2f61ed60b863214ecfc2044a6b70a888f383 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Mon, 11 May 2026 12:07:57 +0200
Subject: [PATCH 161/226] Fix Nav V2 first-row top padding when search is
 absent

Use sticky-chrome :not(:has(navigation-search)) so link-first trees get
spacing; set breathing room to 4px instead of 12px.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/styles.css                           | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index f792718884..5b086d5c5e 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -311,21 +311,28 @@ body:has([data-nav-v2]) aside.sidebar {
 	padding: 0 0 16px;
 }
 
-/* Breathing room when sticky chrome is empty (no search, no product dropdown). */
+/*
+ * Breathing room when Jump-to-page is absent: <navigation-search> is not rendered
+ * (see _TocTree.cshtml). Match the first tree row regardless of label vs link — the old
+ * li:first-child:has(> .label--top) selector missed link-first sidebars (e.g. surfaced index).
+ * Top inset: 4px when search chrome is absent.
+ */
 #pages-nav
+	#pages-nav-sticky-chrome:not(:has(navigation-search))
+	+ .pages-nav-menu
 	nav[data-nav-v2]
 	ul.docs-sidebar-nav-v2__tree
-	> li:first-child:has(> .docs-sidebar-nav-v2__label--top) {
-	padding-top: 12px;
+	> li:first-child {
+	padding-top: 4px;
 }
 
-/* Search already adds top chrome; drop extra padding on first tree row. */
+/* Search supplies top chrome; keep the first row flush. */
 #pages-nav
 	#pages-nav-sticky-chrome:has(navigation-search)
 	+ .pages-nav-menu
 	nav[data-nav-v2]
 	ul.docs-sidebar-nav-v2__tree
-	> li:first-child:has(> .docs-sidebar-nav-v2__label--top) {
+	> li:first-child {
 	padding-top: 0;
 }
 

From d7b636076b8ac414edc485f8210382a53d6a28de Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Mon, 11 May 2026 18:31:01 +0200
Subject: [PATCH 162/226] Prefix hub directive URLs with the site path prefix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

{hero}, {link-card}, and {whats-new} emit YAML body URLs verbatim
into <a href> attributes — they don't go through Markdig's link
resolver. So root-relative URLs like \`/deploy-manage/...\` landed
on the page as-is and broke under the \`/docs/\` path prefix the
assembler builds with.

Add a HubUrl.Prefix helper that prepends the site path prefix to
root-relative URLs (leaves absolute http/https/mailto and anchors
alone, and won't double-prefix). Pass block.Build.UrlPathPrefix into
the three view models, and call Model.PrefixUrl(...) in the cshtml
where hrefs are emitted.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Myst/Directives/DirectiveHtmlRenderer.cs  |  9 +++--
 .../Myst/Directives/Hub/HeroView.cshtml       |  4 +-
 .../Myst/Directives/Hub/HeroViewModel.cs      |  2 +
 .../Myst/Directives/Hub/HubUrl.cs             | 39 +++++++++++++++++++
 .../Myst/Directives/Hub/LinkCardView.cshtml   |  6 +--
 .../Myst/Directives/Hub/LinkCardViewModel.cs  |  2 +
 .../Myst/Directives/Hub/WhatsNewView.cshtml   |  4 +-
 .../Myst/Directives/Hub/WhatsNewViewModel.cs  |  2 +
 8 files changed, 58 insertions(+), 10 deletions(-)
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs

diff --git a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
index 8934da227a..a1e6d37ae7 100644
--- a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
@@ -387,7 +387,8 @@ private static void WriteHero(HtmlRenderer renderer, HeroBlock block)
 			ShowSearch = block.ShowSearch,
 			QuickLinks = block.QuickLinks,
 			OtherVersions = block.OtherVersions,
-			ReleasesHtml = releasesHtml
+			ReleasesHtml = releasesHtml,
+			SitePathPrefix = block.Build.UrlPathPrefix
 		});
 		RenderRazorSlice(slice, renderer);
 	}
@@ -411,7 +412,8 @@ private static void WriteLinkCard(HtmlRenderer renderer, LinkCardBlock block)
 		{
 			DirectiveBlock = block,
 			Data = block.Data,
-			IconSvg = ProductIcons.Get(block.Data.Icon)
+			IconSvg = ProductIcons.Get(block.Data.Icon),
+			SitePathPrefix = block.Build.UrlPathPrefix
 		});
 		RenderRazorSlice(slice, renderer);
 	}
@@ -421,7 +423,8 @@ private static void WriteWhatsNew(HtmlRenderer renderer, WhatsNewBlock block)
 		var slice = WhatsNewView.Create(new WhatsNewViewModel
 		{
 			DirectiveBlock = block,
-			Data = block.Data
+			Data = block.Data,
+			SitePathPrefix = block.Build.UrlPathPrefix
 		});
 		RenderRazorSlice(slice, renderer);
 	}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
index d25284d072..cdc5e4b402 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
@@ -68,7 +68,7 @@
 								}
 								else
 								{
-									<li role="menuitem"><a href="@v.Url">@v.Label</a></li>
+									<li role="menuitem"><a href="@Model.PrefixUrl(v.Url)">@v.Label</a></li>
 								}
 							}
 						</ul>
@@ -87,7 +87,7 @@
 				<ul class="hub-hero-pills">
 					@foreach (var link in Model.QuickLinks)
 					{
-						<li><a href="@link.Url">@link.Label</a></li>
+						<li><a href="@Model.PrefixUrl(link.Url)">@link.Label</a></li>
 					}
 				</ul>
 			}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs
index 7c971bdd02..dfbae92ff3 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroViewModel.cs
@@ -15,4 +15,6 @@ public class HeroViewModel : DirectiveViewModel
 	public required IReadOnlyList<HeroQuickLink> QuickLinks { get; init; }
 	public required IReadOnlyList<HeroVersion> OtherVersions { get; init; }
 	public required string? ReleasesHtml { get; init; }
+	public required string? SitePathPrefix { get; init; }
+	public string? PrefixUrl(string? url) => HubUrl.Prefix(url, SitePathPrefix);
 }
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs
new file mode 100644
index 0000000000..9f1b2835d3
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs
@@ -0,0 +1,39 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+/// <summary>
+/// URL helpers for hub directives ({hero}, {link-card}, {whats-new}) whose YAML body
+/// values are emitted verbatim into href attributes and don't go through Markdig's
+/// link resolver. Root-relative URLs (e.g. "/deploy-manage/...") need the site's
+/// URL path prefix (e.g. "/docs") prepended so they resolve on the assembled site.
+/// </summary>
+internal static class HubUrl
+{
+	/// <summary>
+	/// Prefix a root-relative URL with the site's path prefix. Absolute URLs
+	/// (http/https/mailto), anchors, and URLs already under the prefix are
+	/// returned unchanged.
+	/// </summary>
+	public static string? Prefix(string? url, string? sitePathPrefix)
+	{
+		if (string.IsNullOrEmpty(url))
+			return url;
+		if (string.IsNullOrEmpty(sitePathPrefix))
+			return url;
+		if (url.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
+			|| url.StartsWith("https://", StringComparison.OrdinalIgnoreCase)
+			|| url.StartsWith("mailto:", StringComparison.OrdinalIgnoreCase)
+			|| url.StartsWith('#'))
+			return url;
+
+		var prefix = "/" + sitePathPrefix.Trim('/');
+		if (url == prefix || url.StartsWith(prefix + "/", StringComparison.OrdinalIgnoreCase))
+			return url;
+		if (!url.StartsWith('/'))
+			return url;
+		return prefix + url;
+	}
+}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml
index 2017da0d05..33f081f118 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml
@@ -16,7 +16,7 @@
 		<h3 class="hub-card-title">
 			@if (!string.IsNullOrWhiteSpace(d.Link))
 			{
-				<a href="@d.Link">@d.Title</a>
+				<a href="@Model.PrefixUrl(d.Link)">@d.Title</a>
 			}
 			else
 			{
@@ -37,7 +37,7 @@
 			{
 				if (string.IsNullOrWhiteSpace(link.Url) || string.IsNullOrWhiteSpace(link.Label))
 					continue;
-				<li><a href="@link.Url">@link.Label</a></li>
+				<li><a href="@Model.PrefixUrl(link.Url)">@link.Label</a></li>
 			}
 		</ul>
 	}
@@ -55,7 +55,7 @@
 					var link = aside.Links[i];
 					if (string.IsNullOrWhiteSpace(link.Url) || string.IsNullOrWhiteSpace(link.Label))
 						continue;
-					<a href="@link.Url">@link.Label</a>
+					<a href="@Model.PrefixUrl(link.Url)">@link.Label</a>
 					@if (i < aside.Links.Length - 1)
 					{
 						<span class="hub-card-aside-sep" aria-hidden="true">·</span>
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardViewModel.cs
index ff75e4821f..1ceea4bc45 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardViewModel.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardViewModel.cs
@@ -8,4 +8,6 @@ public class LinkCardViewModel : DirectiveViewModel
 {
 	public required LinkCardData Data { get; init; }
 	public required string? IconSvg { get; init; }
+	public required string? SitePathPrefix { get; init; }
+	public string? PrefixUrl(string? url) => HubUrl.Prefix(url, SitePathPrefix);
 }
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewView.cshtml
index ea449797ec..ceeca9a986 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewView.cshtml
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewView.cshtml
@@ -23,7 +23,7 @@
 					var link = d.ReleaseLinks[i];
 					if (string.IsNullOrWhiteSpace(link.Url) || string.IsNullOrWhiteSpace(link.Label))
 						continue;
-					<a href="@link.Url">@link.Label</a>
+					<a href="@Model.PrefixUrl(link.Url)">@link.Label</a>
 					@if (i < d.ReleaseLinks.Length - 1)
 					{
 						<span class="hub-wn-rn-sep" aria-hidden="true">·</span>
@@ -42,7 +42,7 @@
 				<li class="hub-wn-item">
 					@if (!string.IsNullOrWhiteSpace(item.Link))
 					{
-						<a href="@item.Link" class="hub-wn-item-link">
+						<a href="@Model.PrefixUrl(item.Link)" class="hub-wn-item-link">
 							<strong class="hub-wn-item-title">@item.Title</strong>
 							@if (!string.IsNullOrWhiteSpace(item.Description))
 							{
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewViewModel.cs
index 678e31f650..601b7b8eb4 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewViewModel.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewViewModel.cs
@@ -7,4 +7,6 @@ namespace Elastic.Markdown.Myst.Directives.Hub;
 public class WhatsNewViewModel : DirectiveViewModel
 {
 	public required WhatsNewData Data { get; init; }
+	public required string? SitePathPrefix { get; init; }
+	public string? PrefixUrl(string? url) => HubUrl.Prefix(url, SitePathPrefix);
 }

From 0a758ebd736485ed5b1f414557bd1a7153fae3cd Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Mon, 11 May 2026 18:42:37 +0200
Subject: [PATCH 163/226] Hub links opt out of body-level hx-boost
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The body has hx-boost=\"true\" hx-swap=\"none\" so boosted clicks
need an explicit hx-select-oob to swap anything. Hub-directive
links don't carry those attributes — clicks pushed the URL but
swapped no content, so the page appeared to just scroll to the top.

Add hx-boost=\"false\" to every <a> in {hero}, {link-card}, and
{whats-new} so they fall back to native navigation. Same fix
already in place for the page-top product pills.
---
 src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml    | 4 ++--
 src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs          | 4 ++++
 .../Myst/Directives/Hub/LinkCardView.cshtml                 | 6 +++---
 .../Myst/Directives/Hub/WhatsNewView.cshtml                 | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
index cdc5e4b402..6017272119 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroView.cshtml
@@ -68,7 +68,7 @@
 								}
 								else
 								{
-									<li role="menuitem"><a href="@Model.PrefixUrl(v.Url)">@v.Label</a></li>
+									<li role="menuitem"><a href="@Model.PrefixUrl(v.Url)" hx-boost="false">@v.Label</a></li>
 								}
 							}
 						</ul>
@@ -87,7 +87,7 @@
 				<ul class="hub-hero-pills">
 					@foreach (var link in Model.QuickLinks)
 					{
-						<li><a href="@Model.PrefixUrl(link.Url)">@link.Label</a></li>
+						<li><a href="@Model.PrefixUrl(link.Url)" hx-boost="false">@link.Label</a></li>
 					}
 				</ul>
 			}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs
index 9f1b2835d3..a74e3b6e65 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs
@@ -9,9 +9,13 @@ namespace Elastic.Markdown.Myst.Directives.Hub;
 /// values are emitted verbatim into href attributes and don't go through Markdig's
 /// link resolver. Root-relative URLs (e.g. "/deploy-manage/...") need the site's
 /// URL path prefix (e.g. "/docs") prepended so they resolve on the assembled site.
+/// They also need to opt out of body-level <c>hx-boost</c> because the layout uses
+/// <c>hx-swap="none"</c> by default — without an explicit <c>hx-select-oob</c>,
+/// boosted clicks fetch the URL but swap nothing.
 /// </summary>
 internal static class HubUrl
 {
+
 	/// <summary>
 	/// Prefix a root-relative URL with the site's path prefix. Absolute URLs
 	/// (http/https/mailto), anchors, and URLs already under the prefix are
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml
index 33f081f118..2ff734685b 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardView.cshtml
@@ -16,7 +16,7 @@
 		<h3 class="hub-card-title">
 			@if (!string.IsNullOrWhiteSpace(d.Link))
 			{
-				<a href="@Model.PrefixUrl(d.Link)">@d.Title</a>
+				<a href="@Model.PrefixUrl(d.Link)" hx-boost="false">@d.Title</a>
 			}
 			else
 			{
@@ -37,7 +37,7 @@
 			{
 				if (string.IsNullOrWhiteSpace(link.Url) || string.IsNullOrWhiteSpace(link.Label))
 					continue;
-				<li><a href="@Model.PrefixUrl(link.Url)">@link.Label</a></li>
+				<li><a href="@Model.PrefixUrl(link.Url)" hx-boost="false">@link.Label</a></li>
 			}
 		</ul>
 	}
@@ -55,7 +55,7 @@
 					var link = aside.Links[i];
 					if (string.IsNullOrWhiteSpace(link.Url) || string.IsNullOrWhiteSpace(link.Label))
 						continue;
-					<a href="@Model.PrefixUrl(link.Url)">@link.Label</a>
+					<a href="@Model.PrefixUrl(link.Url)" hx-boost="false">@link.Label</a>
 					@if (i < aside.Links.Length - 1)
 					{
 						<span class="hub-card-aside-sep" aria-hidden="true">·</span>
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewView.cshtml b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewView.cshtml
index ceeca9a986..b5b1dcef23 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewView.cshtml
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewView.cshtml
@@ -23,7 +23,7 @@
 					var link = d.ReleaseLinks[i];
 					if (string.IsNullOrWhiteSpace(link.Url) || string.IsNullOrWhiteSpace(link.Label))
 						continue;
-					<a href="@Model.PrefixUrl(link.Url)">@link.Label</a>
+					<a href="@Model.PrefixUrl(link.Url)" hx-boost="false">@link.Label</a>
 					@if (i < d.ReleaseLinks.Length - 1)
 					{
 						<span class="hub-wn-rn-sep" aria-hidden="true">·</span>
@@ -42,7 +42,7 @@
 				<li class="hub-wn-item">
 					@if (!string.IsNullOrWhiteSpace(item.Link))
 					{
-						<a href="@Model.PrefixUrl(item.Link)" class="hub-wn-item-link">
+						<a href="@Model.PrefixUrl(item.Link)" hx-boost="false" class="hub-wn-item-link">
 							<strong class="hub-wn-item-title">@item.Title</strong>
 							@if (!string.IsNullOrWhiteSpace(item.Description))
 							{

From de8dec6ade81e5dcedc3b71fad9112e7639a5234 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Mon, 11 May 2026 18:58:08 +0200
Subject: [PATCH 164/226] HubUrl strips .md and /index.md so authors can write
 file paths

Hub directives ({hero}, {link-card}, {whats-new}) emit URLs verbatim
into <a href>. Authors naturally write .md file paths (matching how
body markdown works) but the assembler serves clean URLs without
.md. So /reference/elasticsearch-clients/index.md 404'd on the
assembled site.

HubUrl.Prefix now strips trailing .md and /index.md before
prepending the site path prefix. Anchors are preserved.

Also fixes 4 source URLs whose docs-content folder names differ
from the slug the assembler serves (e.g. /release-notes/elastic-
security/ -> /release-notes/security), and the wrong fleet-
integrations target.

All 193 internal hub-page links now resolve (76/76 elasticsearch,
117/117 kibana, validated against the local assembler serve).
---
 .../Myst/Directives/Hub/HubUrl.cs             | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs
index a74e3b6e65..4afa0cdfda 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs
@@ -25,19 +25,32 @@ internal static class HubUrl
 	{
 		if (string.IsNullOrEmpty(url))
 			return url;
-		if (string.IsNullOrEmpty(sitePathPrefix))
-			return url;
 		if (url.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
 			|| url.StartsWith("https://", StringComparison.OrdinalIgnoreCase)
 			|| url.StartsWith("mailto:", StringComparison.OrdinalIgnoreCase)
 			|| url.StartsWith('#'))
 			return url;
 
+		// Convert markdown file paths to URL paths so authors can write
+		// e.g. /deploy-manage/...md and we render /deploy-manage/... .
+		// Anchor is preserved.
+		var clean = url;
+		var hash = clean.IndexOf('#');
+		var anchor = hash >= 0 ? clean[hash..] : string.Empty;
+		if (hash >= 0)
+			clean = clean[..hash];
+		if (clean.EndsWith("/index.md", StringComparison.OrdinalIgnoreCase))
+			clean = clean[..^"/index.md".Length];
+		else if (clean.EndsWith(".md", StringComparison.OrdinalIgnoreCase))
+			clean = clean[..^".md".Length];
+
+		if (string.IsNullOrEmpty(sitePathPrefix))
+			return clean + anchor;
 		var prefix = "/" + sitePathPrefix.Trim('/');
-		if (url == prefix || url.StartsWith(prefix + "/", StringComparison.OrdinalIgnoreCase))
-			return url;
-		if (!url.StartsWith('/'))
-			return url;
-		return prefix + url;
+		if (clean == prefix || clean.StartsWith(prefix + "/", StringComparison.OrdinalIgnoreCase))
+			return clean + anchor;
+		if (!clean.StartsWith('/'))
+			return clean + anchor;
+		return prefix + clean + anchor;
 	}
 }

From 5bc32e39847b37486170817986116808f61196f5 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Mon, 11 May 2026 20:12:45 +0200
Subject: [PATCH 165/226] fix(nav-v2): restore V2 page lookup registration lost
 in merge

The RegisterV2PageLookups machinery from d556dff3 was dropped when
nav-v2-sections was merged into hub-pages. Without it, V2 page: entries
referencing files in unseen child TOCs are shadowed by the V1
TableOfContentsNavigation registration, breaking positional layout for
those pages.

Restores the original logic and uses Remove + Add so V2 entries override
V1 toc entries on collision.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../V2/SiteNavigationV2.cs                    | 174 ++++++++++++++++++
 1 file changed, 174 insertions(+)

diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 3ef6b1354d..c07e24a304 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -34,6 +34,7 @@ public SiteNavigationV2(
 	{
 		var prefix = sitePrefix ?? string.Empty;
 		V2NavigationItems = BuildV2Items(v2File.Nav, Nodes, this, prefix);
+		RegisterV2PageLookups();
 		Sections = BuildSections(V2NavigationItems);
 		Islands = BuildIslands(Sections);
 		BuildUrlToSectionLookup();
@@ -153,6 +154,179 @@ private void BuildTocRootToIslandLookup()
 			_ = _tocRootToIsland.TryAdd(island.SourceTocRootId, island);
 	}
 
+	private void RegisterV2PageLookups()
+	{
+		var urlToFile = new Dictionary<string, IDocumentationFile>(StringComparer.OrdinalIgnoreCase);
+		foreach (var node in Nodes.Values)
+			CollectDocumentationFilesByUrl(node, urlToFile, Url);
+
+		RegisterV2PageLookups(V2NavigationItems, urlToFile);
+	}
+
+	private void RegisterV2PageLookups(
+		IEnumerable<INavigationItem> items,
+		IReadOnlyDictionary<string, IDocumentationFile> urlToFile
+	)
+	{
+		foreach (var item in items)
+		{
+			switch (item)
+			{
+				case PageCrossLinkLeaf pageCrossLink:
+					RegisterV2PageLookup(pageCrossLink.Page, pageCrossLink, urlToFile);
+					break;
+				case PageFolderNavigationNode pageFolder:
+					RegisterV2PageLookup(pageFolder.Page, pageFolder, urlToFile);
+					break;
+			}
+
+			if (item is INodeNavigationItem<INavigationModel, INavigationItem> node)
+				RegisterV2PageLookups(node.NavigationItems, urlToFile);
+		}
+	}
+
+	private void RegisterV2PageLookup(
+		Uri page,
+		INavigationItem item,
+		IReadOnlyDictionary<string, IDocumentationFile> urlToFile
+	)
+	{
+		if (TryResolvePageSource(page, out var file) || urlToFile.TryGetValue(item.Url, out file))
+		{
+			_ = NavigationDocumentationFileLookup.Remove(file);
+			NavigationDocumentationFileLookup.Add(file, item);
+		}
+	}
+
+	private bool TryResolvePageSource(Uri page, out IDocumentationFile file)
+	{
+		file = null!;
+		var pagePath = GetUriPath(page);
+		if (string.IsNullOrEmpty(pagePath))
+			return false;
+
+		var segments = pagePath.Split('/', StringSplitOptions.RemoveEmptyEntries);
+		for (var length = segments.Length; length > 0; length--)
+		{
+			var tocPath = string.Join('/', segments.Take(length));
+			if (!Nodes.TryGetValue(CreateTocUri(page.Scheme, tocPath), out var node))
+				continue;
+
+			var remainingPath = string.Join('/', segments.Skip(length));
+			if (string.IsNullOrEmpty(remainingPath))
+			{
+				file = node.Index.Model;
+				return true;
+			}
+
+			if (TryFindDocumentationFile(node, remainingPath, out file))
+				return true;
+		}
+
+		return false;
+	}
+
+	private static bool TryFindDocumentationFile(
+		INavigationItem item,
+		string remainingPath,
+		out IDocumentationFile file
+	)
+	{
+		switch (item)
+		{
+			case ILeafNavigationItem<IDocumentationFile> leaf when MatchesRemainingPath(leaf.Url, remainingPath):
+				file = leaf.Model;
+				return true;
+			case INodeNavigationItem<IDocumentationFile, INavigationItem> node:
+				if (MatchesRemainingPath(node.Index.Url, remainingPath))
+				{
+					file = node.Index.Model;
+					return true;
+				}
+				foreach (var child in node.NavigationItems)
+				{
+					if (TryFindDocumentationFile(child, remainingPath, out file))
+						return true;
+				}
+				break;
+			case INodeNavigationItem<INavigationModel, INavigationItem> node:
+				foreach (var child in node.NavigationItems)
+				{
+					if (TryFindDocumentationFile(child, remainingPath, out file))
+						return true;
+				}
+				break;
+		}
+
+		file = null!;
+		return false;
+	}
+
+	private static bool MatchesRemainingPath(string url, string remainingPath)
+	{
+		var normalizedPath = NormalizePagePath(remainingPath);
+		return url.TrimEnd('/').EndsWith($"/{normalizedPath}", StringComparison.OrdinalIgnoreCase);
+	}
+
+	private static string NormalizePagePath(string path)
+	{
+		var normalized = path.Trim('/');
+		if (normalized.EndsWith(".md", StringComparison.OrdinalIgnoreCase))
+			normalized = normalized[..^3];
+		if (normalized.EndsWith("/index", StringComparison.OrdinalIgnoreCase))
+			normalized = normalized[..^6];
+		return normalized;
+	}
+
+	private static Uri CreateTocUri(string scheme, string path)
+	{
+		var slash = path.IndexOf('/');
+		return slash < 0
+			? new Uri($"{scheme}://{path}")
+			: new Uri($"{scheme}://{path[..slash]}/{path[(slash + 1)..]}");
+	}
+
+	private static string GetUriPath(Uri uri) => (uri.Host + uri.AbsolutePath).Trim('/');
+
+	private static void CollectDocumentationFilesByUrl(
+		INavigationItem item,
+		Dictionary<string, IDocumentationFile> urlToFile,
+		string sitePrefix
+	)
+	{
+		switch (item)
+		{
+			case ILeafNavigationItem<IDocumentationFile> leaf:
+				AddDocumentationFileUrl(urlToFile, leaf.Url, leaf.Model, sitePrefix);
+				break;
+			case INodeNavigationItem<IDocumentationFile, INavigationItem> node:
+				AddDocumentationFileUrl(urlToFile, node.Url, node.Index.Model, sitePrefix);
+				AddDocumentationFileUrl(urlToFile, node.Index.Url, node.Index.Model, sitePrefix);
+				foreach (var child in node.NavigationItems)
+					CollectDocumentationFilesByUrl(child, urlToFile, sitePrefix);
+				break;
+			case INodeNavigationItem<INavigationModel, INavigationItem> node:
+				foreach (var child in node.NavigationItems)
+					CollectDocumentationFilesByUrl(child, urlToFile, sitePrefix);
+				break;
+		}
+	}
+
+	private static void AddDocumentationFileUrl(
+		Dictionary<string, IDocumentationFile> urlToFile,
+		string url,
+		IDocumentationFile file,
+		string sitePrefix
+	)
+	{
+		_ = urlToFile.TryAdd(url, file);
+
+		if (sitePrefix == "/" || string.IsNullOrEmpty(url) || !url.StartsWith('/'))
+			return;
+
+		_ = urlToFile.TryAdd($"{sitePrefix.TrimEnd('/')}{url}", file);
+	}
+
 	private static IReadOnlyList<INavigationItem> BuildV2Items(
 		IReadOnlyList<INavV2Item> v2Items,
 		IReadOnlyDictionary<Uri, IRootNavigationItem<IDocumentationFile, INavigationItem>> nodes,

From f25e81664bc79a440f3a01563fb3d027d7ed2d61 Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Mon, 11 May 2026 14:08:26 -0500
Subject: [PATCH 166/226] Redesign landing page with gradient hero and product
 index

Introduces a new visual direction:
- Gradient hero with two prominent destination cards (Elastic fundamentals
  and Elasticsearch) above the fold
- Search bar moved into the hero
- Quick start section for new users (local install + cloud trial)
- What's new strip showing latest release notes
- Four-column all-products index (platform, solutions, deploy, ingest,
  query languages, APM agents, developer tools)
- Community/help strip (forums, training, docs issues)
- CSS scoped to .landing-page to avoid global style leakage

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Layout/_LandingPage.cshtml                | 888 +++++++++---------
 1 file changed, 457 insertions(+), 431 deletions(-)

diff --git a/src/Elastic.Markdown/Layout/_LandingPage.cshtml b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
index c7887a1f6d..e5bcd80fc9 100644
--- a/src/Elastic.Markdown/Layout/_LandingPage.cshtml
+++ b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
@@ -1,530 +1,556 @@
 @inherits RazorSlice<Elastic.Markdown.MarkdownLayoutViewModel>
 <style>
   /* ── Reset & Base ── */
-  .landing-page, .landing-page * , .landing-page *::before, .landing-page *::after { box-sizing: border-box; }
+  .landing-page, .landing-page *, .landing-page *::before, .landing-page *::after { box-sizing: border-box; }
   .landing-page {
-    --bg: #fafbfc;
-    --surface: #ffffff;
-    --surface-alt: #f3f5f7;
-    --border: #e2e6ea;
-    --border-light: #eef0f3;
-    --text: #1a1f36;
-    --text-secondary: #4a5270;
-    --text-muted: #8891a4;
-    --accent: #0077cc;
-    --accent-hover: #005fa3;
-    --accent-bg: #e8f4fd;
-    --green: #00bfb3;
-    --green-bg: #e6faf8;
-    --orange: #f5a623;
-    --orange-bg: #fef6e8;
-    --purple: #7b61ff;
-    --purple-bg: #f0edff;
-    --pink: #ff4081;
-    --pink-bg: #fff0f5;
-    --radius: 10px;
-    --radius-sm: 6px;
+    --elastic-blue: #0077CC;
+    --elastic-blue-light: #E8F4FD;
+    --elastic-teal: #00BFB3;
+    --elastic-teal-light: #E6FAF8;
+    --elastic-pink: #F04E98;
+    --elastic-pink-light: #FDE8F2;
+    --elastic-yellow: #FEC514;
+    --elastic-green: #00B3A4;
+    --bg: #ffffff;
+    --bg-alt: #F5F7FA;
+    --bg-warm: #FAFBFC;
+    --bg-dark: #1B2638;
+    --text-primary: #1B2638;
+    --text-secondary: #506477;
+    --text-tertiary: #8C9BAB;
+    --border: #E1E7EE;
+    --border-light: #EEF2F7;
     --shadow-sm: 0 1px 3px rgba(0,0,0,0.06);
-    --shadow: 0 2px 8px rgba(0,0,0,0.08);
-    --shadow-lg: 0 4px 20px rgba(0,0,0,0.10);
+    --shadow-md: 0 4px 12px rgba(0,0,0,0.08);
+    --shadow-lg: 0 8px 30px rgba(0,0,0,0.1);
+    --radius-sm: 8px;
+    --radius-md: 12px;
+    --radius-lg: 16px;
     --max-w: 1120px;
-    --font: -apple-system, BlinkMacSystemFont, 'Inter', 'Segoe UI', sans-serif;
+    --font: 'Inter', -apple-system, BlinkMacSystemFont, sans-serif;
     font-family: var(--font);
     background: var(--bg);
-    color: var(--text);
-    line-height: 1.55;
+    color: var(--text-primary);
+    line-height: 1.5;
     -webkit-font-smoothing: antialiased;
   }
-  .landing-page a { color: var(--accent); text-decoration: none; transition: color 0.15s; }
-  .landing-page a:hover { color: var(--accent-hover); }
+  .landing-page a { color: var(--elastic-blue); text-decoration: none; transition: color 0.15s; }
+  .landing-page a:hover { color: #005fa3; }
 
-  /* ── Hero / Search ── */
-  .hero {
+  /* ── Hero ── */
+  .landing-hero {
+    background: linear-gradient(180deg, #EEF4FF 0%, #F7FAFF 60%, #FFFFFF 100%);
+    padding: 52px 40px 0;
+    border-bottom: 1px solid var(--border-light);
+  }
+  .landing-hero-inner {
     max-width: var(--max-w);
     margin: 0 auto;
-    padding: 48px 24px 0;
-    text-align: center;
   }
-  .hero h1 {
-    font-size: 28px;
-    font-weight: 700;
-    letter-spacing: -0.02em;
-    margin-bottom: 10px;
+  .hero-welcome {
+    max-width: 620px;
+    margin-bottom: 36px;
   }
-  .search-wrap {
-    max-width: 640px;
-    margin: 0 auto 16px;
-    position: relative;
+  .hero-welcome h1 {
+    font-size: 36px;
+    font-weight: 800;
+    color: var(--text-primary);
+    margin-bottom: 12px;
+    letter-spacing: -0.7px;
+    line-height: 1.15;
   }
-  .search-wrap > .search-icon {
-    position: absolute;
-    left: 16px;
-    top: 50%;
-    transform: translateY(-50%);
-    color: var(--text-muted);
-    pointer-events: none;
+  .hero-welcome p {
+    font-size: 17px;
+    color: var(--text-secondary);
+    line-height: 1.6;
   }
 
-  /* ── Section layout ── */
-  .section { max-width: var(--max-w); margin: 0 auto; padding: 40px 24px 0; }
-  .section-header {
+  /* Hero search */
+  .hero-search-wrap {
     display: flex;
-    align-items: baseline;
-    justify-content: space-between;
-    margin-bottom: 16px;
-  }
-  .section-header h2 { font-size: 17px; font-weight: 700; letter-spacing: -0.01em; }
-  .section-header a { font-size: 13px; font-weight: 500; }
-
-  /* Icon color variants */
-  .icon-blue { background: var(--accent-bg); color: var(--accent); }
-  .icon-green { background: var(--green-bg); color: var(--green); }
-  .icon-orange { background: var(--orange-bg); color: var(--orange); }
-  .icon-purple { background: var(--purple-bg); color: var(--purple); }
-  .icon-pink { background: var(--pink-bg); color: var(--pink); }
-
-  /* ── Tabbed products ── */
-  .tabs-nav {
-    display: flex;
-    gap: 0;
-    border-bottom: 2px solid var(--border);
-    margin-bottom: 20px;
-    overflow-x: auto;
-    -webkit-overflow-scrolling: touch;
-  }
-  .tabs-nav button {
-    background: none;
-    border: none;
-    border-bottom: 2px solid transparent;
-    margin-bottom: -2px;
-    padding: 10px 18px;
-    font-family: var(--font);
-    font-size: 13px;
-    font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: 0.04em;
-    color: var(--text-muted);
+    align-items: center;
+    gap: 10px;
+    background: #fff;
+    border: 1.5px solid var(--border);
+    border-radius: 10px;
+    padding: 14px 20px;
+    margin-bottom: 24px;
+    max-width: 640px;
     cursor: pointer;
-    white-space: nowrap;
-    transition: color 0.15s, border-color 0.15s;
+    transition: border-color 0.2s, box-shadow 0.2s;
   }
-  .tabs-nav button:hover { color: var(--text-secondary); }
-  .tabs-nav button.active {
-    color: var(--accent);
-    border-bottom-color: var(--accent);
+  .hero-search-wrap:focus-within {
+    border-color: var(--elastic-blue);
+    box-shadow: var(--shadow-sm);
   }
-  .tab-panel { display: none; }
-  .tab-panel.active { display: flex; flex-wrap: wrap; gap: 10px; }
 
-  /* Tab cards */
-  .tab-cards {
+  /* Hero cards */
+  .hero-cards {
     display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
-    gap: 14px;
-    width: 100%;
+    grid-template-columns: 1fr 1fr;
+    gap: 20px;
+    padding-bottom: 48px;
   }
-  .tab-card {
-    background: var(--surface);
-    border: 1px solid var(--border-light);
-    border-radius: var(--radius);
-    padding: 20px;
-    transition: box-shadow 0.15s, border-color 0.15s;
+  .hero-card {
+    background: #fff;
+    border-radius: var(--radius-md);
+    padding: 28px 28px 24px;
+    border: 1.5px solid var(--border);
+    box-shadow: var(--shadow-sm);
+    transition: box-shadow 0.2s, border-color 0.2s, transform 0.15s;
+    position: relative;
+    overflow: hidden;
+  }
+  .hero-card:hover {
+    box-shadow: var(--shadow-md);
+    border-color: var(--elastic-blue);
+    transform: translateY(-2px);
   }
-  .tab-card:hover { border-color: var(--border); box-shadow: var(--shadow-sm); }
-  .tab-card h4 {
-    font-size: 15px;
+  .hero-card.primary {
+    border-color: var(--elastic-blue);
+    box-shadow: var(--shadow-md), 0 0 0 1px rgba(0,119,204,0.08);
+  }
+  .hero-card.primary::before {
+    content: '';
+    position: absolute;
+    top: 0; left: 0; right: 0;
+    height: 3px;
+    background: linear-gradient(90deg, var(--elastic-blue), var(--elastic-teal));
+  }
+  .hero-card h2 {
+    font-size: 19px;
     font-weight: 700;
     margin-bottom: 10px;
+    color: var(--text-primary);
   }
-  .tab-card ul { list-style: none; }
-  .tab-card ul li + li { border-top: 1px solid var(--border-light); }
-  .tab-card ul li a {
-    display: block;
-    padding: 7px 0;
-    font-size: 13px;
-    color: var(--accent);
+  .hero-card .desc {
+    font-size: 14px;
+    color: var(--text-secondary);
+    line-height: 1.6;
+    margin-bottom: 18px;
+  }
+  .card-links {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px;
+    margin-bottom: 6px;
+  }
+  .card-links a {
+    font-size: 12px;
+    font-weight: 500;
+    color: var(--elastic-blue);
+    padding: 4px 10px;
+    background: rgba(0,119,204,0.04);
+    border-radius: 6px;
+    transition: background 0.15s;
+  }
+  .card-links a:hover { background: rgba(0,119,204,0.1); }
+  .card-cta {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    font-size: 14px;
+    font-weight: 600;
+    color: var(--elastic-blue);
     text-decoration: none;
-    transition: color 0.12s;
+    margin-top: 12px;
   }
-  .tab-card ul li a:hover { color: var(--accent-hover); }
+  .card-cta svg { transition: transform 0.15s; }
+  .hero-card:hover .card-cta svg { transform: translateX(3px); }
 
-  /* ── Top tabs (below search) ── */
-  .top-tabs {
+  /* ── Main content ── */
+  .landing-main {
     max-width: var(--max-w);
     margin: 0 auto;
-    padding: 0 24px 8px;
+    padding: 0 40px 80px;
   }
-  .top-tabs .tabs-nav { margin-bottom: 20px; justify-content: center; }
 
-  /* ── Page layout ── */
-  .page-layout {
-    max-width: var(--max-w);
-    margin: 0 auto;
-    padding: 0 24px;
+  /* ── Quick start ── */
+  .quickstart {
+    background: var(--bg-alt);
+    border-radius: var(--radius-lg);
+    padding: 24px 28px;
+    margin: 40px 0;
+    border: 1px solid var(--border-light);
   }
-  .page-main .section { padding: 40px 0 0; max-width: none; margin: 0; }
-
-  /* ── Getting started ── */
-  .gs-grid {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    gap: 14px;
+  .quickstart h2 {
+    font-size: 18px;
+    font-weight: 700;
+    margin-bottom: 4px;
+    letter-spacing: -0.2px;
   }
-  @@media (max-width: 800px) {
-    .gs-grid { grid-template-columns: 1fr; }
+  .quickstart > p {
+    font-size: 14px;
+    color: var(--text-secondary);
+    margin-bottom: 16px;
   }
-  .gs-card {
-    background: var(--surface);
+  .qs-grid {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    gap: 12px;
+  }
+  .qs-card {
+    background: #fff;
+    border-radius: var(--radius-sm);
+    padding: 16px;
     border: 1px solid var(--border-light);
-    border-radius: var(--radius);
-    padding: 22px 22px 20px;
+    cursor: pointer;
+    transition: box-shadow 0.15s, border-color 0.15s;
     display: flex;
     flex-direction: column;
-    gap: 8px;
+  }
+  .qs-card:hover {
+    box-shadow: var(--shadow-sm);
+    border-color: var(--elastic-blue);
+  }
+  .qs-card h4 {
+    font-size: 14px;
+    font-weight: 600;
+    margin-bottom: 8px;
+  }
+  .qs-card > p {
+    font-size: 12.5px;
+    color: var(--text-secondary);
+    line-height: 1.5;
+    flex: 1;
+  }
+  .qs-cta {
+    font-size: 12px;
+    margin-top: 12px;
+    color: var(--elastic-blue);
+    font-weight: 600;
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
     text-decoration: none;
-    color: var(--text);
-    transition: border-color 0.15s, box-shadow 0.15s;
   }
-  .gs-card:hover { border-color: var(--accent); box-shadow: var(--shadow); color: var(--text); }
-  .gs-card .gs-card-icon {
-    width: 36px;
-    height: 36px;
-    border-radius: var(--radius-sm);
+
+  /* ── Section header ── */
+  .landing-section-header {
     display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 18px;
-    flex-shrink: 0;
+    align-items: baseline;
+    justify-content: space-between;
+    margin-bottom: 20px;
+    padding-bottom: 12px;
+    border-bottom: 1px solid var(--border-light);
+  }
+  .landing-section-header h2 { font-size: 18px; font-weight: 700; }
+  .landing-section-header a { font-size: 13px; font-weight: 500; }
+
+  /* ── What's new ── */
+  .news-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 16px;
+    margin-bottom: 52px;
   }
-  .gs-card h3 { font-size: 15px; font-weight: 700; }
+  .news-card {
+    padding: 18px 20px;
+    background: #fff;
+    border: 1px solid var(--border);
+    border-radius: var(--radius-sm);
+    transition: border-color 0.15s;
+  }
+  .news-card:hover { border-color: var(--elastic-blue); }
+  .news-date {
+    font-size: 11px;
+    color: var(--text-tertiary);
+    font-weight: 500;
+    text-transform: uppercase;
+    letter-spacing: 0.3px;
+    margin-bottom: 6px;
+  }
+  .news-card h4 { font-size: 13px; font-weight: 600; margin-bottom: 4px; }
+  .news-card p { font-size: 12px; color: var(--text-secondary); line-height: 1.45; }
 
-  /* ── All products (categorized list) ── */
+  /* ── All products ── */
   .all-products-grid {
     display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
-    gap: 28px 40px;
+    grid-template-columns: repeat(4, 1fr);
+    gap: 32px 24px;
+    margin-bottom: 52px;
   }
-  .all-products-grid .cat-heading {
-    font-size: 12px;
+  .product-column h4 {
+    font-size: 13px;
     font-weight: 700;
-    text-transform: uppercase;
-    letter-spacing: 0.06em;
-    color: var(--text-muted);
+    color: var(--text-primary);
     margin-bottom: 10px;
+    padding-bottom: 8px;
+    border-bottom: 1px solid var(--border-light);
   }
-  .all-products-grid .cat-list { list-style: none; }
-  .all-products-grid .cat-list li + li { margin-top: 2px; }
-  .all-products-grid .cat-list a {
-    display: block;
-    padding: 5px 0;
-    font-size: 14px;
-    font-weight: 500;
-    color: var(--text);
+  .product-column ul { list-style: none; }
+  .product-column li { margin-bottom: 6px; }
+  .product-column a {
+    font-size: 13px;
+    color: var(--elastic-blue);
     text-decoration: none;
     transition: color 0.15s;
   }
-  .all-products-grid .cat-list a:hover { color: var(--accent); }
+  .product-column a:hover { color: #005fa3; text-decoration: underline; }
+
+  /* ── Help strip ── */
+  .help-strip {
+    background: var(--bg-alt);
+    border-radius: var(--radius-md);
+    padding: 32px 36px;
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 24px;
+    margin-bottom: 24px;
+    border: 1px solid var(--border-light);
+  }
+  .help-item h4 {
+    font-size: 13px;
+    font-weight: 600;
+    margin-bottom: 4px;
+    color: var(--text-primary);
+    display: flex;
+    align-items: center;
+    gap: 6px;
+  }
+  .help-item p { font-size: 12px; color: var(--text-secondary); line-height: 1.45; }
 
   /* ── Footer ── */
   .landing-footer {
+    background: var(--bg-dark);
+    padding: 44px 40px;
+    color: rgba(255,255,255,0.6);
+    font-family: var(--font);
+  }
+  .landing-footer-inner {
     max-width: var(--max-w);
-    margin: 48px auto 0;
-    padding: 40px 24px;
-    border-top: 1px solid var(--border-light);
+    margin: 0 auto;
     display: flex;
     justify-content: space-between;
     align-items: center;
     flex-wrap: wrap;
     gap: 12px;
     font-size: 13px;
-    color: var(--text-muted);
   }
-  .landing-footer a { color: var(--text-secondary); }
+  .landing-footer a { color: rgba(255,255,255,0.5); transition: color 0.15s; }
+  .landing-footer a:hover { color: rgba(255,255,255,0.85); }
 
   /* ── Responsive ── */
-  @@media (max-width: 680px) {
-    .hero h1 { font-size: 22px; }
+  @@media (max-width: 900px) {
+    .hero-cards { grid-template-columns: 1fr; }
+    .all-products-grid { grid-template-columns: repeat(2, 1fr); }
+    .news-grid { grid-template-columns: 1fr; }
+    .help-strip { grid-template-columns: 1fr; }
+  }
+  @@media (max-width: 640px) {
+    .landing-hero { padding: 36px 20px 0; }
+    .hero-welcome h1 { font-size: 26px; }
+    .landing-main { padding: 0 20px 60px; }
+    .qs-grid { grid-template-columns: 1fr; }
+    .all-products-grid { grid-template-columns: 1fr; }
   }
 </style>
 
 <div hx-select-oob="#main-container" hx-swap="none" class="landing-page w-full max-w-[100vw] relative overflow-x-hidden">
 
-  <!-- ── Hero: Search-first ── -->
-  <div class="hero">
-    <h1>Elastic documentation</h1>
-    <div class="search-wrap">
-      <svg class="search-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="7"/><path d="M21 21l-4.35-4.35"/></svg>
-      <navigation-search></navigation-search>
-    </div>
-  </div>
+  <!-- ── Hero ── -->
+  <section class="landing-hero">
+    <div class="landing-hero-inner">
 
-  <!-- ── Top tabs: Platform / Solutions / Deploy ── -->
-  <div class="top-tabs">
-    <div class="tabs-nav">
-      <button class="active" onclick="switchTopTab(event, 'top-tab-platform')">Platform</button>
-      <button onclick="switchTopTab(event, 'top-tab-solutions')">Solutions</button>
-      <button onclick="switchTopTab(event, 'top-tab-deploy')">Deploy</button>
-    </div>
+      <div class="hero-welcome">
+        <h1>Elastic documentation</h1>
+        <p>Official docs for the Elastic Stack, Elastic Cloud, and Elastic solutions.</p>
+      </div>
 
-    <div id="top-tab-platform" class="tab-panel active">
-      <div class="tab-cards">
-        <div class="tab-card">
-          <h4>Elasticsearch</h4>
-          <ul>
-            <li><a href="@Model.Link("/deploy-manage/deploy/self-managed/installing-elasticsearch")">Install Elasticsearch →</a></li>
-            <li><a href="https://www.elastic.co/docs/api" target="_blank" rel="noopener noreferrer" hx-disable="true">REST APIs →</a></li>
-            <li><a href="@Model.Link("/reference/query-languages/")">Query DSL →</a></li>
-            <li><a href="@Model.Link("/reference/query-languages/")">Aggregations →</a></li>
-            <li><a href="@Model.Link("/manage-data")">Index management →</a></li>
-          </ul>
-        </div>
-        <div class="tab-card">
-          <h4>Kibana</h4>
-          <ul>
-            <li><a href="@Model.Link("/deploy-manage")">Install Kibana →</a></li>
-            <li><a href="@Model.Link("/explore-analyze")">Dashboards →</a></li>
-            <li><a href="@Model.Link("/explore-analyze")">Visualizations →</a></li>
-            <li><a href="@Model.Link("/explore-analyze")">Discover →</a></li>
-            <li><a href="@Model.Link("/explore-analyze")">Alerting →</a></li>
-          </ul>
-        </div>
-        <div class="tab-card">
-          <h4>Logstash</h4>
-          <ul>
-            <li><a href="@Model.Link("/manage-data")">Getting started →</a></li>
-            <li><a href="@Model.Link("/manage-data")">Input plugins →</a></li>
-            <li><a href="@Model.Link("/manage-data")">Filter plugins →</a></li>
-            <li><a href="@Model.Link("/manage-data")">Output plugins →</a></li>
-            <li><a href="@Model.Link("/manage-data")">Pipeline configuration →</a></li>
-          </ul>
-        </div>
-        <div class="tab-card">
-          <h4>Beats</h4>
-          <ul>
-            <li><a href="@Model.Link("/manage-data")">Filebeat →</a></li>
-            <li><a href="@Model.Link("/manage-data")">Metricbeat →</a></li>
-            <li><a href="@Model.Link("/manage-data")">Packetbeat →</a></li>
-            <li><a href="@Model.Link("/manage-data")">Heartbeat →</a></li>
-            <li><a href="@Model.Link("/manage-data")">Auditbeat →</a></li>
-          </ul>
-        </div>
+      <div class="hero-search-wrap">
+        <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="#8C9BAB" stroke-width="2.5"><circle cx="11" cy="11" r="8"/><path d="M21 21l-4.35-4.35"/></svg>
+        <navigation-search></navigation-search>
       </div>
-    </div>
 
-    <div id="top-tab-solutions" class="tab-panel">
-      <div class="tab-cards">
-        <div class="tab-card">
-          <h4>Elasticsearch</h4>
-          <ul>
-            <li><a href="@Model.Link("/solutions/search")">Get started with Search →</a></li>
-            <li><a href="@Model.Link("/solutions/search")">Semantic &amp; vector search →</a></li>
-            <li><a href="@Model.Link("/solutions/search")">Search applications →</a></li>
-            <li><a href="@Model.Link("/solutions/search")">Agent Builder →</a></li>
-            <li><a href="@Model.Link("/solutions/search")">AI agent skills →</a></li>
-          </ul>
-        </div>
-        <div class="tab-card">
-          <h4>Elastic Observability</h4>
-          <ul>
-            <li><a href="@Model.Link("/solutions/observability")">Get started with Observability →</a></li>
-            <li><a href="@Model.Link("/solutions/observability")">APM →</a></li>
-            <li><a href="@Model.Link("/solutions/observability")">Log monitoring →</a></li>
-            <li><a href="@Model.Link("/solutions/observability")">Infrastructure monitoring →</a></li>
-            <li><a href="@Model.Link("/solutions/observability")">Synthetics →</a></li>
-          </ul>
+      <div class="hero-cards">
+        <div class="hero-card primary">
+          <h2>Learn how to use Elastic</h2>
+          <p class="desc">Get started with an overview of Elasticsearch, Kibana, and the rest of the Elastic Stack.</p>
+          <div class="card-links">
+            <a href="@Model.Link("/get-started")">What is Elasticsearch?</a>
+            <a href="@Model.Link("/get-started")">The Elastic Stack</a>
+            <a href="@Model.Link("/manage-data")">Ingest data</a>
+            <a href="@Model.Link("/manage-data")">Index basics</a>
+          </div>
+          <a href="@Model.Link("/get-started")" class="card-cta">
+            Get started
+            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5"><path d="M5 12h14M12 5l7 7-7 7"/></svg>
+          </a>
         </div>
-        <div class="tab-card">
-          <h4>Elastic Security</h4>
-          <ul>
-            <li><a href="@Model.Link("/solutions/security")">Get started with Security →</a></li>
-            <li><a href="@Model.Link("/solutions/security")">Detection rules →</a></li>
-            <li><a href="@Model.Link("/solutions/security")">Endpoint protection →</a></li>
-            <li><a href="@Model.Link("/solutions/security")">Cases &amp; investigations →</a></li>
-            <li><a href="@Model.Link("/solutions/security")">Cloud security →</a></li>
-          </ul>
+        <div class="hero-card">
+          <h2>Elasticsearch</h2>
+          <p class="desc">Store, search, and analyze your data with full-text search, vector search, AI search, and more.</p>
+          <div class="card-links">
+            <a href="@Model.Link("/deploy-manage/deploy/self-managed/installing-elasticsearch")">Install</a>
+            <a href="https://www.elastic.co/docs/api" target="_blank" rel="noopener noreferrer" hx-disable="true">REST API reference</a>
+            <a href="@Model.Link("/reference/query-languages/")">Query DSL</a>
+            <a href="@Model.Link("/release-notes/")">Release notes</a>
+          </div>
+          <a href="@Model.Link("/solutions/search")" class="card-cta">
+            Elasticsearch docs
+            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5"><path d="M5 12h14M12 5l7 7-7 7"/></svg>
+          </a>
         </div>
       </div>
+
     </div>
+  </section>
 
-    <div id="top-tab-deploy" class="tab-panel">
-      <div class="tab-cards">
-        <div class="tab-card">
-          <h4>Elastic Cloud Serverless</h4>
-          <ul>
-            <li><a href="@Model.Link("/deploy-manage")">Getting started →</a></li>
-            <li><a href="@Model.Link("/deploy-manage")">Project management →</a></li>
-            <li><a href="@Model.Link("/cloud-account")">Billing &amp; usage →</a></li>
-          </ul>
-        </div>
-        <div class="tab-card">
-          <h4>Elastic Cloud Hosted</h4>
-          <ul>
-            <li><a href="@Model.Link("/deploy-manage")">Getting started →</a></li>
-            <li><a href="@Model.Link("/deploy-manage")">Deployment management →</a></li>
-            <li><a href="@Model.Link("/deploy-manage")">Monitoring →</a></li>
-            <li><a href="@Model.Link("/cloud-account")">Billing →</a></li>
-          </ul>
-        </div>
-        <div class="tab-card">
-          <h4>Self-managed</h4>
-          <ul>
-            <li><a href="@Model.Link("/deploy-manage/deploy/self-managed/installing-elasticsearch")">Install Elasticsearch →</a></li>
-            <li><a href="@Model.Link("/deploy-manage")">Install Kibana →</a></li>
-            <li><a href="@Model.Link("/deploy-manage")">Configure →</a></li>
-            <li><a href="@Model.Link("/deploy-manage")">Secure a cluster →</a></li>
-            <li><a href="@Model.Link("/deploy-manage/upgrade")">Upgrade →</a></li>
-          </ul>
-        </div>
-        <div class="tab-card">
-          <h4>Elastic Cloud Enterprise (ECE)</h4>
-          <ul>
-            <li><a href="@Model.Link("/deploy-manage")">Install ECE →</a></li>
-            <li><a href="@Model.Link("/deploy-manage")">Manage deployments →</a></li>
-            <li><a href="@Model.Link("/deploy-manage")">Security &amp; users →</a></li>
-            <li><a href="@Model.Link("/deploy-manage/upgrade")">Upgrade →</a></li>
-          </ul>
+  <!-- ── Main content ── -->
+  <div class="landing-main">
+
+    <!-- Quick start -->
+    <div class="quickstart">
+      <h2>New to Elastic? Give it a try.</h2>
+      <div class="qs-grid">
+        <div class="qs-card">
+          <h4>Try locally</h4>
+          <p>Use Docker to install and run Elasticsearch and Kibana on your local machine.</p>
+          <a href="@Model.Link("/get-started")" class="qs-cta">Local installation docs →</a>
         </div>
-        <div class="tab-card">
-          <h4>Elastic Cloud on Kubernetes (ECK)</h4>
-          <ul>
-            <li><a href="@Model.Link("/deploy-manage")">Quickstart →</a></li>
-            <li><a href="@Model.Link("/deploy-manage")">Operator configuration →</a></li>
-            <li><a href="@Model.Link("/deploy-manage")">Manage resources →</a></li>
-            <li><a href="@Model.Link("/deploy-manage/upgrade")">Upgrade →</a></li>
-          </ul>
+        <div class="qs-card">
+          <h4>Start free Cloud trial</h4>
+          <p>Evaluate Elastic with a production-ready trial, using real data and use cases.</p>
+          <a href="https://cloud.elastic.co/registration?page=docs&placement=docs-body" target="_blank" rel="noopener noreferrer" hx-disable="true" class="qs-cta">Start free trial →</a>
         </div>
       </div>
     </div>
-  </div>
 
-  <div class="page-layout">
-    <div class="page-main">
+    <!-- What's new -->
+    <div class="landing-section-header">
+      <h2>What's new</h2>
+      <a href="@Model.Link("/release-notes/")">All release notes →</a>
+    </div>
+    <div class="news-grid">
+      <div class="news-card">
+        <div class="news-date">April 2026</div>
+        <h4>Elasticsearch @Model.CurrentVersion</h4>
+        <p>Improved authentication and upgraded security features.</p>
+      </div>
+      <div class="news-card">
+        <div class="news-date">April 2026</div>
+        <h4>Elastic AI Assistant is GA</h4>
+        <p>Ask questions about your data in plain English across Observability and Security.</p>
+      </div>
+      <div class="news-card">
+        <div class="news-date">March 2026</div>
+        <h4>New Serverless features</h4>
+        <p>Run Elasticsearch without managing infrastructure. New capabilities for search workloads.</p>
+      </div>
+    </div>
 
-      <!-- ── Get started ── -->
-      <div class="section">
-        <div class="section-header">
-          <h2>Get started</h2>
-        </div>
-        <div class="gs-grid">
-          <a class="gs-card" href="@Model.Link("/get-started")">
-            <div class="gs-card-icon icon-purple">
-              <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M2 3h6a4 4 0 0 1 4 4v14a3 3 0 0 0-3-3H2z"/><path d="M22 3h-6a4 4 0 0 0-4 4v14a3 3 0 0 1 3-3h7z"/></svg>
-            </div>
-            <h3>Elasticsearch concepts</h3>
-          </a>
-          <a class="gs-card" href="@Model.Link("/get-started")">
-            <div class="gs-card-icon icon-green">
-              <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="4 17 10 11 4 5"/><line x1="12" y1="19" x2="20" y2="19"/></svg>
-            </div>
-            <h3>Try locally</h3>
-          </a>
-          <a class="gs-card" href="https://cloud.elastic.co/registration?page=docs&placement=docs-body" target="_blank" rel="noopener noreferrer" hx-disable="true">
-            <div class="gs-card-icon icon-blue">
-              <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M17.5 19H9a7 7 0 1 1 6.71-9h1.79a4.5 4.5 0 1 1 0 9z"/></svg>
-            </div>
-            <h3>Start free trial</h3>
-          </a>
-        </div>
+    <!-- All products -->
+    <div class="landing-section-header">
+      <h2>All products</h2>
+    </div>
+    <div class="all-products-grid">
+      <div class="product-column">
+        <h4>Platform</h4>
+        <ul>
+          <li><a href="@Model.Link("/solutions/search")">Elasticsearch</a></li>
+          <li><a href="@Model.Link("/explore-analyze")">Kibana</a></li>
+          <li><a href="@Model.Link("/manage-data")">Logstash</a></li>
+          <li><a href="@Model.Link("/manage-data")">Beats</a></li>
+          <li><a href="@Model.Link("/explore-analyze")">Machine Learning</a></li>
+        </ul>
+      </div>
+      <div class="product-column">
+        <h4>Solutions</h4>
+        <ul>
+          <li><a href="@Model.Link("/solutions/search")">Elasticsearch</a></li>
+          <li><a href="@Model.Link("/solutions/observability")">Elastic Observability</a></li>
+          <li><a href="@Model.Link("/solutions/security")">Elastic Security</a></li>
+        </ul>
+      </div>
+      <div class="product-column">
+        <h4>Deploy</h4>
+        <ul>
+          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Serverless</a></li>
+          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Hosted</a></li>
+          <li><a href="@Model.Link("/deploy-manage")">Self-managed</a></li>
+          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Enterprise (ECE)</a></li>
+          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud on Kubernetes (ECK)</a></li>
+        </ul>
+      </div>
+      <div class="product-column">
+        <h4>Ingest tools</h4>
+        <ul>
+          <li><a href="@Model.Link("/manage-data")">Integrations</a></li>
+          <li><a href="@Model.Link("/reference/opentelemetry/")">Elastic Distributions for OpenTelemetry</a></li>
+          <li><a href="@Model.Link("/manage-data")">Fleet &amp; Elastic Agent</a></li>
+          <li><a href="@Model.Link("/solutions/observability")">APM</a></li>
+          <li><a href="@Model.Link("/solutions/security")">Elastic Defend</a></li>
+          <li><a href="@Model.Link("/manage-data")">Elastic Serverless Forwarder for AWS</a></li>
+          <li><a href="@Model.Link("/manage-data")">Connectors</a></li>
+          <li><a href="@Model.Link("/manage-data")">Web crawler</a></li>
+        </ul>
       </div>
+      <div class="product-column">
+        <h4>Query languages</h4>
+        <ul>
+          <li><a href="@Model.Link("/reference/query-languages/")">Query DSL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">ES|QL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">KQL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">SQL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">EQL</a></li>
+          <li><a href="@Model.Link("/reference/query-languages/")">Lucene</a></li>
+        </ul>
+      </div>
+      <div class="product-column">
+        <h4>APM agents</h4>
+        <ul>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Java</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">&#46;NET</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Node.js</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Python</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Ruby</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Go</a></li>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">PHP</a></li>
+        </ul>
+      </div>
+      <div class="product-column">
+        <h4>Developer tools &amp; standards</h4>
+        <ul>
+          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Elasticsearch clients</a></li>
+          <li><a href="@Model.Link("/reference")">Elastic Common Schema (ECS)</a></li>
+          <li><a href="@Model.Link("/reference")">Search UI</a></li>
+        </ul>
+      </div>
+    </div>
 
-      <!-- ── All products ── -->
-      <div class="section">
-        <div class="section-header">
-          <h2>All products</h2>
-        </div>
-        <div class="all-products-grid">
-          <div>
-            <h3 class="cat-heading">Platform</h3>
-            <ul class="cat-list">
-              <li><a href="@Model.Link("/solutions/search")">Elasticsearch</a></li>
-              <li><a href="@Model.Link("/explore-analyze")">Kibana</a></li>
-              <li><a href="@Model.Link("/manage-data")">Logstash</a></li>
-              <li><a href="@Model.Link("/manage-data")">Beats</a></li>
-              <li><a href="@Model.Link("/explore-analyze")">Machine Learning</a></li>
-            </ul>
-          </div>
-          <div>
-            <h3 class="cat-heading">Solutions</h3>
-            <ul class="cat-list">
-              <li><a href="@Model.Link("/solutions/search")">Elasticsearch</a></li>
-              <li><a href="@Model.Link("/solutions/observability")">Elastic Observability</a></li>
-              <li><a href="@Model.Link("/solutions/security")">Elastic Security</a></li>
-            </ul>
-          </div>
-          <div>
-            <h3 class="cat-heading">Deploy</h3>
-            <ul class="cat-list">
-              <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Serverless</a></li>
-              <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Hosted</a></li>
-              <li><a href="@Model.Link("/deploy-manage")">Self-managed</a></li>
-              <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Enterprise (ECE)</a></li>
-              <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud on Kubernetes (ECK)</a></li>
-            </ul>
-          </div>
-          <div>
-            <h3 class="cat-heading">Ingest tools</h3>
-            <ul class="cat-list">
-              <li><a href="@Model.Link("/manage-data")">Integrations</a></li>
-              <li><a href="@Model.Link("/reference/opentelemetry/")">Elastic Distributions for OpenTelemetry</a></li>
-              <li><a href="@Model.Link("/manage-data")">Fleet &amp; Elastic Agent</a></li>
-              <li><a href="@Model.Link("/solutions/observability")">APM</a></li>
-              <li><a href="@Model.Link("/solutions/security")">Elastic Defend</a></li>
-              <li><a href="@Model.Link("/manage-data")">Elastic Serverless Forwarder for AWS</a></li>
-              <li><a href="@Model.Link("/manage-data")">Connectors</a></li>
-              <li><a href="@Model.Link("/manage-data")">Web crawler</a></li>
-            </ul>
-          </div>
-          <div>
-            <h3 class="cat-heading">Query languages</h3>
-            <ul class="cat-list">
-              <li><a href="@Model.Link("/reference/query-languages/")">Query DSL</a></li>
-              <li><a href="@Model.Link("/reference/query-languages/")">ES|QL</a></li>
-              <li><a href="@Model.Link("/reference/query-languages/")">KQL</a></li>
-              <li><a href="@Model.Link("/reference/query-languages/")">SQL</a></li>
-              <li><a href="@Model.Link("/reference/query-languages/")">EQL</a></li>
-              <li><a href="@Model.Link("/reference/query-languages/")">Lucene</a></li>
-            </ul>
-          </div>
-          <div>
-            <h3 class="cat-heading">APM agents</h3>
-            <ul class="cat-list">
-              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Java</a></li>
-              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">&#46;NET</a></li>
-              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Node.js</a></li>
-              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Python</a></li>
-              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Ruby</a></li>
-              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Go</a></li>
-              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">PHP</a></li>
-            </ul>
-          </div>
-          <div>
-            <h3 class="cat-heading">Developer tools &amp; standards</h3>
-            <ul class="cat-list">
-              <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Elasticsearch clients</a></li>
-              <li><a href="@Model.Link("/reference")">Elastic Common Schema (ECS)</a></li>
-              <li><a href="@Model.Link("/reference")">Search UI</a></li>
-            </ul>
-          </div>
-        </div>
+    <!-- Help strip -->
+    <div class="help-strip">
+      <div class="help-item">
+        <h4>
+          <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg>
+          Community forums
+        </h4>
+        <p>Ask questions and get help from other Elastic users and engineers.</p>
+      </div>
+      <div class="help-item">
+        <h4>
+          <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg>
+          Training &amp; certification
+        </h4>
+        <p>Free courses and hands-on labs to build your Elastic skills.</p>
       </div>
+      <div class="help-item">
+        <h4>
+          <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M9 19c-5 1.5-5-2.5-7-3m14 6v-3.87a3.37 3.37 0 00-.94-2.61c3.14-.35 6.44-1.54 6.44-7A5.44 5.44 0 0020 4.77 5.07 5.07 0 0019.91 1S18.73.65 16 2.48a13.38 13.38 0 00-7 0C6.27.65 5.09 1 5.09 1A5.07 5.07 0 005 4.77a5.44 5.44 0 00-1.5 3.78c0 5.42 3.3 6.61 6.44 7A3.37 3.37 0 009 18.13V22"/></svg>
+          Report a docs issue
+        </h4>
+        <p>Found something wrong or confusing? Let us know on GitHub.</p>
+      </div>
+    </div>
 
-    </div><!-- /.page-main -->
-  </div><!-- /.page-layout -->
+  </div><!-- /.landing-main -->
 
   <!-- ── Footer ── -->
   <footer class="landing-footer">
-    <span>© 2026 Elasticsearch B.V.</span>
-    <span><a href="@Model.Link("/contribute-docs")">Edit this page</a> · <a href="@Model.Link("/contribute-docs")">Report a docs issue</a></span>
+    <div class="landing-footer-inner">
+      <span>© 2026 Elasticsearch B.V.</span>
+      <span><a href="@Model.Link("/contribute-docs")">Edit this page</a> · <a href="@Model.Link("/contribute-docs")">Report a docs issue</a></span>
+    </div>
   </footer>
 
 </div>
-
-<script>
-  function switchTopTab(e, tabId) {
-    var container = e.currentTarget.closest('.top-tabs');
-    container.querySelectorAll('.tab-panel').forEach(function(p) { p.classList.remove('active'); });
-    container.querySelectorAll('.tabs-nav button').forEach(function(b) { b.classList.remove('active'); });
-    document.getElementById(tabId).classList.add('active');
-    e.currentTarget.classList.add('active');
-  }
-</script>

From 92da03fe04c7fe8afb6dc07de275e79039272fb3 Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Mon, 11 May 2026 14:25:57 -0500
Subject: [PATCH 167/226] Improve landing page semantics and accessibility

- Swap divs for semantic HTML: header, main, section, article, nav, search, time
- Add aria-label attributes to hero, search, cards, and product nav
- Add aria-hidden to decorative SVGs
- Simplify help strip to single "Report a docs issue" item

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Layout/_LandingPage.cshtml                | 330 ++++++++----------
 1 file changed, 144 insertions(+), 186 deletions(-)

diff --git a/src/Elastic.Markdown/Layout/_LandingPage.cshtml b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
index e5bcd80fc9..bd36f16d75 100644
--- a/src/Elastic.Markdown/Layout/_LandingPage.cshtml
+++ b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
@@ -8,12 +8,10 @@
     --elastic-teal: #00BFB3;
     --elastic-teal-light: #E6FAF8;
     --elastic-pink: #F04E98;
-    --elastic-pink-light: #FDE8F2;
     --elastic-yellow: #FEC514;
     --elastic-green: #00B3A4;
     --bg: #ffffff;
     --bg-alt: #F5F7FA;
-    --bg-warm: #FAFBFC;
     --bg-dark: #1B2638;
     --text-primary: #1B2638;
     --text-secondary: #506477;
@@ -176,13 +174,8 @@
   .quickstart h2 {
     font-size: 18px;
     font-weight: 700;
-    margin-bottom: 4px;
-    letter-spacing: -0.2px;
-  }
-  .quickstart > p {
-    font-size: 14px;
-    color: var(--text-secondary);
     margin-bottom: 16px;
+    letter-spacing: -0.2px;
   }
   .qs-grid {
     display: grid;
@@ -203,7 +196,7 @@
     box-shadow: var(--shadow-sm);
     border-color: var(--elastic-blue);
   }
-  .qs-card h4 {
+  .qs-card h3 {
     font-size: 14px;
     font-weight: 600;
     margin-bottom: 8px;
@@ -253,6 +246,7 @@
   }
   .news-card:hover { border-color: var(--elastic-blue); }
   .news-date {
+    display: block;
     font-size: 11px;
     color: var(--text-tertiary);
     font-weight: 500;
@@ -260,7 +254,7 @@
     letter-spacing: 0.3px;
     margin-bottom: 6px;
   }
-  .news-card h4 { font-size: 13px; font-weight: 600; margin-bottom: 4px; }
+  .news-card h3 { font-size: 13px; font-weight: 600; margin-bottom: 4px; }
   .news-card p { font-size: 12px; color: var(--text-secondary); line-height: 1.45; }
 
   /* ── All products ── */
@@ -270,7 +264,7 @@
     gap: 32px 24px;
     margin-bottom: 52px;
   }
-  .product-column h4 {
+  .product-column h3 {
     font-size: 13px;
     font-weight: 700;
     color: var(--text-primary);
@@ -294,12 +288,13 @@
     border-radius: var(--radius-md);
     padding: 32px 36px;
     display: grid;
-    grid-template-columns: repeat(3, 1fr);
+    grid-template-columns: 1fr;
     gap: 24px;
     margin-bottom: 24px;
+    max-width: 480px;
     border: 1px solid var(--border-light);
   }
-  .help-item h4 {
+  .help-item h3 {
     font-size: 13px;
     font-weight: 600;
     margin-bottom: 4px;
@@ -310,32 +305,11 @@
   }
   .help-item p { font-size: 12px; color: var(--text-secondary); line-height: 1.45; }
 
-  /* ── Footer ── */
-  .landing-footer {
-    background: var(--bg-dark);
-    padding: 44px 40px;
-    color: rgba(255,255,255,0.6);
-    font-family: var(--font);
-  }
-  .landing-footer-inner {
-    max-width: var(--max-w);
-    margin: 0 auto;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 12px;
-    font-size: 13px;
-  }
-  .landing-footer a { color: rgba(255,255,255,0.5); transition: color 0.15s; }
-  .landing-footer a:hover { color: rgba(255,255,255,0.85); }
-
   /* ── Responsive ── */
   @@media (max-width: 900px) {
     .hero-cards { grid-template-columns: 1fr; }
     .all-products-grid { grid-template-columns: repeat(2, 1fr); }
     .news-grid { grid-template-columns: 1fr; }
-    .help-strip { grid-template-columns: 1fr; }
   }
   @@media (max-width: 640px) {
     .landing-hero { padding: 36px 20px 0; }
@@ -349,208 +323,192 @@
 <div hx-select-oob="#main-container" hx-swap="none" class="landing-page w-full max-w-[100vw] relative overflow-x-hidden">
 
   <!-- ── Hero ── -->
-  <section class="landing-hero">
+  <header class="landing-hero" role="banner">
     <div class="landing-hero-inner">
 
       <div class="hero-welcome">
         <h1>Elastic documentation</h1>
-        <p>Official docs for the Elastic Stack, Elastic Cloud, and Elastic solutions.</p>
+        <p>Official docs for the Elastic Stack, Elastic Cloud, and Elastic solutions. Open source, built by Elastic.</p>
       </div>
 
-      <div class="hero-search-wrap">
-        <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="#8C9BAB" stroke-width="2.5"><circle cx="11" cy="11" r="8"/><path d="M21 21l-4.35-4.35"/></svg>
-        <navigation-search></navigation-search>
-      </div>
+      <search role="search" aria-label="Search documentation">
+        <div class="hero-search-wrap">
+          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="#8C9BAB" stroke-width="2.5" aria-hidden="true"><circle cx="11" cy="11" r="8"/><path d="M21 21l-4.35-4.35"/></svg>
+          <navigation-search></navigation-search>
+        </div>
+      </search>
 
-      <div class="hero-cards">
-        <div class="hero-card primary">
+      <section class="hero-cards" aria-label="Popular documentation">
+        <article class="hero-card primary">
           <h2>Learn how to use Elastic</h2>
           <p class="desc">Get started with an overview of Elasticsearch, Kibana, and the rest of the Elastic Stack.</p>
-          <div class="card-links">
+          <nav class="card-links" aria-label="Fundamentals quick links">
             <a href="@Model.Link("/get-started")">What is Elasticsearch?</a>
             <a href="@Model.Link("/get-started")">The Elastic Stack</a>
             <a href="@Model.Link("/manage-data")">Ingest data</a>
             <a href="@Model.Link("/manage-data")">Index basics</a>
-          </div>
+          </nav>
           <a href="@Model.Link("/get-started")" class="card-cta">
             Get started
-            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5"><path d="M5 12h14M12 5l7 7-7 7"/></svg>
+            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" aria-hidden="true"><path d="M5 12h14M12 5l7 7-7 7"/></svg>
           </a>
-        </div>
-        <div class="hero-card">
+        </article>
+        <article class="hero-card">
           <h2>Elasticsearch</h2>
           <p class="desc">Store, search, and analyze your data with full-text search, vector search, AI search, and more.</p>
-          <div class="card-links">
+          <nav class="card-links" aria-label="Elasticsearch quick links">
             <a href="@Model.Link("/deploy-manage/deploy/self-managed/installing-elasticsearch")">Install</a>
             <a href="https://www.elastic.co/docs/api" target="_blank" rel="noopener noreferrer" hx-disable="true">REST API reference</a>
             <a href="@Model.Link("/reference/query-languages/")">Query DSL</a>
             <a href="@Model.Link("/release-notes/")">Release notes</a>
-          </div>
+          </nav>
           <a href="@Model.Link("/solutions/search")" class="card-cta">
             Elasticsearch docs
-            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5"><path d="M5 12h14M12 5l7 7-7 7"/></svg>
+            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" aria-hidden="true"><path d="M5 12h14M12 5l7 7-7 7"/></svg>
           </a>
-        </div>
-      </div>
+        </article>
+      </section>
 
     </div>
-  </section>
+  </header>
 
   <!-- ── Main content ── -->
-  <div class="landing-main">
+  <main class="landing-main">
 
     <!-- Quick start -->
-    <div class="quickstart">
+    <section class="quickstart" aria-label="Getting started">
       <h2>New to Elastic? Give it a try.</h2>
       <div class="qs-grid">
-        <div class="qs-card">
-          <h4>Try locally</h4>
+        <article class="qs-card">
+          <h3>Try locally</h3>
           <p>Use Docker to install and run Elasticsearch and Kibana on your local machine.</p>
           <a href="@Model.Link("/get-started")" class="qs-cta">Local installation docs →</a>
-        </div>
-        <div class="qs-card">
-          <h4>Start free Cloud trial</h4>
+        </article>
+        <article class="qs-card">
+          <h3>Start free Cloud trial</h3>
           <p>Evaluate Elastic with a production-ready trial, using real data and use cases.</p>
           <a href="https://cloud.elastic.co/registration?page=docs&placement=docs-body" target="_blank" rel="noopener noreferrer" hx-disable="true" class="qs-cta">Start free trial →</a>
-        </div>
+        </article>
       </div>
-    </div>
+    </section>
 
     <!-- What's new -->
-    <div class="landing-section-header">
-      <h2>What's new</h2>
-      <a href="@Model.Link("/release-notes/")">All release notes →</a>
-    </div>
-    <div class="news-grid">
-      <div class="news-card">
-        <div class="news-date">April 2026</div>
-        <h4>Elasticsearch @Model.CurrentVersion</h4>
-        <p>Improved authentication and upgraded security features.</p>
+    <section aria-label="What's new">
+      <div class="landing-section-header">
+        <h2>What's new</h2>
+        <a href="@Model.Link("/release-notes/")">All release notes →</a>
       </div>
-      <div class="news-card">
-        <div class="news-date">April 2026</div>
-        <h4>Elastic AI Assistant is GA</h4>
-        <p>Ask questions about your data in plain English across Observability and Security.</p>
+      <div class="news-grid">
+        <article class="news-card">
+          <time class="news-date" datetime="2026-04">April 2026</time>
+          <h3>Elasticsearch @Model.CurrentVersion</h3>
+          <p>Improved authentication and upgraded security features.</p>
+        </article>
+        <article class="news-card">
+          <time class="news-date" datetime="2026-04">April 2026</time>
+          <h3>Elastic AI Assistant is GA</h3>
+          <p>Ask questions about your data in plain English across Observability and Security.</p>
+        </article>
+        <article class="news-card">
+          <time class="news-date" datetime="2026-03">March 2026</time>
+          <h3>New Serverless features</h3>
+          <p>Run Elasticsearch without managing infrastructure. New capabilities for search workloads.</p>
+        </article>
       </div>
-      <div class="news-card">
-        <div class="news-date">March 2026</div>
-        <h4>New Serverless features</h4>
-        <p>Run Elasticsearch without managing infrastructure. New capabilities for search workloads.</p>
-      </div>
-    </div>
+    </section>
 
     <!-- All products -->
-    <div class="landing-section-header">
-      <h2>All products</h2>
-    </div>
-    <div class="all-products-grid">
-      <div class="product-column">
-        <h4>Platform</h4>
-        <ul>
-          <li><a href="@Model.Link("/solutions/search")">Elasticsearch</a></li>
-          <li><a href="@Model.Link("/explore-analyze")">Kibana</a></li>
-          <li><a href="@Model.Link("/manage-data")">Logstash</a></li>
-          <li><a href="@Model.Link("/manage-data")">Beats</a></li>
-          <li><a href="@Model.Link("/explore-analyze")">Machine Learning</a></li>
-        </ul>
-      </div>
-      <div class="product-column">
-        <h4>Solutions</h4>
-        <ul>
-          <li><a href="@Model.Link("/solutions/search")">Elasticsearch</a></li>
-          <li><a href="@Model.Link("/solutions/observability")">Elastic Observability</a></li>
-          <li><a href="@Model.Link("/solutions/security")">Elastic Security</a></li>
-        </ul>
-      </div>
-      <div class="product-column">
-        <h4>Deploy</h4>
-        <ul>
-          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Serverless</a></li>
-          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Hosted</a></li>
-          <li><a href="@Model.Link("/deploy-manage")">Self-managed</a></li>
-          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Enterprise (ECE)</a></li>
-          <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud on Kubernetes (ECK)</a></li>
-        </ul>
+    <nav aria-label="Product documentation">
+      <div class="landing-section-header">
+        <h2>All products</h2>
       </div>
-      <div class="product-column">
-        <h4>Ingest tools</h4>
-        <ul>
-          <li><a href="@Model.Link("/manage-data")">Integrations</a></li>
-          <li><a href="@Model.Link("/reference/opentelemetry/")">Elastic Distributions for OpenTelemetry</a></li>
-          <li><a href="@Model.Link("/manage-data")">Fleet &amp; Elastic Agent</a></li>
-          <li><a href="@Model.Link("/solutions/observability")">APM</a></li>
-          <li><a href="@Model.Link("/solutions/security")">Elastic Defend</a></li>
-          <li><a href="@Model.Link("/manage-data")">Elastic Serverless Forwarder for AWS</a></li>
-          <li><a href="@Model.Link("/manage-data")">Connectors</a></li>
-          <li><a href="@Model.Link("/manage-data")">Web crawler</a></li>
-        </ul>
-      </div>
-      <div class="product-column">
-        <h4>Query languages</h4>
-        <ul>
-          <li><a href="@Model.Link("/reference/query-languages/")">Query DSL</a></li>
-          <li><a href="@Model.Link("/reference/query-languages/")">ES|QL</a></li>
-          <li><a href="@Model.Link("/reference/query-languages/")">KQL</a></li>
-          <li><a href="@Model.Link("/reference/query-languages/")">SQL</a></li>
-          <li><a href="@Model.Link("/reference/query-languages/")">EQL</a></li>
-          <li><a href="@Model.Link("/reference/query-languages/")">Lucene</a></li>
-        </ul>
-      </div>
-      <div class="product-column">
-        <h4>APM agents</h4>
-        <ul>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Java</a></li>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">&#46;NET</a></li>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Node.js</a></li>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Python</a></li>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Ruby</a></li>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Go</a></li>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">PHP</a></li>
-        </ul>
-      </div>
-      <div class="product-column">
-        <h4>Developer tools &amp; standards</h4>
-        <ul>
-          <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Elasticsearch clients</a></li>
-          <li><a href="@Model.Link("/reference")">Elastic Common Schema (ECS)</a></li>
-          <li><a href="@Model.Link("/reference")">Search UI</a></li>
-        </ul>
+      <div class="all-products-grid">
+        <div class="product-column">
+          <h3>Platform</h3>
+          <ul>
+            <li><a href="@Model.Link("/solutions/search")">Elasticsearch</a></li>
+            <li><a href="@Model.Link("/explore-analyze")">Kibana</a></li>
+            <li><a href="@Model.Link("/manage-data")">Logstash</a></li>
+            <li><a href="@Model.Link("/manage-data")">Beats</a></li>
+            <li><a href="@Model.Link("/explore-analyze")">Machine Learning</a></li>
+          </ul>
+        </div>
+        <div class="product-column">
+          <h3>Solutions</h3>
+          <ul>
+            <li><a href="@Model.Link("/solutions/search")">Elasticsearch</a></li>
+            <li><a href="@Model.Link("/solutions/observability")">Elastic Observability</a></li>
+            <li><a href="@Model.Link("/solutions/security")">Elastic Security</a></li>
+          </ul>
+        </div>
+        <div class="product-column">
+          <h3>Deploy</h3>
+          <ul>
+            <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Serverless</a></li>
+            <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Hosted</a></li>
+            <li><a href="@Model.Link("/deploy-manage")">Self-managed</a></li>
+            <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud Enterprise (ECE)</a></li>
+            <li><a href="@Model.Link("/deploy-manage")">Elastic Cloud on Kubernetes (ECK)</a></li>
+          </ul>
+        </div>
+        <div class="product-column">
+          <h3>Ingest tools</h3>
+          <ul>
+            <li><a href="@Model.Link("/manage-data")">Integrations</a></li>
+            <li><a href="@Model.Link("/reference/opentelemetry/")">Elastic Distributions for OpenTelemetry</a></li>
+            <li><a href="@Model.Link("/manage-data")">Fleet &amp; Elastic Agent</a></li>
+            <li><a href="@Model.Link("/solutions/observability")">APM</a></li>
+            <li><a href="@Model.Link("/solutions/security")">Elastic Defend</a></li>
+            <li><a href="@Model.Link("/manage-data")">Elastic Serverless Forwarder for AWS</a></li>
+            <li><a href="@Model.Link("/manage-data")">Connectors</a></li>
+            <li><a href="@Model.Link("/manage-data")">Web crawler</a></li>
+          </ul>
+        </div>
+        <div class="product-column">
+          <h3>Query languages</h3>
+          <ul>
+            <li><a href="@Model.Link("/reference/query-languages/")">Query DSL</a></li>
+            <li><a href="@Model.Link("/reference/query-languages/")">ES|QL</a></li>
+            <li><a href="@Model.Link("/reference/query-languages/")">KQL</a></li>
+            <li><a href="@Model.Link("/reference/query-languages/")">SQL</a></li>
+            <li><a href="@Model.Link("/reference/query-languages/")">EQL</a></li>
+            <li><a href="@Model.Link("/reference/query-languages/")">Lucene</a></li>
+          </ul>
+        </div>
+        <div class="product-column">
+          <h3>APM agents</h3>
+          <ul>
+            <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Java</a></li>
+            <li><a href="@Model.Link("/reference/elasticsearch-clients/")">&#46;NET</a></li>
+            <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Node.js</a></li>
+            <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Python</a></li>
+            <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Ruby</a></li>
+            <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Go</a></li>
+            <li><a href="@Model.Link("/reference/elasticsearch-clients/")">PHP</a></li>
+          </ul>
+        </div>
+        <div class="product-column">
+          <h3>Developer tools &amp; standards</h3>
+          <ul>
+            <li><a href="@Model.Link("/reference/elasticsearch-clients/")">Elasticsearch clients</a></li>
+            <li><a href="@Model.Link("/reference")">Elastic Common Schema (ECS)</a></li>
+            <li><a href="@Model.Link("/reference")">Search UI</a></li>
+          </ul>
+        </div>
       </div>
-    </div>
+    </nav>
 
-    <!-- Help strip -->
-    <div class="help-strip">
-      <div class="help-item">
-        <h4>
-          <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg>
-          Community forums
-        </h4>
-        <p>Ask questions and get help from other Elastic users and engineers.</p>
-      </div>
-      <div class="help-item">
-        <h4>
-          <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg>
-          Training &amp; certification
-        </h4>
-        <p>Free courses and hands-on labs to build your Elastic skills.</p>
-      </div>
+    <!-- Help -->
+    <section class="help-strip" aria-label="Help and community resources">
       <div class="help-item">
-        <h4>
-          <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M9 19c-5 1.5-5-2.5-7-3m14 6v-3.87a3.37 3.37 0 00-.94-2.61c3.14-.35 6.44-1.54 6.44-7A5.44 5.44 0 0020 4.77 5.07 5.07 0 0019.91 1S18.73.65 16 2.48a13.38 13.38 0 00-7 0C6.27.65 5.09 1 5.09 1A5.07 5.07 0 005 4.77a5.44 5.44 0 00-1.5 3.78c0 5.42 3.3 6.61 6.44 7A3.37 3.37 0 009 18.13V22"/></svg>
+        <h3>
+          <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" aria-hidden="true"><path d="M9 19c-5 1.5-5-2.5-7-3m14 6v-3.87a3.37 3.37 0 00-.94-2.61c3.14-.35 6.44-1.54 6.44-7A5.44 5.44 0 0020 4.77 5.07 5.07 0 0019.91 1S18.73.65 16 2.48a13.38 13.38 0 00-7 0C6.27.65 5.09 1 5.09 1A5.07 5.07 0 005 4.77a5.44 5.44 0 00-1.5 3.78c0 5.42 3.3 6.61 6.44 7A3.37 3.37 0 009 18.13V22"/></svg>
           Report a docs issue
-        </h4>
-        <p>Found something wrong or confusing? Let us know on GitHub.</p>
+        </h3>
+        <p>Found something wrong or confusing? <a href="@Model.Link("/contribute-docs")">Let us know on GitHub.</a></p>
       </div>
-    </div>
-
-  </div><!-- /.landing-main -->
+    </section>
 
-  <!-- ── Footer ── -->
-  <footer class="landing-footer">
-    <div class="landing-footer-inner">
-      <span>© 2026 Elasticsearch B.V.</span>
-      <span><a href="@Model.Link("/contribute-docs")">Edit this page</a> · <a href="@Model.Link("/contribute-docs")">Report a docs issue</a></span>
-    </div>
-  </footer>
+  </main>
 
 </div>

From 393f73bd22089b93c4146294d77105d7e8c19b30 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Mon, 11 May 2026 21:53:18 +0200
Subject: [PATCH 168/226] Validate links in {hero}, {link-card}, {whats-new}
 directives
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

URL fields in hub directive YAML bodies and options never went through
Markdig's link parser, so cross-link resolution, missing-file checks,
and link-index emission were all skipped — broken hub links shipped as
silent 404s.

Adds HubLinkValidator, invoked from each hub block's FinalizeAndValidate
for every URL field. It:
- resolves declared cross-link schemes via CrossLinkResolver.TryResolve,
  rewrites the value with the resolved URL, and registers via
  Build.Collector.EmitCrossLink
- emits errors for undeclared schemes (with cursor:/vscode: passthrough)
- checks internal absolute paths against the docset source dir in
  isolated builds (skipped under assembler/codex where cross-docset
  paths are legal — assembler-aware validation is a follow-up)
- honours configured redirects with a warning suggesting the new path

Wired only into HeroBlock, LinkCardBlock, and WhatsNewBlock. Surfaces
~40 previously-silent broken cross-link references in docs-content's
kibana/elasticsearch hub pages.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../Myst/Directives/Hub/HeroBlock.cs          |   6 +-
 .../Myst/Directives/Hub/HubLinkValidator.cs   | 135 ++++++++++++++++++
 .../Myst/Directives/Hub/LinkCardBlock.cs      |   9 ++
 .../Myst/Directives/Hub/WhatsNewBlock.cs      |  12 ++
 4 files changed, 160 insertions(+), 2 deletions(-)
 create mode 100644 src/Elastic.Markdown/Myst/Directives/Hub/HubLinkValidator.cs

diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
index 8787ad312f..b776239d70 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HeroBlock.cs
@@ -48,9 +48,11 @@ public override void FinalizeAndValidate(ParserContext context)
 		// search defaults to true; explicit ":search: false" hides it
 		ShowSearch = TryPropBool("search") ?? true;
 		QuickLinks = ParsePairs(Prop("quick-links"), allowEmptyUrl: false)
-			.Select(p => new HeroQuickLink(p.Label, p.Url!)).ToList();
+			.Select(p => new HeroQuickLink(p.Label, HubLinkValidator.ValidateAndResolve(p.Url, this, context) ?? p.Url!))
+			.ToList();
 		OtherVersions = ParsePairs(Prop("versions"), allowEmptyUrl: true)
-			.Select(p => new HeroVersion(p.Label, p.Url)).ToList();
+			.Select(p => new HeroVersion(p.Label, HubLinkValidator.ValidateAndResolve(p.Url, this, context)))
+			.ToList();
 		Releases = Prop("releases");
 
 		if (string.IsNullOrWhiteSpace(Title))
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HubLinkValidator.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HubLinkValidator.cs
new file mode 100644
index 0000000000..159a59ab2e
--- /dev/null
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HubLinkValidator.cs
@@ -0,0 +1,135 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Documentation;
+using Elastic.Documentation.Links;
+using Elastic.Markdown.Diagnostics;
+
+namespace Elastic.Markdown.Myst.Directives.Hub;
+
+/// <summary>
+/// Validates and resolves URL values supplied in hub directive YAML bodies and
+/// options. These URLs never pass through Markdig's <c>LinkInlineParser</c>, so
+/// without this helper the normal cross-link resolution, missing-file checks,
+/// and link-index emission are skipped — broken hub links ship silently.
+///
+/// Returns the resolved URL (or the original on failure) so callers can write
+/// it back into their YAML data records. Errors / hints are emitted against
+/// the supplying <see cref="DirectiveBlock"/>.
+/// </summary>
+internal static class HubLinkValidator
+{
+	/// <summary>
+	/// Validate <paramref name="url"/> and, when applicable, resolve cross-link
+	/// schemes to their final form. Returns the (possibly rewritten) URL.
+	/// </summary>
+	public static string? ValidateAndResolve(string? url, DirectiveBlock block, ParserContext context)
+	{
+		if (string.IsNullOrWhiteSpace(url) || block.SkipValidation)
+			return url;
+
+		var trimmed = url.Trim();
+		if (trimmed.Length == 0 || trimmed[0] == '#')
+			return url;
+
+		if (trimmed.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
+			|| trimmed.StartsWith("https://", StringComparison.OrdinalIgnoreCase)
+			|| trimmed.StartsWith("mailto:", StringComparison.OrdinalIgnoreCase))
+			return url;
+
+		if (Uri.TryCreate(trimmed, UriKind.Absolute, out var uri) && CrossLinkValidator.IsCrossLink(uri))
+			return ResolveCrossLink(url, uri, block, context);
+
+		// Treat anything else as a docset-internal path. Hub directives are authored
+		// with site-absolute paths (e.g. "/explore-analyze/discover.md"); relative
+		// paths don't have a meaningful base because the YAML body isn't anchored
+		// to a markdown file location the way an inline [text](url) link is.
+		if (!trimmed.StartsWith('/'))
+		{
+			block.EmitError($"Hub directive link `{url}` must be an absolute path starting with `/`, a cross-link scheme (e.g. `kibana://`), or an external URL.");
+			return url;
+		}
+
+		ValidateInternal(url, block, context);
+		return url;
+	}
+
+	private static string ResolveCrossLink(string original, Uri uri, DirectiveBlock block, ParserContext context)
+	{
+		var resolver = context.CrossLinkResolver;
+		if (!resolver.IsDeclaredCrossLinkScheme(uri.Scheme))
+		{
+			// Custom passthrough protocols (cursor:, vscode:) — leave alone.
+			if (IsPassthroughCustomProtocolScheme(uri.Scheme))
+				return original;
+			block.EmitError($"Hub directive link `{original}` uses cross-link scheme `{uri.Scheme}://` which is not declared under `cross_links` in docset.yml.");
+			return original;
+		}
+
+		context.Build.Collector.EmitCrossLink(original);
+		return resolver.TryResolve(s => block.EmitError(s), uri, out var resolved)
+			? resolved.ToString()
+			: original;
+	}
+
+	private static void ValidateInternal(string url, DirectiveBlock block, ParserContext context)
+	{
+		// In Assembler/Codex builds an absolute path may target a file owned by a
+		// different docset (the assembled site is the union of all docsets), so the
+		// current docset's source dir isn't the right basis for an existence check.
+		// Cross-docset references should ideally use the cross-link scheme so they
+		// resolve through CrossLinkResolver, but we don't have a way to assert that
+		// at this layer yet — flagging here would produce false positives.
+		if (context.Build.BuildType != BuildType.Isolated)
+			return;
+
+		var (path, _) = SplitAnchor(url);
+		if (string.IsNullOrEmpty(path) || path == "/")
+			return;
+
+		var sourceDir = context.Build.DocumentationSourceDirectory.FullName;
+		var fs = context.Build.ReadFileSystem;
+		var rel = path.TrimStart('/');
+
+		// Probe candidates in order: as-given, with .md, with /index.md.
+		// docs-builder URLs typically omit .md, so authors write /explore-analyze/discover
+		// for /explore-analyze/discover.md or /explore-analyze/discover/index.md.
+		string[] candidates = path.EndsWith(".md", StringComparison.OrdinalIgnoreCase)
+			? [rel]
+			: [rel, rel + ".md", rel.TrimEnd('/') + "/index.md"];
+
+		foreach (var candidate in candidates)
+		{
+			if (context.TryFindDocumentByRelativePath(candidate) is not null)
+				return;
+			var pathOnDisk = Path.GetFullPath(Path.Join(sourceDir, candidate));
+			if (fs.File.Exists(pathOnDisk))
+				return;
+		}
+
+		// Honour configured redirects so old paths emit a hint, not an error.
+		if (context.Configuration.Redirects is not null
+			&& context.Configuration.Redirects.TryGetValue(rel, out var redirect))
+		{
+			var to = redirect.To
+				?? (redirect.Many is not null
+					? string.Join(", ", redirect.Many.Select(m => m.To))
+					: "unknown");
+			block.EmitWarning($"Hub directive link `{url}` has a redirect; update to: {to}");
+			return;
+		}
+
+		block.EmitError($"Hub directive link `{url}` does not exist. If it was recently removed add a redirect.");
+	}
+
+	private static (string Path, string? Anchor) SplitAnchor(string url)
+	{
+		var hash = url.IndexOf('#');
+		return hash < 0 ? (url, null) : (url[..hash], url[(hash + 1)..]);
+	}
+
+	private static bool IsPassthroughCustomProtocolScheme(string scheme) =>
+		scheme.Equals("cursor", StringComparison.OrdinalIgnoreCase)
+		|| scheme.StartsWith("vscode", StringComparison.OrdinalIgnoreCase);
+}
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardBlock.cs
index a116fd6e81..61fadeb63d 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/LinkCardBlock.cs
@@ -64,6 +64,15 @@ public override void FinalizeAndValidate(ParserContext context)
 
 		if (string.IsNullOrWhiteSpace(Data.Title))
 			this.EmitError("{link-card} requires a `title` field in its YAML body.");
+
+		Data.Link = HubLinkValidator.ValidateAndResolve(Data.Link, this, context);
+		foreach (var link in Data.Links)
+			link.Url = HubLinkValidator.ValidateAndResolve(link.Url, this, context);
+		if (Data.Aside is not null)
+		{
+			foreach (var link in Data.Aside.Links)
+				link.Url = HubLinkValidator.ValidateAndResolve(link.Url, this, context);
+		}
 	}
 }
 
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
index f61250d815..cf271a5ba8 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
@@ -49,6 +49,7 @@ public override void FinalizeAndValidate(ParserContext context)
 				return;
 			}
 			Data = resolved;
+			ValidateLinks(context);
 			return;
 		}
 
@@ -66,7 +67,18 @@ public override void FinalizeAndValidate(ParserContext context)
 		catch (YamlException ex)
 		{
 			this.EmitError($"{{whats-new}} YAML parse error: {ex.Message}");
+			return;
 		}
+
+		ValidateLinks(context);
+	}
+
+	private void ValidateLinks(ParserContext context)
+	{
+		foreach (var link in Data.ReleaseLinks)
+			link.Url = HubLinkValidator.ValidateAndResolve(link.Url, this, context);
+		foreach (var item in Data.Items)
+			item.Link = HubLinkValidator.ValidateAndResolve(item.Link, this, context);
 	}
 
 	private WhatsNewData? LoadFromCentralConfig(string productKey)

From 02a09795573ced2f253c4c921eccf773041c39e6 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 12 May 2026 11:08:12 +0200
Subject: [PATCH 169/226] fix(synthetics): target redesigned landing page hero
 CTA

Replace the 'Elastic Fundamentals' link locator with the new
'Get started' hero CTA, scoped to .landing-hero, since the
redesigned landing page no longer exposes the prior label.
---
 .../synthetics/journeys/navigation-test.journey.ts           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.Documentation.Site/synthetics/journeys/navigation-test.journey.ts b/src/Elastic.Documentation.Site/synthetics/journeys/navigation-test.journey.ts
index 72544d6a5b..b7bc1dc6cc 100644
--- a/src/Elastic.Documentation.Site/synthetics/journeys/navigation-test.journey.ts
+++ b/src/Elastic.Documentation.Site/synthetics/journeys/navigation-test.journey.ts
@@ -26,9 +26,10 @@ journey('navigation test', ({ page, params }) => {
         await expect(page).toHaveTitle(/Elastic Docs \| Elastic Docs/)
     })
 
-    step('Click on "Elastic Fundamentals"', async () => {
+    step('Click on "Get started" CTA in hero', async () => {
         await page
-            .getByRole('link', { name: 'Elastic Fundamentals' })
+            .locator('.landing-hero')
+            .getByRole('link', { name: 'Get started' })
             .first()
             .click()
         await expect(page).toHaveURL(`${host}/docs/get-started`)

From b573d6fd4f654ce1775876aa8cac77d210ab1c26 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Tue, 12 May 2026 13:19:54 +0200
Subject: [PATCH 170/226] Fix isolated preview header stacking under Nav V2
 chrome

Raise z-index above sidebar/overlay, add border for separation, and
style elastic-docs-header before custom element upgrade.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Documentation.Site/Assets/isolated.css    | 11 +++++++++++
 .../Layout/_IsolatedHeader.cshtml                     |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Elastic.Documentation.Site/Assets/isolated.css b/src/Elastic.Documentation.Site/Assets/isolated.css
index 50b6b1b5ef..6dd8e90079 100644
--- a/src/Elastic.Documentation.Site/Assets/isolated.css
+++ b/src/Elastic.Documentation.Site/Assets/isolated.css
@@ -5,6 +5,17 @@
 	--offset-top: 48px;
 }
 
+/*
+ * Preview chrome must stack above the pages sidebar (z-40 on small screens) and the
+ * mobile drawer overlay (z-30). The host uses z-50 in _IsolatedHeader.cshtml.
+ * Until the custom element upgrades, keep a visible bar so the strip is not mistaken for “missing”.
+ */
+elastic-docs-header:not(:defined) {
+	display: block;
+	min-height: 48px;
+	background-color: var(--color-ink-navy);
+}
+
 elastic-docs-header .euiHeader {
 	padding-inline: calc((100vw - var(--max-layout-width)) / 2 + 8px);
 }
diff --git a/src/Elastic.Documentation.Site/Layout/_IsolatedHeader.cshtml b/src/Elastic.Documentation.Site/Layout/_IsolatedHeader.cshtml
index e4b488c17a..2774f5eb1c 100644
--- a/src/Elastic.Documentation.Site/Layout/_IsolatedHeader.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_IsolatedHeader.cshtml
@@ -1,5 +1,5 @@
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
-<div class="sticky top-0 z-30 h-12">
+<div class="relative isolate sticky top-0 z-50 h-12 border-b border-grey-20">
 	<elastic-docs-header title="@(Model.HeaderTitle ?? Model.DocSetName)"
 	                     logo-href="@(Model.Link("/"))"
 	                     github-repository="@(Model.GitRepository)"

From 9cb829cc076c727aa367177914d9bce4e5fd14c9 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 12 May 2026 13:58:01 +0200
Subject: [PATCH 171/226] fix(hub): skip hub link existence checks for dev_docs
 sandboxes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

dev_docs docsets (docs-builder's own /docs, etc.) are explicitly not
linkable by the assembler and routinely host fixtures that reference
cross-docset pages with bare absolute paths. Running the local-docset
existence check on them produces false positives — the validator
flagged dozens of legitimate cross-docset paths in the testing/products
hub-page fixtures.

Mirrors the existing BuildType.Isolated guard, which already opts out
of the check when the build can't see the full assembled site.
---
 .../Myst/Directives/Hub/HubLinkValidator.cs                | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HubLinkValidator.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HubLinkValidator.cs
index 159a59ab2e..843c8d9f2b 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HubLinkValidator.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HubLinkValidator.cs
@@ -84,6 +84,13 @@ private static void ValidateInternal(string url, DirectiveBlock block, ParserCon
 		if (context.Build.BuildType != BuildType.Isolated)
 			return;
 
+		// dev_docs sandboxes (docs-builder's own /docs, etc.) are not part of the
+		// assembled site and routinely host fixtures that reference cross-docset
+		// pages with bare absolute paths. Existence checks against the local docset
+		// would produce false positives.
+		if (context.Configuration.DevelopmentDocs)
+			return;
+
 		var (path, _) = SplitAnchor(url);
 		if (string.IsNullOrEmpty(path) || path == "/")
 			return;

From a0bcc782e4e1041d0c2906afc482e86dd87faf89 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 12 May 2026 14:39:06 +0200
Subject: [PATCH 172/226] Show Guide sidebar on docs landing page

Treat the docs home as the Guide section capstone so the landing page can reuse the Nav V2 sidebar while keeping the page chrome minimal.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/styles.css                         |  7 ++++-
 src/Elastic.Markdown/_Layout.cshtml           | 29 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 4c98057f7f..d6561acbf4 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -198,10 +198,15 @@ body:has([data-nav-v2]) aside.sidebar {
 }
 
 .sidebar #pages-nav .pages-nav-menu {
-	scrollbar-gutter: stable;
+	scrollbar-gutter: auto;
+	scrollbar-width: none;
 	padding-right: 8px;
 }
 
+.sidebar #pages-nav .pages-nav-menu::-webkit-scrollbar {
+	display: none;
+}
+
 /* Nav V2: stack list items vertically */
 #pages-nav nav[data-nav-v2] ul {
 	display: flex;
diff --git a/src/Elastic.Markdown/_Layout.cshtml b/src/Elastic.Markdown/_Layout.cshtml
index 20974384c7..1c5aa95411 100644
--- a/src/Elastic.Markdown/_Layout.cshtml
+++ b/src/Elastic.Markdown/_Layout.cshtml
@@ -69,6 +69,33 @@
 			</div>
 		</div>
 	}
+
+	private async Task RenderLandingPage()
+	{
+		<div class="relative">
+			<div class="min-h-screen w-full max-w-(--max-layout-width) mx-auto md:px-4">
+				<div class="min-h-screen grid grid-cols-1 md:grid-cols-[var(--max-sidebar-width)_1fr] gap-4">
+					@await RenderPartialAsync(_PagesNav.Create<GlobalLayoutViewModel>(Model))
+					<main id="content-container" class="min-w-0">
+						<input type="checkbox" class="hidden" id="pages-nav-hamburger">
+						<div class="md:hidden sticky top-[calc(var(--offset-top)+1px)] z-20 border-b border-grey-20 bg-white/95 px-4 py-3">
+							<label role="button" class="inline-flex cursor-pointer items-center gap-2 font-sans text-sm font-semibold text-ink" for="pages-nav-hamburger">
+								<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+									stroke="currentColor" class="size-5" aria-hidden="true">
+									<path stroke-linecap="round" stroke-linejoin="round"
+										d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25H12"/>
+								</svg>
+								<span>Guide menu</span>
+							</label>
+						</div>
+						@await RenderPartialAsync(_LandingPage.Create(Model))
+					</main>
+					@* Empty TOC slot so htmx hx-select-oob="#toc-nav" swaps don't fail when boosted from a regular page. *@
+					<aside id="toc-nav" class="hidden" aria-hidden="true"></aside>
+				</div>
+			</div>
+		</div>
+	}
 }
 
 @if (RenderHeaderAndFooter)
@@ -90,7 +117,7 @@
 		await RenderPartialAsync(_NotFound.Create(Model));
 		break;
 	case MarkdownPageLayout.LandingPage:
-		await RenderPartialAsync(_LandingPage.Create(Model));
+		await RenderLandingPage();
 		break;
 	case MarkdownPageLayout.Archive:
 		await RenderPartialAsync(_Archive.Create(Model));

From 3cec0fc5eb4f17ecce74a4cc0a4c3bbecd40851d Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 12 May 2026 14:40:19 +0200
Subject: [PATCH 173/226] fix(nav-v2): restore section/island structure lost in
 merge 3a208ffb4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge 3a208ffb4 (Merge origin/nav-v2 into nav-v2-sections, May 8)
resolved the config/navigation-v2.yml conflict by taking the nav-v2
side wholesale, which has no section: or island: keys. That wiped out
seven section/island entries on this branch and broke the islands
feature this PR introduces.

Most visibly: /extend no longer renders as an isolated island and has
no back arrow, because section: Extension points (isolated: true) was
deleted from the YAML.

Restores the section/island structure by porting from demo/findability
(which preserved it through the hub-pages merge chain) and strips the
hub-pages-only section: Products block. NavigationViewModel.cs already
had its conflict resolved correctly during the merge, so no C# changes
are needed.

Sections restored:
- section: Guides (top-level wrapper around all main content)
- section: APIs (external URL to bump.sh)
- section: Reference, with island: Logstash plugins and
  island: Logstash versioned plugins
- section: Release notes
- section: Troubleshoot
- section: Extension points (isolated: true) — fixes /extend

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 8023 ++++++++++++++++++++------------------
 1 file changed, 4229 insertions(+), 3794 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 4854f92056..5eb90e98f7 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -1,1511 +1,3635 @@
 nav:
-  - label: Elasticsearch fundamentals
+  - section: Guides
+    url: /
     children:
-    - group: Get started in seconds
-      page: docs-content://get-started/index.md
+    - label: Elasticsearch fundamentals
       children:
-      - page: docs-content://get-started/evaluate-elastic.md
-        title: Evaluate Elastic during a trial
-    - group: Elasticsearch concepts
-      children:
-      - page: docs-content://manage-data/data-store.md
-        title: Elasticsearch essentials (Core document database)
-      - page: docs-content://manage-data/ingest.md
-        title: Ingest data into Elasticsearch
-      - page: docs-content://solutions/search.md
-        title: Core search features
-      - page: docs-content://explore-analyze/index.md
-        title: Visualize and analyze (Kibana)
-      - group: Use cases
-        children:
-        - page: docs-content://explore-analyze/geospatial-analysis.md
-          title: Geospatial analysis
-        - page: docs-content://solutions/search/site-or-app.md
-          title: Add search to your site or app
-        - page: docs-content://solutions/search/rag.md
-          title: RAG
-  - label: Install, deploy, and administer
-    children:
-      - group: Distributed architecture
-        page: docs-content://deploy-manage/distributed-architecture.md
+      - group: Get started in seconds
+        page: docs-content://get-started/index.md
         children:
-        - group: Clusters, nodes, and shards
-          page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards.md
-          children:
-          - page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards/node-roles.md
-            title: Node roles
-        - page: docs-content://deploy-manage/distributed-architecture/reading-and-writing-documents.md
-          title: Reading and writing documents
-        - group: Shard allocation, relocation, and recovery
-          page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md
-          children:
-          - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/shard-allocation-awareness.md
-            title: Shard allocation awareness
-          - group: Index-level shard allocation filtering
-            page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/index-level-shard-allocation.md
-            children:
-            - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/delaying-allocation-when-node-leaves.md
-              title: Delaying allocation when a node leaves
-        - page: docs-content://deploy-manage/distributed-architecture/shard-request-cache.md
-          title: The shard request cache
-        - group: Discovery and cluster formation
-          page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation.md
-          children:
-          - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/discovery-hosts-providers.md
-            title: Discovery hosts providers
-          - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-quorums.md
-            title: Quorum-based decision making
-          - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-voting.md
-            title: Voting configurations
-          - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-bootstrap-cluster.md
-            title: Bootstrapping a cluster
-          - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-state-overview.md
-            title: Cluster state
-          - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-fault-detection.md
-            title: Cluster fault detection
-        - page: docs-content://deploy-manage/distributed-architecture/kibana-tasks-management.md
-          title: Kibana task management
-      - group: Plan your install
+        - page: docs-content://get-started/evaluate-elastic.md
+          title: Evaluate Elastic during a trial
+      - group: Elasticsearch concepts
         children:
-        - page: docs-content://deploy-manage/deploy/deployment-comparison.md
-          title: Deployment comparison
+        - page: docs-content://manage-data/data-store.md
+          title: Elasticsearch essentials (Core document database)
+        - page: docs-content://manage-data/ingest.md
+          title: Ingest data into Elasticsearch
+        - page: docs-content://solutions/search.md
+          title: Core search features
+        - page: docs-content://explore-analyze/index.md
+          title: Visualize and analyze (Kibana)
+        - group: Use cases
           children:
-          - page: docs-content://deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md
-            title: Compare Cloud Hosted and Serverless
-        - page: docs-content://get-started/versioning-availability.md
-          title: Versioning and compatibility
-        - group: Reference architectures
-          page: docs-content://deploy-manage/reference-architectures.md
+          - page: docs-content://explore-analyze/geospatial-analysis.md
+            title: Geospatial analysis
+          - page: docs-content://solutions/search/site-or-app.md
+            title: Add search to your site or app
+          - page: docs-content://solutions/search/rag.md
+            title: RAG
+    - label: Install, deploy, and administer
+      children:
+        - group: Distributed architecture
+          page: docs-content://deploy-manage/distributed-architecture.md
           children:
-          - page: docs-content://deploy-manage/reference-architectures/hotfrozen-high-availability.md
-            title: Hot/Frozen - High Availability
-          - page: docs-content://deploy-manage/reference-architectures/genai-search-high-availability.md
-            title: GenAI Search - High Availability
-        - group: Production guidance
-          page: docs-content://deploy-manage/production-guidance.md
+          - group: Clusters, nodes, and shards
+            page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards.md
+            children:
+            - page: docs-content://deploy-manage/distributed-architecture/clusters-nodes-shards/node-roles.md
+              title: Node roles
+          - page: docs-content://deploy-manage/distributed-architecture/reading-and-writing-documents.md
+            title: Reading and writing documents
+          - group: Shard allocation, relocation, and recovery
+            page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md
+            children:
+            - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/shard-allocation-awareness.md
+              title: Shard allocation awareness
+            - group: Index-level shard allocation filtering
+              page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/index-level-shard-allocation.md
+              children:
+              - page: docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/delaying-allocation-when-node-leaves.md
+                title: Delaying allocation when a node leaves
+          - page: docs-content://deploy-manage/distributed-architecture/shard-request-cache.md
+            title: The shard request cache
+          - group: Discovery and cluster formation
+            page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation.md
+            children:
+            - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/discovery-hosts-providers.md
+              title: Discovery hosts providers
+            - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-quorums.md
+              title: Quorum-based decision making
+            - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-voting.md
+              title: Voting configurations
+            - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-bootstrap-cluster.md
+              title: Bootstrapping a cluster
+            - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-state-overview.md
+              title: Cluster state
+            - page: docs-content://deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-fault-detection.md
+              title: Cluster fault detection
+          - page: docs-content://deploy-manage/distributed-architecture/kibana-tasks-management.md
+            title: Kibana task management
+        - group: Plan your install
           children:
-          - group: Run Elasticsearch in production
-            page: docs-content://deploy-manage/production-guidance/elasticsearch-in-production-environments.md
-            children:
-            - group: Design for resilience
-              page: docs-content://deploy-manage/production-guidance/availability-and-resilience.md
-              children:
-              - page: docs-content://deploy-manage/production-guidance/availability-and-resilience/resilience-in-small-clusters.md
-                title: Resilience in small clusters
-              - page: docs-content://deploy-manage/production-guidance/availability-and-resilience/resilience-in-larger-clusters.md
-                title: Resilience in larger clusters
-              - page: docs-content://deploy-manage/production-guidance/availability-and-resilience/resilience-in-ech.md
-                title: Resilience in ECH and ECE
-            - page: docs-content://deploy-manage/production-guidance/scaling-considerations.md
-              title: Scaling considerations
-            - group: Performance optimizations
-              page: docs-content://deploy-manage/production-guidance/optimize-performance.md
-              children:
-              - page: docs-content://deploy-manage/production-guidance/general-recommendations.md
-                title: General recommendations
-              - page: docs-content://deploy-manage/production-guidance/optimize-performance/indexing-speed.md
-                title: Tune for indexing speed
-              - page: docs-content://deploy-manage/production-guidance/optimize-performance/search-speed.md
-                title: Tune for search speed
-              - page: docs-content://deploy-manage/production-guidance/optimize-performance/approximate-knn-search.md
-                title: Tune approximate kNN search
-              - page: docs-content://deploy-manage/production-guidance/optimize-performance/disk-usage.md
-                title: Tune for disk usage
-              - page: docs-content://deploy-manage/production-guidance/optimize-performance/size-shards.md
-                title: Size your shards
-          - group: Run Kibana in production
-            page: docs-content://deploy-manage/production-guidance/kibana-in-production-environments.md
-            children:
-            - page: docs-content://deploy-manage/production-guidance/kibana-load-balance-traffic.md
-              title: High availability and load balancing
-            - page: docs-content://deploy-manage/production-guidance/kibana-configure-memory.md
-              title: Configure memory
-            - page: docs-content://deploy-manage/production-guidance/kibana-task-manager-scaling-considerations.md
-              title: Manage background tasks
-            - page: docs-content://deploy-manage/production-guidance/kibana-traffic-scaling-considerations.md
-              title: Traffic scaling considerations
-            - page: docs-content://deploy-manage/production-guidance/kibana-alerting-production-considerations.md
-              title: Optimize alerting performance
-            - page: docs-content://deploy-manage/production-guidance/kibana-reporting-production-considerations.md
-              title: Reporting production considerations
-      - group: Install and deploy Elasticsearch
-        page: docs-content://deploy-manage/deploy.md
-        children:
-        - title: Skills for installation and deployment
-        - group: Deploy in Elastic Cloud
-          page: docs-content://deploy-manage/deploy/elastic-cloud.md
+          - page: docs-content://deploy-manage/deploy/deployment-comparison.md
+            title: Deployment comparison
+            children:
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md
+              title: Compare Cloud Hosted and Serverless
+          - page: docs-content://get-started/versioning-availability.md
+            title: Versioning and compatibility
+          - group: Reference architectures
+            page: docs-content://deploy-manage/reference-architectures.md
+            children:
+            - page: docs-content://deploy-manage/reference-architectures/hotfrozen-high-availability.md
+              title: Hot/Frozen - High Availability
+            - page: docs-content://deploy-manage/reference-architectures/genai-search-high-availability.md
+              title: GenAI Search - High Availability
+          - group: Production guidance
+            page: docs-content://deploy-manage/production-guidance.md
+            children:
+            - group: Run Elasticsearch in production
+              page: docs-content://deploy-manage/production-guidance/elasticsearch-in-production-environments.md
+              children:
+              - group: Design for resilience
+                page: docs-content://deploy-manage/production-guidance/availability-and-resilience.md
+                children:
+                - page: docs-content://deploy-manage/production-guidance/availability-and-resilience/resilience-in-small-clusters.md
+                  title: Resilience in small clusters
+                - page: docs-content://deploy-manage/production-guidance/availability-and-resilience/resilience-in-larger-clusters.md
+                  title: Resilience in larger clusters
+                - page: docs-content://deploy-manage/production-guidance/availability-and-resilience/resilience-in-ech.md
+                  title: Resilience in ECH and ECE
+              - page: docs-content://deploy-manage/production-guidance/scaling-considerations.md
+                title: Scaling considerations
+              - group: Performance optimizations
+                page: docs-content://deploy-manage/production-guidance/optimize-performance.md
+                children:
+                - page: docs-content://deploy-manage/production-guidance/general-recommendations.md
+                  title: General recommendations
+                - page: docs-content://deploy-manage/production-guidance/optimize-performance/indexing-speed.md
+                  title: Tune for indexing speed
+                - page: docs-content://deploy-manage/production-guidance/optimize-performance/search-speed.md
+                  title: Tune for search speed
+                - page: docs-content://deploy-manage/production-guidance/optimize-performance/approximate-knn-search.md
+                  title: Tune approximate kNN search
+                - page: docs-content://deploy-manage/production-guidance/optimize-performance/disk-usage.md
+                  title: Tune for disk usage
+                - page: docs-content://deploy-manage/production-guidance/optimize-performance/size-shards.md
+                  title: Size your shards
+            - group: Run Kibana in production
+              page: docs-content://deploy-manage/production-guidance/kibana-in-production-environments.md
+              children:
+              - page: docs-content://deploy-manage/production-guidance/kibana-load-balance-traffic.md
+                title: High availability and load balancing
+              - page: docs-content://deploy-manage/production-guidance/kibana-configure-memory.md
+                title: Configure memory
+              - page: docs-content://deploy-manage/production-guidance/kibana-task-manager-scaling-considerations.md
+                title: Manage background tasks
+              - page: docs-content://deploy-manage/production-guidance/kibana-traffic-scaling-considerations.md
+                title: Traffic scaling considerations
+              - page: docs-content://deploy-manage/production-guidance/kibana-alerting-production-considerations.md
+                title: Optimize alerting performance
+              - page: docs-content://deploy-manage/production-guidance/kibana-reporting-production-considerations.md
+                title: Reporting production considerations
+        - group: Install and deploy Elasticsearch
+          page: docs-content://deploy-manage/deploy.md
           children:
-          - page: docs-content://deploy-manage/deploy/elastic-cloud/create-an-organization.md
-            title: Create an organization
-            children:
-            - group: Subscribe from a marketplace
-              page: docs-content://deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md
-              children:
-              - page: docs-content://deploy-manage/deploy/elastic-cloud/aws-marketplace.md
-                title: AWS Marketplace
-              - page: docs-content://deploy-manage/deploy/elastic-cloud/google-cloud-platform-marketplace.md
-                title: Google Cloud Platform Marketplace
-              - page: docs-content://deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md
-                title: Azure Native ISV Service
-              - group: Elasticsearch Add-On for Heroku
-                page: docs-content://deploy-manage/deploy/elastic-cloud/heroku.md
-                children:
-                - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-getting-started-installing.md
-                  title: Install the add-on
+          - title: Skills for installation and deployment
+          - group: Deploy in Elastic Cloud
+            page: docs-content://deploy-manage/deploy/elastic-cloud.md
+            children:
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/create-an-organization.md
+              title: Create an organization
+              children:
+              - group: Subscribe from a marketplace
+                page: docs-content://deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md
+                children:
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/aws-marketplace.md
+                  title: AWS Marketplace
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/google-cloud-platform-marketplace.md
+                  title: Google Cloud Platform Marketplace
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md
+                  title: Azure Native ISV Service
+                - group: Elasticsearch Add-On for Heroku
+                  page: docs-content://deploy-manage/deploy/elastic-cloud/heroku.md
                   children:
-                  - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-getting-started-removing.md
-                    title: Remove the add-on
-                - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-getting-started-accessing.md
-                  title: Access the console
-                - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-working-with-elasticsearch.md
-                  title: Work with Elasticsearch
-                - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-migrating.md
-                  title: Migrate between plans
-                - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-reference-hardware.md
-                  title: Hardware
-                - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-reference-regions.md
-                  title: Regions
-          - group: Elastic Cloud Serverless
-            page: docs-content://deploy-manage/deploy/elastic-cloud/serverless.md
+                  - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-getting-started-installing.md
+                    title: Install the add-on
+                    children:
+                    - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-getting-started-removing.md
+                      title: Remove the add-on
+                  - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-getting-started-accessing.md
+                    title: Access the console
+                  - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-working-with-elasticsearch.md
+                    title: Work with Elasticsearch
+                  - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-migrating.md
+                    title: Migrate between plans
+                  - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-reference-hardware.md
+                    title: Hardware
+                  - page: docs-content://deploy-manage/deploy/elastic-cloud/heroku-reference-regions.md
+                    title: Regions
+            - group: Elastic Cloud Serverless
+              page: docs-content://deploy-manage/deploy/elastic-cloud/serverless.md
+              children:
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/create-serverless-project.md
+                title: Create a serverless project
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/regions.md
+                title: Regions
+              - title: Production readiness checklist
+            - group: Elastic Cloud Hosted
+              page: docs-content://deploy-manage/deploy/elastic-cloud/cloud-hosted.md
+              children:
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/create-an-elastic-cloud-hosted-deployment.md
+                title: Create a deployment
+              - title: Connect to Elasticsearch
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/access-kibana.md  # BOTH PHASES
+                title: Access Kibana
+              - group: Prepare for production
+                page: docs-content://deploy-manage/deploy/elastic-cloud/elastic-cloud-hosted-planning.md
+                children:
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/ec-customize-deployment-components.md  # BOTH PHASES
+                  title: Customize deployment components
+                - title: Production readiness checklist
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/fedramp.md
+              title: FedRAMP authorized Cloud offerings
+              # - page: docs-content://deploy-manage/deploy/elastic-cloud/azure-marketplace-pricing.md
+                # title: Azure Marketplace pricing
+              # - page: docs-content://deploy-manage/deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-aws-marketplace.md
+                # title: Monthly AWS subscription
+              # - page: docs-content://deploy-manage/deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-gcp-marketplace.md
+                # title: Monthly GCP subscription
+              # - page: docs-content://deploy-manage/deploy/elastic-cloud/complete-registration-of-an-annual-subscription-on-aws-marketplace.md
+                # title: Annual AWS subscription
+          - group: Elastic Cloud Enterprise
+            page: docs-content://deploy-manage/deploy/cloud-enterprise.md
+            children:
+            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-architecture.md
+              title: Service-oriented architecture
+            - group: Prepare your environment
+              page: docs-content://deploy-manage/deploy/cloud-enterprise/prepare-environment.md
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/identify-deployment-scenario.md
+                title: Identify your deployment scenario
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-hardware-prereq.md
+                title: Hardware prerequisites
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-software-prereq.md
+                title: Software prerequisites
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-sysconfig.md
+                title: System configuration
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-networking-prereq.md
+                title: Networking prerequisites
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-users-permissions.md
+                title: Users and permissions
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-ha.md
+                title: High availability
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-roles.md
+                title: Separation of roles
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-jvm.md
+                title: JVM heap size
+            - group: Configure your operating system
+              page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-operating-system.md
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-host-ubuntu.md
+                title: Ubuntu
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-host-rhel.md
+                title: RHEL
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-host-suse.md
+                title: SUSE
+            - group: Install ECE
+              page: docs-content://deploy-manage/deploy/cloud-enterprise/install.md
+              children:
+              - group: Installation procedures
+                page: docs-content://deploy-manage/deploy/cloud-enterprise/install-ece-procedures.md
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/deploy-small-installation.md
+                  title: Small installation
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/deploy-medium-installation.md
+                  title: Medium installation
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/deploy-large-installation.md
+                  title: Large installation
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/fresh-installation-of-ece-using-podman-hosts.md
+                  title: Deploy using Podman
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/alternative-install-ece-with-ansible.md
+                title: Ansible playbook
+              - group: Air-gapped install
+                page: docs-content://deploy-manage/deploy/cloud-enterprise/air-gapped-install.md
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-install-offline-with-registry.md
+                  title: With your private Docker registry
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-install-offline-no-registry.md
+                  title: Without a private Docker registry
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-install-offline-images.md
+                  title: Available Docker images
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/log-into-cloud-ui.md  # BOTH PHASES
+                title: Log into the Cloud UI
+            - group: Post-installation
+              page: docs-content://deploy-manage/deploy/cloud-enterprise/post-installation-steps.md
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-wildcard-dns.md
+                title: Wildcard DNS and certificates
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-load-balancers.md
+                title: Load balancers
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/system-deployments-configuration.md  # BOTH PHASES
+                title: System deployments configuration
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/default-system-deployment-versions.md
+                  title: Default system deployment versions
+            - group: Create your first deployment
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/create-deployment.md  # BOTH PHASES
+                title: Create a deployment
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/connect-elasticsearch.md  # BOTH PHASES
+                title: Connect to Elasticsearch
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/access-kibana.md  # BOTH PHASES
+                title: Access Kibana
+          - group: Elastic Cloud on Kubernetes
+            page: docs-content://deploy-manage/deploy/cloud-on-k8s.md
             children:
-            - page: docs-content://deploy-manage/deploy/elastic-cloud/create-serverless-project.md
-              title: Create a serverless project
-            - page: docs-content://deploy-manage/deploy/elastic-cloud/regions.md
-              title: Regions
+            - group: Deploy an orchestrator
+              page: docs-content://deploy-manage/deploy/cloud-on-k8s/install.md
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/install-using-yaml-manifest-quickstart.md
+                title: YAML manifests
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/install-using-helm-chart.md
+                title: Helm chart
+              - group: Deploy on OpenShift
+                page: docs-content://deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-openshift.md
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-operator.md
+                  title: Deploy the operator
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-elasticsearch.md
+                  title: Deploy Elasticsearch
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-kibana.md
+                  title: Deploy Kibana
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-anyuid-workaround.md
+                  title: anyuid SCC workaround
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-gke-autopilot.md
+                title: Deploy on GKE Autopilot
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/eck-gdch.md
+                title: Deploy on Google Distributed Cloud air-gapped
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/deploy-fips-compatible-version-of-eck.md
+                title: FIPS compatibility
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/air-gapped-install.md
+                title: Air-gapped environments
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/required-rbac-permissions.md  # BOTH PHASES
+                title: Required RBAC permissions
+            - group: Deploy your first workloads
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md
+                title: Deploy an Elasticsearch cluster
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/kibana-instance-quickstart.md
+                title: Deploy a Kibana instance
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/accessing-services.md  # BOTH PHASES
+                title: Accessing services
             - title: Production readiness checklist
-          - group: Elastic Cloud Hosted
-            page: docs-content://deploy-manage/deploy/elastic-cloud/cloud-hosted.md
+          - group: Self-managed cluster
+            page: docs-content://deploy-manage/deploy/self-managed.md
             children:
-            - page: docs-content://deploy-manage/deploy/elastic-cloud/create-an-elastic-cloud-hosted-deployment.md
-              title: Create a deployment
-            - title: Connect to Elasticsearch
-            - page: docs-content://deploy-manage/deploy/elastic-cloud/access-kibana.md  # BOTH PHASES
+            - group: Install Elasticsearch
+              page: docs-content://deploy-manage/deploy/self-managed/installing-elasticsearch.md
+              children:
+              - page: docs-content://deploy-manage/deploy/self-managed/local-development-installation-quickstart.md
+                title: Local installation (quickstart)
+              - group: Important system configuration
+                page: docs-content://deploy-manage/deploy/self-managed/important-system-configuration.md
+                children:
+                - page: docs-content://deploy-manage/deploy/self-managed/elasticsearch-service-user.md
+                  title: Elasticsearch service user
+                - page: docs-content://deploy-manage/deploy/self-managed/setting-system-settings.md
+                  title: Configuration methods
+                - page: docs-content://deploy-manage/deploy/self-managed/setup-configuration-memory.md
+                  title: Disable swapping
+                - page: docs-content://deploy-manage/deploy/self-managed/file-descriptors.md
+                  title: File descriptors
+                - page: docs-content://deploy-manage/deploy/self-managed/vm-max-map-count.md
+                  title: Virtual memory
+                - page: docs-content://deploy-manage/deploy/self-managed/max-number-of-threads.md
+                  title: Increase max number of threads
+                - page: docs-content://deploy-manage/deploy/self-managed/executable-jna-tmpdir.md
+                  title: JNA temporary directory
+                - page: docs-content://deploy-manage/deploy/self-managed/system-config-tcpretries.md
+                  title: TCP retransmission timeout
+                - page: docs-content://deploy-manage/deploy/self-managed/bootstrap-checks.md
+                  title: Bootstrap checks
+              - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-from-archive-on-linux-macos.md
+                title: Linux or macOS archive
+              - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-with-zip-on-windows.md
+                title: Windows .zip
+              - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-with-debian-package.md
+                title: Debian package
+              - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-with-rpm.md
+                title: RPM
+              - group: Docker
+                page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-with-docker.md
+                children:
+                - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-docker-basic.md
+                  title: Single-node cluster
+                - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-docker-compose.md
+                  title: Multi-node with Docker Compose
+                - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-docker-prod.md
+                  title: Docker in production
+                - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-docker-configure.md
+                  title: Configure with Docker
+              - page: docs-content://deploy-manage/deploy/self-managed/important-settings-configuration.md
+                title: Important Elasticsearch settings
+              - page: docs-content://deploy-manage/deploy/self-managed/configure-elasticsearch.md  # BOTH PHASES
+                title: Configure Elasticsearch
+            - group: Install Kibana
+              page: docs-content://deploy-manage/deploy/self-managed/install-kibana.md
+              children:
+              - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-from-archive-on-linux-macos.md
+                title: Linux or macOS archive
+              - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-on-windows.md
+                title: Windows
+              - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-with-debian-package.md
+                title: Debian package
+              - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-with-rpm.md
+                title: RPM
+              - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-with-docker.md
+                title: Docker
+              - page: docs-content://deploy-manage/deploy/self-managed/configure-kibana.md  # BOTH PHASES
+                title: Configure Kibana
+            - title: Access Elasticsearch
+            - page: docs-content://deploy-manage/deploy/self-managed/access-kibana.md  # BOTH PHASES
               title: Access Kibana
-            - group: Prepare for production
-              page: docs-content://deploy-manage/deploy/elastic-cloud/elastic-cloud-hosted-planning.md
+            - page: docs-content://deploy-manage/deploy/self-managed/air-gapped-install.md
+              title: Air-gapped install
+            - group: Tutorials
+              page: docs-content://deploy-manage/deploy/self-managed/tutorials.md
               children:
-              - page: docs-content://deploy-manage/deploy/elastic-cloud/ec-customize-deployment-components.md  # BOTH PHASES
-                title: Customize deployment components
-              - title: Production readiness checklist
-          - page: docs-content://deploy-manage/deploy/elastic-cloud/fedramp.md
-            title: FedRAMP authorized Cloud offerings
-            # - page: docs-content://deploy-manage/deploy/elastic-cloud/azure-marketplace-pricing.md
-              # title: Azure Marketplace pricing
-            # - page: docs-content://deploy-manage/deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-aws-marketplace.md
-              # title: Monthly AWS subscription
-            # - page: docs-content://deploy-manage/deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-gcp-marketplace.md
-              # title: Monthly GCP subscription
-            # - page: docs-content://deploy-manage/deploy/elastic-cloud/complete-registration-of-an-annual-subscription-on-aws-marketplace.md
-              # title: Annual AWS subscription
-        - group: Elastic Cloud Enterprise
-          page: docs-content://deploy-manage/deploy/cloud-enterprise.md
+              - page: docs-content://deploy-manage/deploy/self-managed/tutorial-self-managed-install.md
+                title: Install a self-managed Elastic Stack
+              - page: docs-content://deploy-manage/deploy/self-managed/tutorial-self-managed-secure.md
+                title: Customize TLS certificates for a self-managed Elastic Stack
+            - title: Production readiness checklist
+        - group: Administer your orchestrator, deployment, or project
+          page: docs-content://deploy-manage/index.md
           children:
-          - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-architecture.md
-            title: Service-oriented architecture
-          - group: Prepare your environment
-            page: docs-content://deploy-manage/deploy/cloud-enterprise/prepare-environment.md
-            children:
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/identify-deployment-scenario.md
-              title: Identify your deployment scenario
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-hardware-prereq.md
-              title: Hardware prerequisites
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-software-prereq.md
-              title: Software prerequisites
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-sysconfig.md
-              title: System configuration
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-networking-prereq.md
-              title: Networking prerequisites
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-users-permissions.md
-              title: Users and permissions
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-ha.md
-              title: High availability
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-roles.md
-              title: Separation of roles
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-jvm.md
-              title: JVM heap size
-          - group: Configure your operating system
-            page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-operating-system.md
-            children:
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-host-ubuntu.md
-              title: Ubuntu
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-host-rhel.md
-              title: RHEL
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-host-suse.md
-              title: SUSE
-          - group: Install ECE
-            page: docs-content://deploy-manage/deploy/cloud-enterprise/install.md
-            children:
-            - group: Installation procedures
-              page: docs-content://deploy-manage/deploy/cloud-enterprise/install-ece-procedures.md
-              children:
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/deploy-small-installation.md
-                title: Small installation
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/deploy-medium-installation.md
-                title: Medium installation
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/deploy-large-installation.md
-                title: Large installation
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/fresh-installation-of-ece-using-podman-hosts.md
-                title: Deploy using Podman
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/alternative-install-ece-with-ansible.md
-              title: Ansible playbook
-            - group: Air-gapped install
-              page: docs-content://deploy-manage/deploy/cloud-enterprise/air-gapped-install.md
-              children:
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-install-offline-with-registry.md
-                title: With your private Docker registry
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-install-offline-no-registry.md
-                title: Without a private Docker registry
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-install-offline-images.md
-                title: Available Docker images
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/log-into-cloud-ui.md  # BOTH PHASES
-              title: Log into the Cloud UI
-          - group: Post-installation
-            page: docs-content://deploy-manage/deploy/cloud-enterprise/post-installation-steps.md
-            children:
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-wildcard-dns.md
-              title: Wildcard DNS and certificates
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-load-balancers.md
-              title: Load balancers
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/system-deployments-configuration.md  # BOTH PHASES
-              title: System deployments configuration
-              children:
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/default-system-deployment-versions.md
-                title: Default system deployment versions
-          - group: Create your first deployment
-            children:
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/create-deployment.md  # BOTH PHASES
-              title: Create a deployment
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/connect-elasticsearch.md  # BOTH PHASES
-              title: Connect to Elasticsearch
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/access-kibana.md  # BOTH PHASES
+          - title: Administration skills
+          - label: Deployment-specific administration
+          - group: Elastic Cloud Hosted
+            children:
+            - group: Manage deployments
+              page: docs-content://deploy-manage/deploy/elastic-cloud/manage-deployments.md
+              children:
+              - group: Configure
+                page: docs-content://deploy-manage/deploy/elastic-cloud/configure.md
+                children:
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/ec-change-hardware-profile.md
+                  title: Manage hardware profiles
+                  children:
+                  - page: docs-content://deploy-manage/deploy/elastic-cloud/change-hardware.md
+                    title: Change instance configuration
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/ec-customize-deployment-components.md  # BOTH PHASES
+                  title: Customize deployment components
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/edit-stack-settings.md
+                  title: Edit stack settings
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/add-plugins-extensions.md
+                  title: Add plugins and extensions
+                  children:
+                  - page: docs-content://deploy-manage/deploy/elastic-cloud/upload-custom-plugins-bundles.md
+                    title: Upload custom plugins
+                  - page: docs-content://deploy-manage/deploy/elastic-cloud/manage-plugins-extensions-through-api.md
+                    title: Manage through the API
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/custom-endpoint-aliases.md
+                  title: Custom endpoint aliases
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/manage-integrations-server.md
+                title: Manage Integrations Server
+                children:
+                - page: docs-content://deploy-manage/deploy/elastic-cloud/switch-from-apm-to-integrations-server-payload.md
+                  title: Switch from APM to Integrations Server
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/find-cloud-id.md
+                title: Find your Cloud ID
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/manage-deployments-using-elastic-cloud-api.md
+                title: Manage deployments using the API
+              - page: docs-content://deploy-manage/deploy/elastic-cloud/keep-track-of-deployment-activity.md
+                title: Keep track of deployment activity
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/access-kibana.md  # BOTH PHASES
               title: Access Kibana
-        - group: Elastic Cloud on Kubernetes
-          page: docs-content://deploy-manage/deploy/cloud-on-k8s.md
-          children:
-          - group: Deploy an orchestrator
-            page: docs-content://deploy-manage/deploy/cloud-on-k8s/install.md
-            children:
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/install-using-yaml-manifest-quickstart.md
-              title: YAML manifests
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/install-using-helm-chart.md
-              title: Helm chart
-            - group: Deploy on OpenShift
-              page: docs-content://deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-openshift.md
-              children:
-              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-operator.md
-                title: Deploy the operator
-              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-elasticsearch.md
-                title: Deploy Elasticsearch
-              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-kibana.md
-                title: Deploy Kibana
-              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-anyuid-workaround.md
-                title: anyuid SCC workaround
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-gke-autopilot.md
-              title: Deploy on GKE Autopilot
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/eck-gdch.md
-              title: Deploy on Google Distributed Cloud air-gapped
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/deploy-fips-compatible-version-of-eck.md
-              title: FIPS compatibility
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/air-gapped-install.md
-              title: Air-gapped environments
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/required-rbac-permissions.md  # BOTH PHASES
-              title: Required RBAC permissions
-          - group: Deploy your first workloads
-            children:
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md
-              title: Deploy an Elasticsearch cluster
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/kibana-instance-quickstart.md
-              title: Deploy a Kibana instance
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/accessing-services.md  # BOTH PHASES
-              title: Accessing services
-          - title: Production readiness checklist
-        - group: Self-managed cluster
-          page: docs-content://deploy-manage/deploy/self-managed.md
-          children:
-          - group: Install Elasticsearch
-            page: docs-content://deploy-manage/deploy/self-managed/installing-elasticsearch.md
-            children:
-            - page: docs-content://deploy-manage/deploy/self-managed/local-development-installation-quickstart.md
-              title: Local installation (quickstart)
-            - group: Important system configuration
-              page: docs-content://deploy-manage/deploy/self-managed/important-system-configuration.md
-              children:
-              - page: docs-content://deploy-manage/deploy/self-managed/elasticsearch-service-user.md
-                title: Elasticsearch service user
-              - page: docs-content://deploy-manage/deploy/self-managed/setting-system-settings.md
-                title: Configuration methods
-              - page: docs-content://deploy-manage/deploy/self-managed/setup-configuration-memory.md
-                title: Disable swapping
-              - page: docs-content://deploy-manage/deploy/self-managed/file-descriptors.md
-                title: File descriptors
-              - page: docs-content://deploy-manage/deploy/self-managed/vm-max-map-count.md
-                title: Virtual memory
-              - page: docs-content://deploy-manage/deploy/self-managed/max-number-of-threads.md
-                title: Increase max number of threads
-              - page: docs-content://deploy-manage/deploy/self-managed/executable-jna-tmpdir.md
-                title: JNA temporary directory
-              - page: docs-content://deploy-manage/deploy/self-managed/system-config-tcpretries.md
-                title: TCP retransmission timeout
-              - page: docs-content://deploy-manage/deploy/self-managed/bootstrap-checks.md
-                title: Bootstrap checks
-            - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-from-archive-on-linux-macos.md
-              title: Linux or macOS archive
-            - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-with-zip-on-windows.md
-              title: Windows .zip
-            - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-with-debian-package.md
-              title: Debian package
-            - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-with-rpm.md
-              title: RPM
-            - group: Docker
-              page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-with-docker.md
-              children:
-              - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-docker-basic.md
-                title: Single-node cluster
-              - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-docker-compose.md
-                title: Multi-node with Docker Compose
-              - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-docker-prod.md
-                title: Docker in production
-              - page: docs-content://deploy-manage/deploy/self-managed/install-elasticsearch-docker-configure.md
-                title: Configure with Docker
-            - page: docs-content://deploy-manage/deploy/self-managed/important-settings-configuration.md
-              title: Important Elasticsearch settings
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/ec-vcpu-boost-instance.md
+              title: vCPU boosting and credits
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/available-stack-versions.md
+              title: Available stack versions
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/restrictions-known-problems.md
+              title: Restrictions and known problems
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/tools-apis.md
+              title: Tools and APIs
+          - group: Elastic Cloud Serverless
+            children:
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/project-settings.md
+              title: Manage project settings
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/manage-serverless-projects-using-api.md
+              title: Manage projects with API
+            - page: docs-content://deploy-manage/deploy/elastic-cloud/tools-apis.md
+              title: Tools and APIs
+          - group: Elastic Cloud Enterprise
+            children:
+            - group: Manage your orchestrator
+              page: docs-content://deploy-manage/deploy/cloud-enterprise/configure.md
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/log-into-cloud-ui.md  # BOTH PHASES
+                title: Log into the Cloud UI
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/assign-roles-to-hosts.md
+                title: Assign roles to hosts
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/system-deployments-configuration.md  # BOTH PHASES
+                title: System deployments configuration
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/default-system-deployment-versions.md
+                  title: Default system deployment versions
+              - group: Deployment templates
+                page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-deployment-templates.md  # BOTH PHASES
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/deployment-templates.md  # BOTH PHASES
+                  title: Deployment templates reference
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-tag-allocators.md
+                  title: Tag allocators
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-edit.md
+                  title: Edit instance configurations
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-create.md
+                  title: Create instance configurations
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-create-templates.md
+                  title: Create templates
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-configure-system-templates.md
+                  title: Configure default templates
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configure-templates-index-management.md
+                  title: Configure index management
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/ce-add-support-for-node-roles-autoscaling.md
+                  title: Data tiers and autoscaling support
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-ce-add-support-for-integrations-server.md
+                  title: Integrations server support
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-default.md
+                  title: Default instance configurations
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/change-ece-api-url.md
+                title: Change the API URL
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/change-endpoint-urls.md
+                title: Change endpoint URLs
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/enable-custom-endpoint-aliases.md
+                title: Enable custom endpoint aliases
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-manage-capacity.md
+                title: Manage allocator capacity
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-allocator-affinity.md
+                title: Configure allocator affinity
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/change-allocator-disconnect-timeout.md
+                title: Change allocator disconnect timeout
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/install-ece-on-additional-hosts.md
+                title: Add hosts
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/generate-roles-tokens.md
+                  title: Manage roles tokens
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md
+                title: Migrate to Podman
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/migrate-to-podman-5.md
+                  title: Migrate to Podman 5
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-include-additional-kibana-plugin.md
+                title: Include additional Kibana plugins
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/manage-elastic-stack-versions.md
+                title: Manage stack versions
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/statistics-collected-by-cloud-enterprise.md
+                title: Statistics collected by ECE
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/tools-apis.md
+                title: Tools and APIs
+            - group: Manage deployments
+              page: docs-content://deploy-manage/deploy/cloud-enterprise/working-with-deployments.md
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/deployment-templates.md  # BOTH PHASES
+                title: Deployment templates reference
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/create-deployment.md  # BOTH PHASES
+                title: Create a deployment
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/access-kibana.md  # BOTH PHASES
+                title: Access Kibana
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/connect-elasticsearch.md  # BOTH PHASES
+                title: Connect to Elasticsearch
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-deployment.md
+                title: Configure
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/customize-deployment.md
+                  title: Customize deployment components
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings.md
+                  title: Edit stack settings
+                  children:
+                  - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings-elasticsearch.md
+                    title: Elasticsearch user settings
+                  - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings-kibana.md
+                    title: Kibana user settings
+                  - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings-apm.md
+                    title: APM user settings
+                  - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings-enterprise.md
+                    title: Enterprise search user settings
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/resize-deployment.md
+                  title: Resize a deployment
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/add-plugins.md
+                  title: Add plugins and extensions
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/add-custom-bundles-plugins.md
+                  title: Add custom bundles and plugins
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-regional-deployment-aliases.md
+                  title: Custom endpoint aliases
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/resource-overrides.md
+                  title: Resource overrides
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/advanced-cluster-configuration.md
+                  title: Advanced cluster configuration
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/search-filter-deployments.md
+                title: Search and filter deployments
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/keep-track-of-deployment-activity.md
+                title: Keep track of deployment activity
+              - page: docs-content://deploy-manage/deploy/cloud-enterprise/manage-integrations-server.md
+                title: Manage Integrations Server
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-integrations-server-api-example.md
+                  title: Enable through the API
+                - page: docs-content://deploy-manage/deploy/cloud-enterprise/switch-from-apm-to-integrations-server-payload.md
+                  title: Switch from APM
+          - group: Elastic Cloud on Kubernetes
+            children:
+            - group: Manage the ECK operator
+              page: docs-content://deploy-manage/deploy/cloud-on-k8s/configure.md
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configure-eck.md
+                title: Apply configuration settings
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configure-validating-webhook.md
+                title: Validating webhook
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/restrict-cross-namespace-resource-associations.md
+                title: Cross-namespace restrictions
+              - group: Service meshes
+                page: docs-content://deploy-manage/deploy/cloud-on-k8s/service-meshes.md
+                children:
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-istio.md
+                  title: Istio
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-linkerd.md
+                  title: Linkerd
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/webhook-namespace-selectors.md
+                title: Webhook namespace selectors
+            - group: Manage deployments and workloads
+              page: docs-content://deploy-manage/deploy/cloud-on-k8s/manage-deployments.md
+              children:
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/managing-deployments-using-helm-chart.md
+                title: Elastic Stack Helm chart
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/update-deployments.md
+                title: Applying updates
+              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/accessing-services.md  # BOTH PHASES
+                title: Accessing services
+              - group: Configure deployments
+                page: docs-content://deploy-manage/deploy/cloud-on-k8s/configure-deployments.md
+                children:
+                - group: Elasticsearch configuration
+                  page: docs-content://deploy-manage/deploy/cloud-on-k8s/elasticsearch-configuration.md
+                  children:
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/nodes-orchestration.md
+                    title: Nodes orchestration
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/storage-recommendations.md
+                    title: Storage recommendations
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/node-configuration.md
+                    title: Node configuration
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/volume-claim-templates.md
+                    title: Volume claim templates
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/virtual-memory.md
+                    title: Virtual memory
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/settings-managed-by-eck.md
+                    title: Settings managed by ECK
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/custom-configuration-files-plugins.md
+                    title: Custom configuration files and plugins
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/init-containers-for-plugin-downloads.md
+                    title: Init containers for plugins
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/update-strategy.md
+                    title: Update strategy
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/pod-disruption-budget.md
+                    title: Pod disruption budget
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/advanced-elasticsearch-node-scheduling.md
+                    title: Advanced node scheduling
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/readiness-probe.md
+                    title: Readiness probe
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/pod-prestop-hook.md
+                    title: Pod PreStop hook
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/security-context.md
+                    title: Security context
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/requests-routing-to-elasticsearch-nodes.md
+                    title: Traffic splitting
+                - group: Kibana configuration
+                  page: docs-content://deploy-manage/deploy/cloud-on-k8s/kibana-configuration.md
+                  children:
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-kibana-es.md
+                    title: Connect Kibana to Elasticsearch
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-kibana-advanced-configuration.md
+                    title: Advanced configuration
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-kibana-plugins.md
+                    title: Kibana plugins
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/customize-pods.md
+                  title: Customize pods
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/propagate-labels-annotations.md
+                  title: Labels and annotations
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/manage-compute-resources.md
+                  title: Compute resources
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/recipes.md
+                  title: Recipes
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/connect-to-external-elastic-resources.md
+                  title: Connect to external resources
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/elastic-stack-configuration-policies.md
+                  title: Stack configuration policies
+              - group: Other Elastic applications
+                page: docs-content://deploy-manage/deploy/cloud-on-k8s/orchestrate-other-elastic-applications.md
+                children:
+                - group: APM Server
+                  page: docs-content://deploy-manage/deploy/cloud-on-k8s/apm-server.md
+                  children:
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
+                    title: Use an ECK-managed cluster
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/advanced-configuration.md
+                    title: Advanced configuration
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/connect-to-apm-server.md
+                    title: Connect to APM Server
+                - group: Standalone Elastic Agent
+                  page: docs-content://deploy-manage/deploy/cloud-on-k8s/standalone-elastic-agent.md
+                  children:
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md
+                    title: Quickstart
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md
+                    title: Configuration
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-examples-standalone.md
+                    title: Configuration examples
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-agent.md
+                    title: Agent on OpenShift
+                - group: Fleet-managed Elastic Agent
+                  page: docs-content://deploy-manage/deploy/cloud-on-k8s/fleet-managed-elastic-agent.md
+                  children:
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/quickstart-fleet.md
+                    title: Quickstart
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md
+                    title: Configuration
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-examples-fleet.md
+                    title: Configuration examples
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/known-limitations.md
+                    title: Known limitations
+                - group: Elastic Maps Server
+                  page: docs-content://deploy-manage/deploy/cloud-on-k8s/elastic-maps-server.md
+                  children:
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/deploy-elastic-maps-server.md
+                    title: Deploy Maps Server
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/map-data.md
+                    title: Map data
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/advanced-configuration-maps-server.md
+                    title: Advanced configuration
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/http-configuration.md
+                    title: HTTP configuration
+                - group: Beats
+                  page: docs-content://deploy-manage/deploy/cloud-on-k8s/beats.md
+                  children:
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md
+                    title: Quickstart
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-beats.md
+                    title: Configuration
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-examples-beats.md
+                    title: Configuration examples
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/troubleshooting-beats.md
+                    title: Troubleshooting
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-beats.md
+                    title: Beats on OpenShift
+                - group: Logstash
+                  page: docs-content://deploy-manage/deploy/cloud-on-k8s/logstash.md
+                  children:
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md
+                    title: Quickstart
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-logstash.md
+                    title: Configuration
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/securing-logstash-api.md
+                    title: Securing the API
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/logstash-plugins.md
+                    title: Plugins
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-examples-logstash.md
+                    title: Configuration examples
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/update-strategy-logstash.md
+                    title: Update strategy
+                  - page: docs-content://deploy-manage/deploy/cloud-on-k8s/advanced-configuration-logstash.md
+                    title: Advanced configuration
+                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/package-registry.md
+                  title: Elastic Package Registry
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/create-custom-images.md
+              title: Custom images
+            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/tools-apis.md
+              title: Tools and APIs
+          - group: Self-managed clusters
+            children:
             - page: docs-content://deploy-manage/deploy/self-managed/configure-elasticsearch.md  # BOTH PHASES
               title: Configure Elasticsearch
-          - group: Install Kibana
-            page: docs-content://deploy-manage/deploy/self-managed/install-kibana.md
-            children:
-            - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-from-archive-on-linux-macos.md
-              title: Linux or macOS archive
-            - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-on-windows.md
-              title: Windows
-            - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-with-debian-package.md
-              title: Debian package
-            - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-with-rpm.md
-              title: RPM
-            - page: docs-content://deploy-manage/deploy/self-managed/install-kibana-with-docker.md
-              title: Docker
-            - page: docs-content://deploy-manage/deploy/self-managed/configure-kibana.md  # BOTH PHASES
+            - page: docs-content://deploy-manage/deploy/self-managed/configure-kibana.md
               title: Configure Kibana
-          - title: Access Elasticsearch
-          - page: docs-content://deploy-manage/deploy/self-managed/access-kibana.md  # BOTH PHASES
-            title: Access Kibana
-          - page: docs-content://deploy-manage/deploy/self-managed/air-gapped-install.md
-            title: Air-gapped install
-          - group: Tutorials
-            page: docs-content://deploy-manage/deploy/self-managed/tutorials.md
-            children:
-            - page: docs-content://deploy-manage/deploy/self-managed/tutorial-self-managed-install.md
-              title: Install a self-managed Elastic Stack
-            - page: docs-content://deploy-manage/deploy/self-managed/tutorial-self-managed-secure.md
-              title: Customize TLS certificates for a self-managed Elastic Stack
-          - title: Production readiness checklist
-      - group: Administer your orchestrator, deployment, or project
-        page: docs-content://deploy-manage/index.md
+            - page: docs-content://deploy-manage/deploy/self-managed/plugins.md
+              title: Manage plugins
+            - page: docs-content://deploy-manage/deploy/self-managed/access-kibana.md
+              title: Access Kibana
+            - page: docs-content://deploy-manage/deploy/self-managed/tools-apis.md
+              title: Tools and APIs
+          - label: ───
+          - group: Security and encryption
+            page: docs-content://deploy-manage/security.md
+            children:
+            - page: docs-content://deploy-manage/security/secure-hosting-environment.md
+              title: "Secure your orchestrator"
+              children:
+              - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation.md
+                title: "Elastic Cloud Enterprise"
+                children:
+                - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/manage-security-certificates.md
+                  title: "Manage security certificates"
+                - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/allow-x509-certificates-signed-with-sha-1.md
+                  title: "Allow X.509 certificates signed with SHA-1"
+                - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/configure-tls-version.md
+                  title: "Configure the TLS version"
+                - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/migrate-ece-on-podman-hosts-to-selinux-enforce.md
+                  title: "Migrate ECE on Podman hosts to SELinux enforce"
+              - page: docs-content://deploy-manage/security/secure-your-eck-installation.md
+                title: "Elastic Cloud on Kubernetes"
+            - page: docs-content://deploy-manage/security/secure-your-cluster-deployment.md
+              title: "Secure your cluster, deployment, or project"
+              children:
+              - page: docs-content://deploy-manage/security/self-setup.md
+                title: "Self-managed security setup"
+                children:
+                - page: docs-content://deploy-manage/security/self-auto-setup.md
+                  title: "Automatic security setup"
+                - page: docs-content://deploy-manage/security/set-up-minimal-security.md
+                  title: "Minimal security setup"
+                - page: docs-content://deploy-manage/security/set-up-basic-security.md
+                  title: "Set up transport TLS"
+                - page: docs-content://deploy-manage/security/set-up-basic-security-plus-https.md
+                  title: "Set up HTTPS"
+                - page: docs-content://deploy-manage/security/using-kibana-with-security.md
+                  title: "Configure security in Kibana"
+              - page: docs-content://deploy-manage/security/secure-cluster-communications.md
+                title: "Manage TLS encryption"
+                children:
+                - page: docs-content://deploy-manage/security/self-tls.md
+                  title: "Self-managed"
+                  children:
+                  - page: docs-content://deploy-manage/security/updating-certificates.md
+                    title: "Update TLS certificates"
+                    children:
+                    - page: docs-content://deploy-manage/security/same-ca.md
+                      title: "With the same CA"
+                    - page: docs-content://deploy-manage/security/different-ca.md
+                      title: "With a different CA"
+                  - page: docs-content://deploy-manage/security/kibana-es-mutual-tls.md
+                    title: "Mutual authentication"
+                  - page: docs-content://deploy-manage/security/supported-ssltls-versions-by-jdk-version.md
+                    title: "Supported SSL/TLS versions by JDK version"
+                  - page: docs-content://deploy-manage/security/enabling-cipher-suites-for-stronger-encryption.md
+                    title: "Enabling cipher suites for stronger encryption"
+                - page: docs-content://deploy-manage/security/eck-tls.md
+                  title: "ECK"
+                  children:
+                  - page: docs-content://deploy-manage/security/k8s-https-settings.md
+                    title: "Manage HTTP certificates on ECK"
+                  - page: docs-content://deploy-manage/security/k8s-transport-settings.md
+                    title: Manage transport certificates on ECK
+                  - page: docs-content://deploy-manage/security/k8s-es-client-certificate-auth.md
+                    title: "Client certificate authentication"
+                - page: docs-content://deploy-manage/security/external-ca-transport.md
+                  title: "External CA for TLS"
+              - page: docs-content://deploy-manage/security/network-security.md
+                title: "Network security"
+                children:
+                - page: docs-content://deploy-manage/security/network-security-policies.md
+                  title: "How network security policies work in Cloud"
+                - page: docs-content://deploy-manage/security/ece-filter-rules.md
+                  title: "How IP filtering rules work in ECE"
+                - page: docs-content://deploy-manage/security/ip-filtering.md
+                  title: "Add IP filters"
+                  children:
+                  - page: docs-content://deploy-manage/security/ip-filtering-cloud.md
+                    title: "In ECH or Serverless"
+                  - page: docs-content://deploy-manage/security/ip-filtering-ece.md
+                    title: "In ECE"
+                  - page: docs-content://deploy-manage/security/ip-filtering-basic.md
+                    title: "In ECK and Self Managed"
+                - page: docs-content://deploy-manage/security/remote-cluster-filtering.md
+                  title: "Remote cluster filters"
+                - page: docs-content://deploy-manage/security/private-connectivity.md
+                  title: "Private connectivity"
+                  children:
+                  - page: docs-content://deploy-manage/security/private-connectivity-aws.md
+                    title: "AWS PrivateLink"
+                  - page: docs-content://deploy-manage/security/private-connectivity-azure.md
+                    title: "Azure Private Link"
+                  - page: docs-content://deploy-manage/security/private-connectivity-gcp.md
+                    title: "GCP Private Service Connect"
+                  - page: docs-content://deploy-manage/security/claim-private-connection-api.md
+                    title: "Claim private connection ownership"
+                - page: docs-content://deploy-manage/security/network-security-api.md
+                  title: "Through the API"
+                - page: docs-content://deploy-manage/security/k8s-network-policies.md
+                  title: "Kubernetes network policies"
+              - page: docs-content://deploy-manage/security/elastic-cloud-static-ips.md
+                title: "Elastic Cloud static IPs"
+              - page: docs-content://deploy-manage/security/kibana-session-management.md
+                title: "Kibana session management"
+              - page: docs-content://deploy-manage/security/data-security.md
+                title: "Encrypt your deployment data"
+                children:
+                - page: docs-content://deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md
+                  title: "Use a customer-managed encryption key"
+              - page: docs-content://deploy-manage/security/secure-settings.md
+                title: "Secure your settings"
+                children:
+                - page: docs-content://deploy-manage/security/k8s-secure-settings.md
+                  title: "Secure settings on ECK"
+              - page: docs-content://deploy-manage/security/secure-saved-objects.md
+                title: "Secure Kibana saved objects"
+              - page: docs-content://deploy-manage/security/logging-configuration/security-event-audit-logging.md
+                title: "Security event audit logging"
+                children:
+                - page: docs-content://deploy-manage/security/logging-configuration/enabling-audit-logs.md
+                  title: "Enable audit logging"
+                - page: docs-content://deploy-manage/security/logging-configuration/configuring-audit-logs.md
+                  title: Configure audit logging
+                  children:
+                  - page: docs-content://deploy-manage/security/logging-configuration/logfile-audit-events-ignore-policies.md
+                    title: "Elasticsearch audit events ignore policies"
+                  - page: docs-content://deploy-manage/security/logging-configuration/logfile-audit-output.md
+                    title: "Elasticsearch logfile output"
+                - page: docs-content://deploy-manage/security/logging-configuration/auditing-search-queries.md
+                  title: Audit Elasticsearch search queries
+                - page: docs-content://deploy-manage/security/logging-configuration/correlating-kibana-elasticsearch-audit-logs.md
+                  title: "Correlate audit events"
+            - page: docs-content://deploy-manage/security/secure-clients-integrations.md
+              title: Secure other Elastic Stack components
+            - page: docs-content://deploy-manage/security/httprest-clients-security.md
+              title: Securing HTTP client applications
+            - page: docs-content://deploy-manage/security/limitations.md
+              title: "Limitations"
+            - page: docs-content://deploy-manage/security/fips.md
+              title: FIPS compliance
+              children:
+              - page: docs-content://deploy-manage/security/fips-es.md
+                title: FIPS compliance for Elasticsearch
+              - page: docs-content://deploy-manage/security/fips-kib.md
+                title: FIPS compliance for Kibana
+              - page: docs-content://deploy-manage/security/fips-ingest.md
+                title: FIPS mode for Ingest tools
+          - group: Authentication and authorization
+            page: docs-content://deploy-manage/users-roles.md
+            children:
+            - page: docs-content://deploy-manage/users-roles/cloud-organization.md
+              title: "Cloud organization"
+              children:
+              - page: docs-content://deploy-manage/users-roles/cloud-organization/manage-users.md
+                title: Manage users
+              - page: docs-content://deploy-manage/users-roles/cloud-organization/user-roles.md
+                title: User roles and privileges
+              - page: docs-content://deploy-manage/users-roles/cloud-organization/configure-saml-authentication.md
+                title: "Configure SAML SSO"
+                children:
+                - page: docs-content://deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-okta.md
+                  title: "Okta"
+                - page: docs-content://deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-microsoft-entra-id.md
+                  title: "Microsoft Entra ID"
+            - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator.md
+              title: "ECE orchestrator"
+              children:
+              - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-system-passwords.md
+                title: Manage system passwords
+              - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-users-roles.md
+                title: Manage users and roles
+                children:
+                - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/native-user-authentication.md
+                  title: Native users
+                - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/active-directory.md
+                  title: Active Directory
+                - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/ldap.md
+                  title: LDAP
+                - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/saml.md
+                  title: SAML
+              - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/configure-sso-for-deployments.md
+                title: Configure SSO for deployments
+            - page: docs-content://deploy-manage/users-roles/serverless-custom-roles.md
+              title: Serverless project custom roles
+            - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth.md
+              title: "Cluster or deployment"
+              children:
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/quickstart.md
+                title: "Quickstart"
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/user-authentication.md
+                title: User authentication
+                children:
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/authentication-realms.md
+                  title: Authentication realms
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/realm-chains.md
+                    title: Realm chains
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/security-domains.md
+                    title: Security domains
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/internal-authentication.md
+                  title: Internal authentication
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/native.md
+                    title: "Native"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/file-based.md
+                    title: "File-based"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/external-authentication.md
+                  title: External authentication
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/active-directory.md
+                    title: "Active Directory"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/jwt.md
+                    title: "JWT"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md
+                    title: "Kerberos"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/ldap.md
+                    title: "LDAP"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/openid-connect.md
+                    title: "OpenID Connect"
+                    children:
+                    - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/oidc-examples.md
+                      title: "With Azure, Google, or Okta"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/saml.md
+                    title: "SAML"
+                    children:
+                    - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/saml-entra.md
+                      title: "With Microsoft Entra ID"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/pki.md
+                    title: PKI
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/custom.md
+                    title: Custom realms
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/built-in-users.md
+                  title: "Built-in users"
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/built-in-sm.md
+                    title: "Change passwords"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/orchestrator-managed-users-overview.md
+                  title: "Orchestrator-managed users"
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/manage-elastic-user-cloud.md
+                    title: "ECH and ECE"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/managed-credentials-eck.md
+                    title: "ECK managed credentials"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kibana-authentication.md
+                  title: "Kibana authentication"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/access-agreement.md
+                  title: Kibana access agreement
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/anonymous-access.md
+                  title: Anonymous access
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/token-based-authentication-services.md
+                  title: Token-based authentication services
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/service-accounts.md
+                  title: Service accounts
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/internal-users.md
+                  title: Internal users
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges.md
+                  title: Operator privileges
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/configure-operator-privileges.md
+                    title: Configure operator privileges
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/operator-only-functionality.md
+                    title: Operator-only functionality
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges-for-snapshot-restore.md
+                    title: Operator privileges for snapshot and restore
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/user-profiles.md
+                  title: User profiles
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/looking-up-users-without-authentication.md
+                  title: Looking up users without authentication
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/controlling-user-cache.md
+                  title: Controlling the user cache
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/manage-authentication-for-multiple-clusters.md
+                  title: Manage authentication for multiple clusters
+              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/user-roles.md
+                title: User roles
+                children:
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/defining-roles.md
+                  title: Defining roles
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/role-structure.md
+                    title: Role structure
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/granting-privileges-for-data-streams-aliases.md
+                    title: "For data streams and aliases"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kibana-role-management.md
+                    title: "Using Kibana"
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/role-restriction.md
+                    title: Role restriction
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kibana-privileges.md
+                  title: Kibana privileges
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/mapping-users-groups-to-roles.md
+                  title: "Map users and groups to roles"
+                  children:
+                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/role-mapping-resources.md
+                    title: "Role mapping properties"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/authorization-delegation.md
+                  title: Authorization delegation
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/authorization-plugins.md
+                  title: Authorization plugins
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/controlling-access-at-document-field-level.md
+                  title: "Control access at the document and field level"
+                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/submitting-requests-on-behalf-of-other-users.md
+                  title: "Submit requests on behalf of other users"
+          - group: API keys
+            page: docs-content://deploy-manage/api-keys.md
+            children:
+            - page: docs-content://deploy-manage/api-keys/elasticsearch-api-keys.md
+              title: Elasticsearch API keys
+            - page: docs-content://deploy-manage/api-keys/serverless-project-api-keys.md
+              title: Serverless project API keys
+            - page: docs-content://deploy-manage/api-keys/elastic-cloud-api-keys.md
+              title: Elastic Cloud API keys
+            - page: docs-content://deploy-manage/api-keys/elastic-cloud-enterprise-api-keys.md
+              title: Elastic Cloud Enterprise API keys
+          - group: Spaces
+            page: docs-content://deploy-manage/manage-spaces.md
+          - group: Monitoring
+            page: docs-content://deploy-manage/monitor.md
+            children:
+            - page: docs-content://deploy-manage/monitor/autoops.md
+              title: AutoOps
+              children:
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-how-to-access.md
+                title: "For Elastic Cloud Hosted"
+              - page: docs-content://deploy-manage/monitor/autoops/autoops-for-serverless.md
+                title: "For Elastic Cloud Serverless"
+                children:
+                - page: docs-content://deploy-manage/monitor/autoops/access-autoops-for-serverless.md
+                  title: "Access AutoOps in your project"
+                - page: docs-content://deploy-manage/monitor/autoops/search-tier-view-autoops-serverless.md
+                  title: "Search Tier view"
+                - page: docs-content://deploy-manage/monitor/autoops/indexing-tier-view-autoops-serverless.md
+                  title: "Indexing Tier view"
+                - page: docs-content://deploy-manage/monitor/autoops/search-ai-lake-view-autoops-serverless.md
+                  title: "Search AI Lake view"
+              - page: docs-content://deploy-manage/monitor/autoops/cc-autoops-as-cloud-connected.md
+                title: "For ECE, ECK, and self-managed clusters"
+                children:
+                - page: docs-content://deploy-manage/monitor/autoops/cc-connect-self-managed-to-autoops.md
+                  title: "Connect your cluster"
+                - page: docs-content://deploy-manage/monitor/autoops/cc-connect-local-dev-to-autoops.md
+                  title: "Connect your local development cluster"
+                - page: docs-content://deploy-manage/monitor/autoops/autoops-sm-custom-certification.md
+                  title: "Configure Elastic agent with custom certificate"
+                - page: docs-content://deploy-manage/monitor/autoops/autoops-disable-metrics-collection.md
+                  title: "Disable certain types of data collection"
+                - page: docs-content://deploy-manage/monitor/autoops/cc-manage-users.md
+                  title: "Manage connected cluster users"
+                - page: docs-content://deploy-manage/monitor/autoops/cc-cloud-connect-autoops-troubleshooting.md
+                  title: "Troubleshooting"
+                  children:
+                  - page: docs-content://deploy-manage/monitor/autoops/autoops-connectivity-check.md
+                    title: "Run the Connectivity Check"
+                  - page: docs-content://deploy-manage/monitor/autoops/autoops-sm-troubleshoot-firewalls.md
+                    title: "Firewalls blocking Elastic Agent"
+                  - page: docs-content://deploy-manage/monitor/autoops/autoops-sm-troubleshoot-eck-no-clusters.md
+                    title: "Connected clusters not appearing with ECK"
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-regions.md
+                title: "Regions"
+              - page: docs-content://deploy-manage/monitor/autoops/views.md
+                title: "Views"
+                children:
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-overview-view.md
+                  title: "Overview"
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-deployment-view.md
+                  title: "Deployment or Cluster"
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-nodes-view.md
+                  title: "Nodes"
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-index-view.md
+                  title: "Indices"
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-shards-view.md
+                  title: "Shards"
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-template-optimizer.md
+                  title: "Template Optimizer"
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-events.md
+                title: "Events"
+                children:
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-event-settings.md
+                  title: Event Settings
+                - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-notifications-settings.md
+                  title: Notifications Settings
+              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-faq.md
+                title: "FAQ"
+            - page: docs-content://deploy-manage/monitor/stack-monitoring.md
+              title: Stack monitoring
+              children:
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/ece-ech-stack-monitoring.md
+                title: "Enable on ECH and ECE"
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/eck-stack-monitoring.md
+                title: "Enable on ECK"
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/elasticsearch-monitoring-self-managed.md
+                title: "Self-managed: Elasticsearch"
+                children:
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-elastic-agent.md
+                  title: "Collecting monitoring data with Elastic Agent"
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-metricbeat.md
+                  title: "Collecting monitoring data with Metricbeat"
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/collecting-log-data-with-filebeat.md
+                  title: "Collecting log data with Filebeat"
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/es-self-monitoring-prod.md
+                  title: Monitoring in a production environment
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/es-legacy-collection-methods.md
+                  title: "Legacy collection methods"
+                  children:
+                  - page: docs-content://deploy-manage/monitor/stack-monitoring/es-monitoring-collectors.md
+                    title: Collectors
+                  - page: docs-content://deploy-manage/monitor/stack-monitoring/es-monitoring-exporters.md
+                    title: Exporters
+                  - page: docs-content://deploy-manage/monitor/stack-monitoring/es-local-exporter.md
+                    title: Local exporters
+                  - page: docs-content://deploy-manage/monitor/stack-monitoring/es-http-exporter.md
+                    title: HTTP exporters
+                  - page: docs-content://deploy-manage/monitor/stack-monitoring/es-pause-export.md
+                    title: Pausing data collection
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-self-managed.md
+                title: "Self-managed: Kibana"
+                children:
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-elastic-agent.md
+                  title: "Collect monitoring data with Elastic Agent"
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-metricbeat.md
+                  title: "Collect monitoring data with Metricbeat"
+                - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-legacy.md
+                  title: "Legacy collection methods"
+              - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
+                title: Access monitoring data in Kibana
+              - page: docs-content://deploy-manage/monitor/monitoring-data/visualizing-monitoring-data.md
+                title: Visualizing monitoring data
+                children:
+                - page: docs-content://deploy-manage/monitor/monitoring-data/beats-page.md
+                  title: Beats metrics
+                - page: docs-content://deploy-manage/monitor/monitoring-data/elasticsearch-metrics.md
+                  title: Elasticsearch metrics
+                - page: docs-content://deploy-manage/monitor/monitoring-data/kibana-page.md
+                  title: Kibana metrics
+                - page: docs-content://deploy-manage/monitor/monitoring-data/integrations-server-page.md
+                  title: Integrations Server metrics
+                - page: docs-content://deploy-manage/monitor/monitoring-data/logstash-page.md
+                  title: Logstash metrics
+                - page: docs-content://deploy-manage/monitor/monitoring-data/monitor-troubleshooting.md
+                  title: "Troubleshooting"
+              - page: docs-content://deploy-manage/monitor/monitoring-data/configure-stack-monitoring-alerts.md
+                title: Stack monitoring alerts
+              - page: docs-content://deploy-manage/monitor/monitoring-data/configuring-data-streamsindices-for-monitoring.md
+                title: Configuring monitoring data streams and indices
+                children:
+                - page: docs-content://deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-elastic-agent.md
+                  title: Configuring data streams created by Elastic Agent
+                - page: docs-content://deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-metricbeat-8.md
+                  title: Configuring data streams created by Metricbeat 8
+                - page: docs-content://deploy-manage/monitor/monitoring-data/config-monitoring-indices-metricbeat-7-internal-collection.md
+                  title: Configuring indices created by Metricbeat 7 or internal collection
+            - page: docs-content://deploy-manage/monitor/autoops-vs-stack-monitoring.md
+              title: "AutoOps vs. Stack Monitoring"
+            - page: docs-content://deploy-manage/monitor/cloud-health-perf.md
+              title: "Cloud deployment health"
+              children:
+              - page: docs-content://deploy-manage/monitor/access-performance-metrics-on-elastic-cloud.md
+                title: Performance metrics on Elastic Cloud
+              - page: docs-content://deploy-manage/monitor/ec-memory-pressure.md
+                title: JVM memory pressure indicator
+            - page: docs-content://deploy-manage/monitor/kibana-task-manager-health-monitoring.md
+              title: "Kibana task manager monitoring"
+            - page: docs-content://deploy-manage/monitor/orchestrators.md
+              title: Monitoring orchestrators
+              children:
+              - page: docs-content://deploy-manage/monitor/orchestrators/eck-metrics-configuration.md
+                title: ECK operator metrics
+                children:
+                - page: docs-content://deploy-manage/monitor/orchestrators/k8s-enabling-metrics-endpoint.md
+                  title: Enabling the metrics endpoint
+                - page: docs-content://deploy-manage/monitor/orchestrators/k8s-securing-metrics-endpoint.md
+                  title: Securing the metrics endpoint
+                - page: docs-content://deploy-manage/monitor/orchestrators/k8s-prometheus-requirements.md
+                  title: Prometheus requirements
+              - page: docs-content://deploy-manage/monitor/orchestrators/ece-platform-monitoring.md
+                title: ECE platform monitoring
+                children:
+                - page: docs-content://deploy-manage/monitor/orchestrators/ece-monitoring-ece-access.md
+                  title: Platform monitoring deployment logs and metrics
+                - page: docs-content://deploy-manage/monitor/orchestrators/ece-proxy-log-fields.md
+                  title: Proxy log fields
+                - page: docs-content://deploy-manage/monitor/orchestrators/ece-monitoring-ece-set-retention.md
+                  title: Set the retention period for logging and metrics indices
+            - page: docs-content://deploy-manage/monitor/logging-configuration.md
+              title: Logging
+              children:
+              - page: docs-content://deploy-manage/monitor/logging-configuration/elasticsearch-log4j-configuration-self-managed.md
+                title: Elasticsearch log4j configuration
+              - page: docs-content://deploy-manage/monitor/logging-configuration/update-elasticsearch-logging-levels.md
+                title: Update Elasticsearch logging levels
+              - page: docs-content://deploy-manage/monitor/logging-configuration/elasticsearch-deprecation-logs.md
+                title: Elasticsearch deprecation logs
+              - page: docs-content://deploy-manage/monitor/logging-configuration/slow-logs.md
+                title: Slow query and index logging
+              - page: docs-content://deploy-manage/monitor/logging-configuration/kibana-logging.md
+                title: Kibana logging
+                children:
+                - page: docs-content://deploy-manage/monitor/logging-configuration/kibana-log-levels.md
+                  title: Set global log levels for Kibana
+                - page: docs-content://deploy-manage/monitor/logging-configuration/kib-advanced-logging.md
+                  title: Advanced Kibana logging settings
+                  children:
+                  - page: docs-content://deploy-manage/monitor/logging-configuration/kibana-log-settings-examples.md
+                    title: "Examples"
+          - page: docs-content://deploy-manage/kibana-reporting-configuration.md
+            title: Configure Kibana reporting
+          - group: Backup, high availability, and resilience tools
+            page: docs-content://deploy-manage/tools.md
+            children:
+            - page: docs-content://deploy-manage/tools/snapshot-and-restore.md
+              title: Snapshot and restore
+              children:
+              - page: docs-content://deploy-manage/tools/snapshot-and-restore/manage-snapshot-repositories.md
+                title: Manage snapshot repositories
+                children:
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/self-managed.md
+                  title: "Self-managed"
+                  children:
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/azure-repository.md
+                    title: Azure repository
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/google-cloud-storage-repository.md
+                    title: Google Cloud Storage repository
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/s3-repository.md
+                    title: S3 repository
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/shared-file-system-repository.md
+                    title: Shared file system repository
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/read-only-url-repository.md
+                    title: Read-only URL repository
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/source-only-repository.md
+                    title: Source-only repository
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/elastic-cloud-hosted.md
+                  title: "Elastic Cloud Hosted"
+                  children:
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md
+                    title: "AWS S3"
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/ec-gcs-snapshotting.md
+                    title: "Google Cloud Storage"
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/ec-azure-snapshotting.md
+                    title: "Azure Blob Storage"
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/access-isolation-for-found-snapshots-repository.md
+                    title: Access isolation for the found-snapshots repository
+                    children:
+                    - page: docs-content://deploy-manage/tools/snapshot-and-restore/repository-isolation-on-azure.md
+                      title: "Azure"
+                    - page: docs-content://deploy-manage/tools/snapshot-and-restore/repository-isolation-on-aws-gcp.md
+                      title: "AWS and GCP"
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/cloud-enterprise.md
+                  title: "Elastic Cloud Enterprise"
+                  children:
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md
+                    title: "AWS S3"
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/google-cloud-storage-gcs-repository.md
+                    title: "Google Cloud Storage"
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/azure-storage-repository.md
+                    title: Azure Storage repository
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/minio-on-premise-repository.md
+                    title: MinIO self-managed repository
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/cloud-on-k8s.md
+                  title: "Elastic Cloud on Kubernetes"
+              - page: docs-content://deploy-manage/tools/snapshot-and-restore/create-snapshots.md
+                title: Create, monitor and delete snapshots
+              - page: docs-content://deploy-manage/tools/snapshot-and-restore/restore-snapshot.md
+                title: Restore a snapshot
+                children:
+                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-across-clusters.md
+                  title: Restore a snapshot across clusters
+                  children:
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-new-deployment.md
+                    title: Restore snapshot into a new deployment
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-existing-deployment.md
+                    title: Restore snapshot into an existing deployment
+                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-containing-searchable-snapshots-indices-across-clusters.md
+                    title: Restore snapshots containing searchable snapshots indices across clusters
+              - page: docs-content://deploy-manage/tools/snapshot-and-restore/searchable-snapshots.md
+                title: Searchable snapshots
+            - page: docs-content://deploy-manage/tools/cross-cluster-replication.md
+              title: Cross-cluster replication
+              children:
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/set-up-cross-cluster-replication.md
+                title: "Set up cross-cluster replication"
+                children:
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-getting-started-prerequisites.md
+                  title: "Prerequisites"
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_connect_to_a_remote_cluster.md
+                  title: Connect to a remote cluster
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_configure_privileges_for_cross_cluster_replication_2.md
+                  title: Configure privileges for cross-cluster replication
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-getting-started-follower-index.md
+                  title: Create a follower index to replicate a specific index
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-getting-started-auto-follow.md
+                  title: Create an auto-follow pattern to replicate time series indices
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/manage-cross-cluster-replication.md
+                title: Manage cross-cluster replication
+                children:
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-inspect-progress.md
+                  title: Inspect replication statistics
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-pause-replication.md
+                  title: Pause and resume replication
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-recreate-follower-index.md
+                  title: Recreate a follower index
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-terminate-replication.md
+                  title: Terminate replication
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/manage-auto-follow-patterns.md
+                title: Manage auto-follow patterns
+                children:
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-create.md
+                  title: Create auto-follow patterns
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-retrieve.md
+                  title: Retrieve auto-follow patterns
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-pause.md
+                  title: Pause and resume auto-follow patterns
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-delete.md
+                  title: Delete auto-follow patterns
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/upgrading-clusters.md
+                title: "Upgrading clusters"
+                children:
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-uni-directional-upgrade.md
+                  title: Uni-directional index following
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-bi-directional-upgrade.md
+                  title: Bi-directional index following
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/uni-directional-disaster-recovery.md
+                title: "Uni-directional disaster recovery"
+                children:
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_prerequisites_14.md
+                  title: "Prerequisites"
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down.md
+                  title: "Failover when clusterA is down"
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back.md
+                  title: "Failback when clusterA comes back"
+              - page: docs-content://deploy-manage/tools/cross-cluster-replication/bi-directional-disaster-recovery.md
+                title: "Bi-directional disaster recovery"
+                children:
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-tutorial-initial-setup.md
+                  title: Initial setup
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down_2.md
+                  title: "Failover when clusterA is down"
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back_2.md
+                  title: "Failback when clusterA comes back"
+                - page: docs-content://deploy-manage/tools/cross-cluster-replication/_perform_update_or_delete_by_query.md
+                  title: Perform update or delete by query
+          - group: Autoscaling
+            page: docs-content://deploy-manage/autoscaling.md
+            children:
+            - page: docs-content://deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md
+              title: "In ECE and ECH"
+            - page: docs-content://deploy-manage/autoscaling/autoscaling-in-eck.md
+              title: "In ECK"
+            - page: docs-content://deploy-manage/autoscaling/autoscaling-deciders.md
+              title: Autoscaling deciders
+            - page: docs-content://deploy-manage/autoscaling/trained-model-autoscaling.md
+              title: Trained model autoscaling
+          - page: docs-content://deploy-manage/stack-settings.md
+            title: Stack settings
+          - page: docs-content://deploy-manage/manage-connectors.md
+            title: Connectors
+          - group: Remote clusters
+            page: docs-content://deploy-manage/remote-clusters.md
+            children:
+            - page: docs-content://deploy-manage/remote-clusters/security-models.md
+              title: "Security models"
+            - page: docs-content://deploy-manage/remote-clusters/connection-modes.md
+              title: "Connection modes"
+            - page: docs-content://deploy-manage/remote-clusters/ec-enable-ccs.md
+              title: "On Elastic Cloud Hosted"
+              children:
+              - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-same-ess.md
+                title: "To the same Elastic Cloud organization"
+              - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-other-ess.md
+                title: "To a different Elastic Cloud organization"
+              - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-ece.md
+                title: "To Elastic Cloud Enterprise"
+              - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-self-managed.md
+                title: "To a self-managed cluster"
+              - page: docs-content://deploy-manage/remote-clusters/ec-enable-ccs-for-eck.md
+                title: "To Elastic Cloud on Kubernetes"
+              - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-strong-identity.md
+                title: "Strong identity verification"
+              - page: docs-content://deploy-manage/remote-clusters/ec-edit-remove-trusted-environment.md
+                title: "Manage trusted environments"
+              - page: docs-content://deploy-manage/remote-clusters/ec-migrate-ccs.md
+                title: "Migrate from the CCS deployment template"
+            - page: docs-content://deploy-manage/remote-clusters/ece-enable-ccs.md
+              title: "On Elastic Cloud Enterprise"
+              children:
+              - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-same-ece.md
+                title: "To the same ECE environment"
+              - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-other-ece.md
+                title: "To a different ECE environment"
+              - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-ece-ess.md
+                title: "To Elastic Cloud"
+              - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-self-managed.md
+                title: "To a self-managed cluster"
+              - page: docs-content://deploy-manage/remote-clusters/ece-enable-ccs-for-eck.md
+                title: "To Elastic Cloud on Kubernetes"
+              - page: docs-content://deploy-manage/remote-clusters/ece-edit-remove-trusted-environment.md
+                title: "Manage trusted environments"
+              - page: docs-content://deploy-manage/remote-clusters/ece-migrate-ccs.md
+                title: "Migrate from the CCS deployment template"
+            - page: docs-content://deploy-manage/remote-clusters/remote-clusters-self-managed.md
+              title: "On self-managed Elastic Stack"
+              children:
+              - page: docs-content://deploy-manage/remote-clusters/remote-clusters-api-key.md
+                title: Add remote clusters using API key authentication
+              - page: docs-content://deploy-manage/remote-clusters/remote-clusters-cert.md
+                title: Add remote clusters using TLS certificate authentication
+              - page: docs-content://deploy-manage/remote-clusters/self-remote-cluster-eck.md
+                title: "To Elastic Cloud on Kubernetes"
+              - page: docs-content://deploy-manage/remote-clusters/remote-clusters-migrate.md
+                title: "Migrate from certificate to API key authentication"
+            - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-landing.md
+              title: "On Elastic Cloud on Kubernetes"
+              children:
+              - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters.md
+                title: "To the same ECK environment"
+              - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-to-other-eck.md
+                title: "To a different ECK environment"
+              - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-to-external.md
+                title: "To an external cluster or deployment"
+          - group: Cross-project search
+            page: docs-content://deploy-manage/cross-project-search-config.md
+            children:
+            - page: docs-content://deploy-manage/cross-project-search-config/cps-config-link-and-manage.md
+              title: Link and manage projects
+            - page: docs-content://deploy-manage/cross-project-search-config/cps-config-access-and-scope.md
+              title: Access and scope
+          - page: docs-content://deploy-manage/cloud-connect.md
+            title: Cloud Connect
+          - label: ───
+          - group: Maintenance
+            page: docs-content://deploy-manage/maintenance.md
+            children:
+            - page: docs-content://deploy-manage/maintenance/ece.md
+              title: ECE maintenance
+              children:
+              - page: docs-content://deploy-manage/maintenance/ece/deployments-maintenance.md
+                title: Deployments maintenance
+                children:
+                - page: docs-content://deploy-manage/maintenance/ece/pause-instance.md
+                  title: Pause instance
+              - page: docs-content://deploy-manage/maintenance/ece/maintenance-activities.md
+                title: Maintenance activities
+                children:
+                - page: docs-content://deploy-manage/maintenance/ece/enable-maintenance-mode.md
+                  title: Enable maintenance mode
+                - page: docs-content://deploy-manage/maintenance/ece/scale-out-installation.md
+                  title: Scale out your installation
+                - page: docs-content://deploy-manage/maintenance/ece/move-nodes-instances-from-allocators.md
+                  title: Move nodes or instances from allocators
+                - page: docs-content://deploy-manage/maintenance/ece/perform-ece-hosts-maintenance.md
+                  title: Perform ECE hosts maintenance
+                - page: docs-content://deploy-manage/maintenance/ece/delete-ece-hosts.md
+                  title: Delete ECE hosts
+            - page: docs-content://deploy-manage/maintenance/start-stop-services.md
+              title: Start and stop services
+              children:
+              - page: docs-content://deploy-manage/maintenance/start-stop-services/start-stop-elasticsearch.md
+                title: Start and stop Elasticsearch
+              - page: docs-content://deploy-manage/maintenance/start-stop-services/start-stop-kibana.md
+                title: Start and stop Kibana
+              - page: docs-content://deploy-manage/maintenance/start-stop-services/restart-cloud-hosted-deployment.md
+                title: Restart an Elastic Cloud Hosted deployment
+              - page: docs-content://deploy-manage/maintenance/start-stop-services/restart-an-ece-deployment.md
+                title: Restart an ECE deployment
+              - page: docs-content://deploy-manage/maintenance/start-stop-services/full-cluster-restart-rolling-restart-procedures.md
+                title: Full Cluster restart and rolling restart procedures
+            - page: docs-content://deploy-manage/maintenance/start-stop-routing-requests.md
+              title: Start and stop routing requests
+            - page: docs-content://deploy-manage/maintenance/add-and-remove-elasticsearch-nodes.md
+              title: Add and Remove Elasticsearch nodes
+          - group: Upgrade
+            page: docs-content://deploy-manage/upgrade.md
+            children:
+            - page: docs-content://deploy-manage/upgrade/plan-upgrade.md
+              title: Plan your upgrade
+            - page: docs-content://deploy-manage/upgrade/prepare-to-upgrade.md
+              title: "Preparation steps"
+              children:
+              - page: docs-content://deploy-manage/upgrade/prepare-to-upgrade/upgrade-assistant.md
+                title: Upgrade Assistant
+            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster.md
+              title: Upgrade your deployment or cluster
+              children:
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-717.md
+                title: Upgrade from 7.17 to latest
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ech.md
+                title: "Upgrade on Elastic Cloud Hosted"
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ece.md
+                title: "Upgrade on Elastic Cloud Enterprise"
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-on-eck.md
+                title: "Upgrade on Elastic Cloud on Kubernetes"
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/self-managed.md
+                title: "Upgrade Elastic on a self-managed cluster"
+                children:
+                - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/elasticsearch.md
+                  title: Upgrade Elasticsearch
+                - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-elasticsearch-docker.md
+                  title: "Upgrade Elasticsearch running on Docker"
+                - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/kibana.md
+                  title: Upgrade Kibana
+                  children:
+                  - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/saved-object-migrations.md
+                    title: Saved object migrations
+                  - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/kibana-roll-back.md
+                    title: "Roll back to a previous version"
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/archived-settings.md
+                title: "Archived settings"
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/reading-indices-from-older-elasticsearch-versions.md
+                title: "Reading indices from older versions"
+              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/enterprise-search.md
+                title: Upgrade Enterprise Search
+            - page: docs-content://deploy-manage/upgrade/ingest-components.md
+              title: Upgrade your ingest components
+            - page: docs-content://deploy-manage/upgrade/orchestrator.md
+              title: "Upgrade your ECE or ECK orchestrator"
+              children:
+              - page: docs-content://deploy-manage/upgrade/orchestrator/upgrade-cloud-enterprise.md
+                title: Upgrade Elastic Cloud Enterprise
+                children:
+                - page: docs-content://deploy-manage/upgrade/orchestrator/re-running-the-ece-upgrade.md
+                  title: Re-running the ECE upgrade
+              - page: docs-content://deploy-manage/upgrade/orchestrator/upgrade-cloud-on-k8s.md
+                title: Upgrade Elastic Cloud on Kubernetes
+          - group: Uninstall
+            page: docs-content://deploy-manage/uninstall.md
+            children:
+            - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md
+              title: Uninstall Elastic Cloud Enterprise
+            - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-on-kubernetes.md
+              title: Uninstall Elastic Cloud on Kubernetes
+            - page: docs-content://deploy-manage/uninstall/delete-a-cloud-deployment.md
+              title: "Delete an orchestrated deployment"
+          - group: Licenses and subscriptions
+            page: docs-content://deploy-manage/license.md
+            children:
+            - page: docs-content://deploy-manage/license/manage-your-license-in-ece.md
+              title: "Elastic Cloud Enterprise"
+            - page: docs-content://deploy-manage/license/manage-your-license-in-eck.md
+              title: "Elastic Cloud on Kubernetes"
+            - page: docs-content://deploy-manage/license/manage-your-license-in-self-managed-cluster.md
+              title: "Self-managed cluster"
+          - group: Manage your Cloud organization
+            page: docs-content://deploy-manage/cloud-organization.md
+            children:
+            - page: docs-content://deploy-manage/cloud-organization/billing.md
+              title: Billing
+              children:
+              - page: docs-content://deploy-manage/cloud-organization/billing/cloud-hosted-deployment-billing-dimensions.md
+                title: "Hosted billing dimensions"
+              - page: docs-content://deploy-manage/cloud-organization/billing/serverless-project-billing-dimensions.md
+                title: "Serverless billing dimensions"
+                children:
+                - page: docs-content://deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md
+                  title: "Elasticsearch projects"
+                - page: docs-content://deploy-manage/cloud-organization/billing/elastic-observability-billing-dimensions.md
+                  title: "Observability projects"
+                - page: docs-content://deploy-manage/cloud-organization/billing/security-billing-dimensions.md
+                  title: "Security projects"
+              - page: docs-content://deploy-manage/cloud-organization/billing/billing-models.md
+                title: Billing models
+              - page: docs-content://deploy-manage/cloud-organization/billing/add-billing-details.md
+                title: Add your billing details
+              - page: docs-content://deploy-manage/cloud-organization/billing/view-billing-history.md
+                title: View your billing history
+              - page: docs-content://deploy-manage/cloud-organization/billing/manage-billing-notifications.md
+                title: "Manage notifications"
+              - page: docs-content://deploy-manage/cloud-organization/billing/manage-subscription.md
+                title: Manage your subscription
+              - page: docs-content://deploy-manage/cloud-organization/billing/monitor-analyze-usage.md
+                title: Monitor and analyze usage
+              - page: docs-content://deploy-manage/cloud-organization/billing/ecu.md
+                title: Elastic Consumption Units
+              - page: docs-content://deploy-manage/cloud-organization/billing/billing-faq.md
+                title: Billing FAQ
+            - page: docs-content://deploy-manage/cloud-organization/operational-emails.md
+              title: Operational emails
+            - page: docs-content://deploy-manage/cloud-organization/billing/update-billing-operational-contacts.md
+              title: Update billing and operational contacts
+            - page: docs-content://deploy-manage/cloud-organization/service-status.md
+              title: Service status
+            - page: docs-content://deploy-manage/cloud-organization/tools-and-apis.md
+              title: "Tools and APIs"
+        - group: Deployment and administration tools
+          children:
+          - toc: ecctl://reference
+          - page: elasticsearch://reference/elasticsearch/command-line-tools/index.md
+            title: Command-line tools
+    - label: The Elasticsearch platform
+      children:
+      - label: Ingest and manage data
+        children:
+        - group: "Ingest or migrate: bring your data into Elasticsearch"
+          children:
+          - page: docs-content://manage-data/ingest.md
+            title: Choose/Plan your ingest method
+          - group: Ingest architectures
+            page: docs-content://manage-data/ingest/ingest-reference-architectures.md
+            children:
+            - group: Agent to Elasticsearch
+              page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-to-es.md
+              children:
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-installed.md
+                title: Elastic Agent (installed)
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-apis.md
+                title: Elastic Agent via APIs
+            - group: Agent with Logstash
+              page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-ls.md
+              children:
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-enrich.md
+                title: Logstash for enrichment
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/lspq.md
+                title: Logstash persistent queue
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-networkbridge.md
+                title: Logstash as a network bridge
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-multi.md
+                title: Logstash for multiple destinations
+            - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-proxy.md
+              title: Agent through a proxy
+            - group: Agent with Kafka
+              page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-kafka-es.md
+              children:
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-kafka-ls.md
+                title: Agent to Kafka via Logstash
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-kafka-essink.md
+                title: Agent to Kafka with Elasticsearch sink
+            - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-for-input.md
+              title: Logstash as input
+            - group: Air-gapped environments
+              page: docs-content://manage-data/ingest/ingest-reference-architectures/airgapped-env.md
+              children:
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-es-airgapped.md
+                title: Agent to Elasticsearch (air-gapped)
+              - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-ls-airgapped.md
+                title: Agent with Logstash (air-gapped)
+          - group: Ingest by solution
+            page: docs-content://manage-data/ingest/ingesting-data-for-elastic-solutions.md
+            children:
+            - page: docs-content://solutions/search/ingest-for-search.md
+              title: Ingesting data for search use cases
+            - title: Ingesting data for observability
+            - page: docs-content://solutions/security/get-started/ingest-data-to-elastic-security.md
+              title: Ingesting data for security (Move from Solutions)
+          - page: docs-content://manage-data/ingest/ingesting-timeseries-data.md
+            title: Ingesting time series data
+          - group: Ingest logs
+            page: docs-content://solutions/observability/logs.md
+            children:
+            - page: docs-content://solutions/observability/logs/get-started-with-system-logs.md
+              title: Get started with system logs
+            - page: docs-content://solutions/observability/logs/stream-any-log-file.md
+              title: Stream any log file
+            - page: docs-content://solutions/observability/logs/stream-any-log-file-using-edot-collector.md
+              title: Stream any log file using EDOT Collector
+            - group: Stream application logs
+              page: docs-content://solutions/observability/logs/stream-application-logs.md
+              children:
+              - page: docs-content://solutions/observability/logs/plaintext-application-logs.md
+                title: Plaintext application logs
+              - page: docs-content://solutions/observability/logs/ecs-formatted-application-logs.md
+                title: ECS formatted application logs
+              - page: docs-content://solutions/observability/logs/apm-agent-log-sending.md
+                title: APM agent log sending
+            - page: docs-content://solutions/observability/logs/parse-route-logs.md
+              title: Parse and route logs
+            - page: docs-content://solutions/observability/logs/filter-aggregate-logs.md
+              title: Filter and aggregate logs
+            - group: Explore logs
+              page: docs-content://solutions/observability/logs/explore-logs.md
+              children:
+              - page: docs-content://solutions/observability/logs/discover-logs.md
+                title: Discover logs
+              - page: docs-content://solutions/observability/logs/categorize-log-entries.md
+                title: Categorize log entries
+              - page: docs-content://solutions/observability/logs/inspect-log-anomalies.md
+                title: Inspect log anomalies
+            - page: docs-content://solutions/observability/logs/run-pattern-analysis-on-log-data.md
+              title: Run pattern analysis on log data
+            - page: docs-content://solutions/observability/logs/log-data-sources.md
+              title: Log data sources
+            - page: docs-content://solutions/observability/logs/logs-data-retention.md
+              title: Logs data retention
+            - page: docs-content://solutions/observability/logs/add-service-name-to-logs.md
+              title: Add service name to logs
+            - group: Logs index template reference
+              page: docs-content://solutions/observability/logs/logs-index-template-reference.md
+              children:
+              - page: docs-content://solutions/observability/logs/logs-index-template-defaults.md
+                title: Logs index template defaults
+          - group: Ingest data with agentless integrations
+            page: docs-content://manage-data/ingest/agentless/agentless-integrations.md
+            children:
+            - page: docs-content://manage-data/ingest/agentless/cloud-connector-deployment.md
+              title: Cloud connector deployment
+            - page: docs-content://manage-data/ingest/agentless/agentless-integrations-faq.md
+              title: Agentless integrations FAQ
+            - page: integration-docs://reference/agentless_integrations.md
+              title: Agentless integrations reference
+          - group: Ingest data from applications
+            page: docs-content://manage-data/ingest/ingesting-data-from-applications.md
+            children:
+            - toc: docs-content://reference/apm-agents
+            - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-with-nodejs-on-elasticsearch-service.md
+              title: Ingest data with Node.js
+            - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-with-python-on-elasticsearch-service.md
+              title: Ingest data with Python
+            - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-from-beats-to-elasticsearch-service-with-logstash-as-proxy.md
+              title: Ingest data from Beats with Logstash as a proxy
+            - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-from-relational-database-into-elasticsearch-service.md
+              title: Ingest data from a relational database
+            - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-python-application-using-filebeat.md
+              title: Ingest logs from a Python application using Filebeat
+            - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-nodejs-web-application-using-filebeat.md
+              title: Ingest logs from a Node.js web application using Filebeat
+          - title: Ingest data using the API
+          - page: docs-content://manage-data/ingest/tools.md
+            title: Ingest tools overview
+          - page: docs-content://manage-data/ingest/upload-data-files.md
+            title: Upload data files
+          - page: docs-content://manage-data/ingest/sample-data.md
+            title: Sample data
+          - group: Migrating your Elasticsearch data
+            page: docs-content://manage-data/migrate.md
+            children:
+            - page: docs-content://manage-data/migrate/migrate-from-a-self-managed-cluster-with-a-self-signed-certificate-using-remote-reindex.md
+              title: Reindex using a private CA
+            - page: docs-content://manage-data/migrate/migrate-with-logstash.md
+              title: Migrate Elastic Cloud Hosted data to Serverless with Logstash
+            - page: docs-content://manage-data/migrate/migrate-data-between-elasticsearch-clusters-with-minimal-downtime.md
+              title: Minimal-downtime migration using snapshots
+            - page: docs-content://manage-data/migrate/migrate-internal-indices.md
+              title: Migrate system indices
+        - group: Ingest tools
+          page: docs-content://reference/ingestion-tools/index.md
+          children:
+          - toc: opentelemetry://reference
+          - toc: docs-content://reference/fleet
+          - toc: integration-docs://reference
+          - toc: elasticsearch://reference/search-connectors
+          - toc: logstash://reference
+          - toc: docs-content://reference/apm
+          - toc: beats://reference
+          - group: Other ingest tools
+            children:
+            - toc: elasticsearch-hadoop://reference
+            - toc: elastic-serverless-forwarder://reference
+        - group: Data storage and lifecycle
+          children:
+          - group: The Elasticsearch data store
+            page: docs-content://manage-data/data-store.md
+            children:
+            - group: Index basics
+              page: docs-content://manage-data/data-store/index-basics.md
+              children:
+              - page: elasticsearch://reference/elasticsearch/index-settings/index.md
+                title: Index settings reference
+              - page: elasticsearch://reference/elasticsearch/index-lifecycle-actions/index.md
+                title: Index lifecycle management actions
+            - page: docs-content://manage-data/data-store/near-real-time-search.md
+              title: Near real-time search
+            - group: Data streams
+              page: docs-content://manage-data/data-store/data-streams.md
+              children:
+              - page: docs-content://manage-data/data-store/data-streams/set-up-data-stream.md
+                title: Set up a data stream
+              - page: docs-content://manage-data/data-store/data-streams/use-data-stream.md
+                title: Use a data stream
+              - page: docs-content://manage-data/data-store/data-streams/modify-data-stream.md
+                title: Modify a data stream
+              - page: docs-content://manage-data/data-store/data-streams/manage-data-stream.md
+                title: Manage a data stream
+              - group: Time series data stream (TSDS)
+                page: docs-content://manage-data/data-store/data-streams/time-series-data-stream-tsds.md
+                children:
+                - page: docs-content://manage-data/data-store/data-streams/quickstart-tsds.md
+                  title: Quickstart
+                - page: docs-content://manage-data/data-store/data-streams/set-up-tsds.md
+                  title: Set up TSDS
+                - group: Downsampling
+                  page: docs-content://manage-data/data-store/data-streams/downsampling-time-series-data-stream.md
+                  children:
+                  - page: docs-content://manage-data/data-store/data-streams/downsampling-concepts.md
+                    title: Downsampling concepts
+                  - page: docs-content://manage-data/data-store/data-streams/run-downsampling.md
+                    title: Run downsampling
+                  - page: docs-content://manage-data/data-store/data-streams/query-downsampled-data.md
+                    title: Query downsampled data
+                - group: Advanced topics
+                  page: docs-content://manage-data/data-store/data-streams/advanced-topics-tsds.md
+                  children:
+                  - page: docs-content://manage-data/data-store/data-streams/time-bound-tsds.md
+                    title: Time-bound TSDS
+                  - page: docs-content://manage-data/data-store/data-streams/reindex-tsds.md
+                    title: Reindex TSDS
+                  - page: docs-content://manage-data/data-store/data-streams/tsds-ingest-otlp.md
+                    title: TSDS ingest OTLP
+              - group: Logs data stream
+                page: docs-content://manage-data/data-store/data-streams/logs-data-stream.md
+                children:
+                - page: docs-content://manage-data/data-store/data-streams/logs-data-stream-configure.md
+                  title: Configure
+                - page: docs-content://manage-data/data-store/data-streams/logs-data-stream-integrations.md
+                  title: Integrations
+              - group: Failure store
+                page: docs-content://manage-data/data-store/data-streams/failure-store.md
+                children:
+                - page: docs-content://manage-data/data-store/data-streams/failure-store-recipes.md
+                  title: Recipes
+            - group: Mapping
+              page: docs-content://manage-data/data-store/mapping.md
+              children:
+              - page: elasticsearch://reference/elasticsearch/mapping-reference/index.md
+                title: Mapping reference
+              - group: Dynamic mapping
+                page: docs-content://manage-data/data-store/mapping/dynamic-mapping.md
+                children:
+                - page: docs-content://manage-data/data-store/mapping/dynamic-field-mapping.md
+                  title: Dynamic field mapping
+                - page: docs-content://manage-data/data-store/mapping/dynamic-templates.md
+                  title: Dynamic templates
+              - page: docs-content://manage-data/data-store/mapping/explicit-mapping.md
+                title: Explicit mapping
+              - group: Runtime fields
+                page: docs-content://manage-data/data-store/mapping/runtime-fields.md
+                children:
+                - page: docs-content://manage-data/data-store/mapping/map-runtime-field.md
+                  title: Map a runtime field
+                - page: docs-content://manage-data/data-store/mapping/define-runtime-fields-in-search-request.md
+                  title: Define in search request
+                - page: docs-content://manage-data/data-store/mapping/override-field-values-at-query-time.md
+                  title: Override values at query time
+                - page: docs-content://manage-data/data-store/mapping/retrieve-runtime-field.md
+                  title: Retrieve a runtime field
+                - page: docs-content://manage-data/data-store/mapping/index-runtime-field.md
+                  title: Index a runtime field
+                - page: docs-content://manage-data/data-store/mapping/explore-data-with-runtime-fields.md
+                  title: Explore data with runtime fields
+              - page: docs-content://manage-data/data-store/mapping/removal-of-mapping-types.md
+                title: Removal of mapping types
+              - page: docs-content://manage-data/data-store/mapping/update-mappings-examples.md
+                title: Update mappings examples
+            - group: Text analysis
+              page: docs-content://manage-data/data-store/text-analysis.md
+              children:
+              - page: elasticsearch://reference/text-analysis/index.md
+                title: Text analysis components
+              - group: Concepts
+                page: docs-content://manage-data/data-store/text-analysis/concepts.md
+                children:
+                - page: docs-content://manage-data/data-store/text-analysis/anatomy-of-an-analyzer.md
+                  title: Anatomy of an analyzer
+                - page: docs-content://manage-data/data-store/text-analysis/index-search-analysis.md
+                  title: Index and search analysis
+                - page: docs-content://manage-data/data-store/text-analysis/stemming.md
+                  title: Stemming
+                - page: docs-content://manage-data/data-store/text-analysis/token-graphs.md
+                  title: Token graphs
+              - group: Configure text analysis
+                page: docs-content://manage-data/data-store/text-analysis/configure-text-analysis.md
+                children:
+                - page: docs-content://manage-data/data-store/text-analysis/test-an-analyzer.md
+                  title: Test an analyzer
+                - page: docs-content://manage-data/data-store/text-analysis/configuring-built-in-analyzers.md
+                  title: Configuring built-in analyzers
+                - page: docs-content://manage-data/data-store/text-analysis/create-custom-analyzer.md
+                  title: Create custom analyzer
+                - page: docs-content://manage-data/data-store/text-analysis/specify-an-analyzer.md
+                  title: Specify an analyzer
+            - group: Templates
+              page: docs-content://manage-data/data-store/templates.md
+              children:
+              - page: docs-content://manage-data/data-store/templates/simulate-multi-component-templates.md
+                title: Simulate multi-component templates
+              - page: docs-content://manage-data/data-store/templates/ignore-missing-component-templates.md
+                title: Ignore missing component templates
+            - page: docs-content://manage-data/data-store/aliases.md
+              title: Aliases
+            - group: Perform index operations
+              page: docs-content://manage-data/data-store/perform-index-operations.md
+              children:
+              - page: docs-content://manage-data/data-store/index-operations-reference.md
+                title: Index operations reference
+            - page: docs-content://manage-data/data-store/manage-data-from-the-command-line.md
+              title: Manage data from the command line
+          - group: Data lifecycle
+            page: docs-content://manage-data/lifecycle.md
+            children:
+            - page: docs-content://manage-data/lifecycle/data-tiers.md
+              title: "Data tiers: hot warm cold frozen"
+            - group: Index lifecycle management (ILM)
+              page: docs-content://manage-data/lifecycle/index-lifecycle-management.md
+              children:
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/index-lifecycle.md
+                title: Index lifecycle
+              - group: Rollover
+                page: docs-content://manage-data/lifecycle/index-lifecycle-management/rollover.md
+                children:
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/skip-rollover.md
+                  title: Skip rollover
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/configure-lifecycle-policy.md
+                title: Configure lifecycle policy
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-apply.md
+                title: Apply policy
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-view-status.md
+                title: View policy status
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/manage-lifecycle-integrations-data.md
+                title: Manage integrations data
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-updates.md
+                title: Policy updates
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/start-stop-index-lifecycle-management.md
+                title: Start and stop ILM
+              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/restore-managed-data-stream-index.md
+                title: Restore managed index
+              - group: ILM tutorials
+                page: docs-content://manage-data/lifecycle/index-lifecycle-management/ilm-tutorials.md
+                children:
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-time-series-with-data-streams.md
+                  title: Time series with data streams
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-time-series-without-data-streams.md
+                  title: Time series without data streams
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-general-content-with-data-streams.md
+                  title: General content with data streams
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-customize-built-in-policies.md
+                  title: Customize built-in policies
+              - group: Migrate ILM
+                page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-ilm.md
+                children:
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-index-management.md
+                  title: Migrate index management
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/manage-existing-indices.md
+                  title: Manage existing indices
+                - page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md
+                  title: Migrate allocation filters to node roles
+            - group: Data stream lifecycle
+              page: docs-content://manage-data/lifecycle/data-stream.md
+              children:
+              - page: docs-content://manage-data/lifecycle/data-stream/tutorial-create-data-stream-with-lifecycle.md
+                title: "Tutorial: Create with lifecycle"
+              - page: docs-content://manage-data/lifecycle/data-stream/tutorial-update-existing-data-stream.md
+                title: "Tutorial: Update existing"
+              - page: docs-content://manage-data/lifecycle/data-stream/tutorial-data-stream-retention.md
+                title: "Tutorial: Retention"
+              - page: docs-content://manage-data/lifecycle/data-stream/tutorial-migrate-ilm-managed-data-stream-to-data-stream-lifecycle.md
+                title: "Tutorial: Migrate from ILM"
+            - page: docs-content://manage-data/lifecycle/curator.md
+              title: Elasticsearch Curator
+            - group: Rollup
+              page: docs-content://manage-data/lifecycle/rollup.md
+              children:
+              - page: docs-content://manage-data/lifecycle/rollup/getting-started-api.md
+                title: Getting started (API)
+              - page: docs-content://manage-data/lifecycle/rollup/getting-started-kibana.md
+                title: Getting started (Kibana)
+              - page: docs-content://manage-data/lifecycle/rollup/understanding-groups.md
+                title: Understanding groups
+              - page: docs-content://manage-data/lifecycle/rollup/rollup-aggregation-limitations.md
+                title: Aggregation limitations
+              - page: docs-content://manage-data/lifecycle/rollup/rollup-search-limitations.md
+                title: Search limitations
+              - page: docs-content://manage-data/lifecycle/rollup/migrating-from-rollup-to-downsampling.md
+                title: Migrating to downsampling
+          - page: docs-content://manage-data/use-case-use-elasticsearch-to-manage-time-series-data.md
+            title: "Use case: time series data management"
+        - group: Transform and enrich data
+          page: docs-content://manage-data/ingest/transform-enrich.md
+          children:
+          - group: Data pipelines
+            children:
+            - page: opentelemetry://reference/motlp/index.md
+              title: Managed pipelines (mOTLP)
+            - group: Elasticsearch ingest pipelines
+              page: docs-content://manage-data/ingest/transform-enrich/ingest-pipelines.md
+              children:
+              - page: docs-content://manage-data/ingest/transform-enrich/example-parse-logs.md
+                title: "Example: Parse logs"
+              - page: docs-content://manage-data/ingest/transform-enrich/readable-maintainable-ingest-pipelines.md
+                title: Readable maintainable pipelines
+              - page: docs-content://manage-data/ingest/transform-enrich/error-handling.md
+                title: Error handling
+            - page: docs-content://manage-data/ingest/transform-enrich/logstash-pipelines.md
+              title: Logstash pipelines
+          - group: Data enrichment
+            page: docs-content://manage-data/ingest/transform-enrich/data-enrichment.md
+            children:
+            - page: docs-content://manage-data/ingest/transform-enrich/set-up-an-enrich-processor.md
+              title: Set up an enrich processor
+            - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-based-on-geolocation.md
+              title: "Example: Enrich by geolocation"
+            - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-based-on-exact-values.md
+              title: "Example: Enrich by exact values"
+            - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-by-matching-value-to-range.md
+              title: "Example: Enrich by matching value to range"
+          - page: docs-content://manage-data/ingest/transform-enrich/index-mapping-text-analysis.md
+            title: Index mapping and text analysis
+          - page: docs-content://manage-data/ingest/transform-enrich/ingest-lag.md
+            title: Calculate ingest lag metadata
+      - label: Search, visualize and analyze
+        children:
+        # =======================================================================
+        # SEARCH AND QUERY
+        # Narrative arc: get started → approaches → ingest → querying → cross-cluster → integrate
+        # Pages pulled from solutions/search/ and explore-analyze/ at current paths.
+        # [from E&A] = page currently lives in explore-analyze/
+        # [TODO] = placeholder, page not yet written
+        # =======================================================================
+        - group: Search and query
+          page: docs-content://solutions/search.md
+          children:
+
+          # -----------------------------------------------------------------------
+          # 1. GET STARTED
+          # -----------------------------------------------------------------------
+          - group: Get started with search
+            page: docs-content://solutions/search/get-started.md
+            children:
+            - group: Quickstarts
+              page: docs-content://solutions/search/get-started/quickstarts.md
+              children:
+              - page: docs-content://solutions/search/get-started/index-basics.md
+                title: Index basics
+              - page: docs-content://solutions/search/get-started/keyword-search-python.md
+                title: Keyword search with Python
+              - page: docs-content://solutions/search/get-started/semantic-search.md
+                title: Semantic search
+
+          # -----------------------------------------------------------------------
+          # 2. SEARCH APPROACHES
+          # What kind of search do I need?
+          # FTS is the foundation — everything else layers on top.
+          # -----------------------------------------------------------------------
+          - group: Search approaches
+            page: docs-content://solutions/search/search-approaches.md
+            children:
+            # Full-text is core to every deployment, not just one option
+            - group: Full-text search
+              page: docs-content://solutions/search/full-text.md
+              children:
+              - page: docs-content://solutions/search/full-text/how-full-text-works.md
+                title: How full-text search works
+              - page: docs-content://solutions/search/full-text/text-analysis-during-search.md
+                title: Text analysis during search
+              - group: Search relevance
+                page: docs-content://solutions/search/full-text/search-relevance.md
+                children:
+                - page: docs-content://solutions/search/full-text/search-relevance/mixing-exact-search-with-stemming.md
+                  title: Mix exact search with stemming
+                - page: docs-content://solutions/search/full-text/search-relevance/consistent-scoring.md
+                  title: Consistent scoring
+                - page: docs-content://solutions/search/full-text/search-relevance/static-scoring-signals.md
+                  title: Static scoring signals
+              - group: Synonyms
+                page: docs-content://solutions/search/full-text/search-with-synonyms.md
+                children:
+                - page: docs-content://solutions/search/full-text/create-update-synonyms-api-example.md
+                  title: Create and update synonyms via API
+            # Vector search — formerly "AI search"
+            - group: Vector search
+              page: docs-content://solutions/search/ai-search/ai-search.md
+              children:
+              - group: Dense vector search
+                page: docs-content://solutions/search/vector/dense-vector.md
+                children:
+                - page: docs-content://solutions/search/vector/knn.md
+                  title: k-nearest neighbor (kNN)
+                - page: docs-content://solutions/search/vector/bring-own-vectors.md
+                  title: Bring your own vectors
+              - page: docs-content://solutions/search/vector/sparse-vector.md
+                title: Sparse vector search
+              - page: docs-content://solutions/search/vector/dense-versus-sparse-ingest-pipelines.md
+                title: Dense vs sparse ingest pipelines
+              - group: Semantic search
+                page: docs-content://solutions/search/semantic-search.md
+                children:
+                - page: docs-content://solutions/search/semantic-search/semantic-search-semantic-text.md
+                  title: Semantic search with semantic_text
+                - page: docs-content://solutions/search/semantic-search/semantic-search-inference.md
+                  title: Semantic search with the inference API
+                - page: docs-content://solutions/search/semantic-search/semantic-search-elser-ingest-pipelines.md
+                  title: Semantic search with ELSER
+                - page: docs-content://solutions/search/semantic-search/cohere-es.md
+                  title: Semantic search with Cohere
+              - page: docs-content://solutions/search/using-openai-compatible-models.md
+                title: Using OpenAI-compatible models
+            - group: Hybrid search
+              page: docs-content://solutions/search/hybrid-search.md
+              children:
+              - page: docs-content://solutions/search/hybrid-semantic-text.md
+                title: Hybrid search with semantic_text
+            # Ranking — semantic reranking is a lightweight upgrade on top of FTS
+            - group: Ranking and reranking
+              page: docs-content://solutions/search/ranking.md
+              children:
+              - page: docs-content://solutions/search/ranking/semantic-reranking.md
+                title: Semantic reranking
+              - group: Learning to rank
+                page: docs-content://solutions/search/ranking/learning-to-rank-ltr.md
+                children:
+                - page: docs-content://solutions/search/ranking/learning-to-rank-model-training.md
+                  title: Train an LTR model
+                - page: docs-content://solutions/search/ranking/learning-to-rank-search-usage.md
+                  title: Use LTR in search
+
+          # -----------------------------------------------------------------------
+          # 3. INGEST FOR SEARCH
+          # After approaches — the approach decision shapes what your pipeline needs.
+          # -----------------------------------------------------------------------
+          - group: Ingest for search
+            page: docs-content://solutions/search/ingest-for-search.md
+            children:
+            - page: docs-content://solutions/search/search-pipelines.md
+              title: Search pipelines
+
+          # -----------------------------------------------------------------------
+          # 4. QUERYING
+          # How do I express and execute my search?
+          # Two dimensions: what language? what interface?
+          # -----------------------------------------------------------------------
+          - group: Build search queries
+            page: docs-content://solutions/search/querying-for-search.md
+            children:
+            - group: The search API
+              page: docs-content://solutions/search/the-search-api.md
+              children:
+              - page: docs-content://solutions/search/search-templates.md
+                title: Search templates
+              - group: Aggregations
+                page: docs-content://explore-analyze/query-filter/aggregations.md # [from E&A]
+                children:
+                - page: docs-content://explore-analyze/query-filter/aggregations/tutorial-analyze-ecommerce-data-with-aggregations-using-query-dsl.md
+                  title: Tutorial — analyze e-commerce data
+            - page: docs-content://solutions/search/retrievers-overview.md
+              title: Retrievers
+            - page: docs-content://solutions/search/esql-for-search.md
+              title: ES|QL for search
+            - page: docs-content://solutions/search/async-search-api.md
+              title: Async search
+            # Language narrative pages — "understand and decide" layer
+            # These sit above the bulk reference toc further down.
+            - group: Query languages
+              page: docs-content://explore-analyze/query-filter/languages.md # [from E&A] comparison table landing
+              children:
+              - page: docs-content://explore-analyze/query-filter/languages/querydsl.md # [from E&A]
+                title: Query DSL
+              - page: docs-content://explore-analyze/query-filter/languages/kql.md # [from E&A]
+                title: KQL
+              - group: EQL
+                page: docs-content://explore-analyze/query-filter/languages/eql.md # [from E&A]
+                children:
+                - page: docs-content://explore-analyze/query-filter/languages/example-detect-threats-with-eql.md
+                  title: Detect threats with EQL
+              # [THIN] sql.md is a hollow intro + link list that duplicates the reference toc below.
+              # Candidate for removal — redirect to elasticsearch://reference/query-languages/sql.md
+              - page: docs-content://explore-analyze/query-filter/languages/sql.md # [from E&A]
+                title: SQL
+              # [THIN] lucene-query-syntax.md is a single paragraph pointing users to the Kibana UI toggle.
+              # Candidate for removal — redirect to elasticsearch://reference/query-languages/query-dsl/query-dsl-query-string-query.md
+              - page: docs-content://explore-analyze/query-filter/languages/lucene-query-syntax.md # [from E&A]
+                title: Lucene query syntax
+            # Query language reference — bulk toc, cannot interleave with narrative pages above
+            - toc: elasticsearch://reference/query-languages
+            # Developer tools — for running and testing queries
+            - group: Developer tools
+              page: docs-content://explore-analyze/query-filter/tools.md # [from E&A]
+              children:
+              - page: docs-content://explore-analyze/query-filter/tools/console.md
+                title: Console
+              - page: docs-content://explore-analyze/query-filter/tools/search-profiler.md
+                title: Search Profiler
+              - page: docs-content://explore-analyze/query-filter/tools/saved-queries.md
+                title: Saved queries
+
+          # -----------------------------------------------------------------------
+          # 5. SEARCH ACROSS CLUSTERS AND PROJECTS
+          # End-of-journey scaling topic: "my data spans multiple clusters"
+          # -----------------------------------------------------------------------
+          - group: Cross-cluster search
+            page: docs-content://explore-analyze/cross-cluster-search.md # [from E&A]
+            children:
+            - page: docs-content://explore-analyze/cross-cluster-search/using-resolve-cluster-endpoint-before-cross-cluster-search.md
+              title: Using the resolve cluster endpoint
+          # Cross-project search — serverless only, pages are hidden in toc
+          - group: Cross-project search
+            page: docs-content://explore-analyze/cross-project-search.md # [from E&A]
+            children:
+            - page: docs-content://explore-analyze/cross-project-search/cross-project-search-link-projects.md
+              title: Link projects
+            - page: docs-content://explore-analyze/cross-project-search/cross-project-search-search.md
+              title: Search across projects
+            - page: docs-content://explore-analyze/cross-project-search/cross-project-search-tags.md
+              title: Using tags to control search
+            - page: docs-content://explore-analyze/cross-project-search/cross-project-search-project-routing.md
+              title: Project routing
+
+          # -----------------------------------------------------------------------
+          # 6. INTEGRATE WITH YOUR APP
+          # Wire search into your application code.
+          # [TODO] site-or-app.md → integrate.md rename deferred to docs-content work
+          # -----------------------------------------------------------------------
+          - group: Integrate with your app
+            page: docs-content://solutions/search/site-or-app.md
+            children:
+            - page: docs-content://solutions/search/site-or-app/clients.md
+              title: Client libraries
+            - page: docs-content://solutions/search/site-or-app/search-ui.md
+              title: Search UI
+            - page: docs-content://solutions/search/apis-and-tools.md
+              title: APIs and tools
+        - group: Explore and visualize
+          page: docs-content://explore-analyze/explore-and-visualize.md
+          children:
+          - page: docs-content://explore-analyze/kibana-data-exploration-learning-tutorial.md
+            title: Learn data exploration and visualization
+          - group: Discover
+            page: docs-content://explore-analyze/discover.md
+            children:
+            - page: docs-content://explore-analyze/discover/discover-get-started.md
+              title: Explore fields and data with Discover
+            - page: docs-content://explore-analyze/discover/document-explorer.md
+              title: Customize the Discover view
+            - page: docs-content://explore-analyze/discover/discover-search-for-relevance.md
+              title: Search for relevance
+            - page: docs-content://explore-analyze/discover/save-open-search.md
+              title: Save a search for reuse
+            - page: docs-content://explore-analyze/discover/show-field-statistics.md
+              title: View field statistics
+            - page: docs-content://explore-analyze/discover/run-pattern-analysis-discover.md
+              title: Run a pattern analysis on your log data
+            - page: docs-content://explore-analyze/discover/background-search.md
+              title: Run queries in the background
+            - page: docs-content://explore-analyze/discover/try-esql.md
+              title: "Using ES|QL"
+          - group: Dashboards
+            page: docs-content://explore-analyze/dashboards.md
+            children:
+            - page: docs-content://explore-analyze/dashboards/using.md
+              title: Exploring dashboards
+            - group: Building dashboards
+              page: docs-content://explore-analyze/dashboards/building.md
+              children:
+              - page: docs-content://explore-analyze/dashboards/create-dashboard.md
+                title: Create a dashboard
+              - page: docs-content://explore-analyze/dashboards/open-dashboard.md
+                title: Edit a dashboard
+              - page: docs-content://explore-analyze/dashboards/add-controls.md
+                title: Add filter controls
+              - page: docs-content://explore-analyze/dashboards/drilldowns.md
+                title: Add drilldowns
+              - page: docs-content://explore-analyze/dashboards/arrange-panels.md
+                title: Organize dashboard panels
+              - page: docs-content://explore-analyze/dashboards/duplicate-dashboards.md
+                title: Duplicate a dashboard
+              - page: docs-content://explore-analyze/dashboards/import-dashboards.md
+                title: Import a dashboard
+            - page: docs-content://explore-analyze/dashboards/managing.md
+              title: Managing dashboards
+            - page: docs-content://explore-analyze/dashboards/sharing.md
+              title: Sharing dashboards
+            - group: Tutorials
+              page: docs-content://explore-analyze/dashboards/tutorials.md
+              children:
+              - page: docs-content://explore-analyze/dashboards/create-dashboard-of-panels-with-web-server-data.md
+                title: Create a simple dashboard to monitor website logs
+              - page: docs-content://explore-analyze/dashboards/create-dashboard-of-panels-with-ecommerce-data.md
+                title: Create a dashboard with time series charts
+          - group: Panels and visualizations
+            page: docs-content://explore-analyze/visualize.md
+            children:
+            - page: docs-content://explore-analyze/visualize/visualize-library.md
+              title: Visualize Library
+            - page: docs-content://explore-analyze/visualize/manage-panels.md
+              title: Manage panels
+            - group: Lens
+              page: docs-content://explore-analyze/visualize/lens.md
+              children:
+              - page: docs-content://explore-analyze/visualize/charts/area-charts.md
+                title: Area charts
+              - page: docs-content://explore-analyze/visualize/charts/bar-charts.md
+                title: Bar charts
+              - page: docs-content://explore-analyze/visualize/charts/heat-map-charts.md
+                title: Heat map charts
+              - page: docs-content://explore-analyze/visualize/charts/gauge-charts.md
+                title: Gauge charts
+              - page: docs-content://explore-analyze/visualize/charts/line-charts.md
+                title: Line charts
+              - page: docs-content://explore-analyze/visualize/charts/metric-charts.md
+                title: Metric charts
+              - page: docs-content://explore-analyze/visualize/charts/mosaic-charts.md
+                title: Mosaic charts
+              - page: docs-content://explore-analyze/visualize/charts/pie-charts.md
+                title: Pie charts
+              - page: docs-content://explore-analyze/visualize/charts/region-map-charts.md
+                title: Region map charts
+              - page: docs-content://explore-analyze/visualize/charts/tables.md
+                title: Tables
+              - page: docs-content://explore-analyze/visualize/charts/waffle-charts.md
+                title: Waffle charts
+              - page: docs-content://explore-analyze/visualize/charts/tag-cloud-charts.md
+                title: Tag cloud charts
+              - page: docs-content://explore-analyze/visualize/charts/treemap-charts.md
+                title: Treemap charts
+            - page: docs-content://explore-analyze/visualize/esorql.md
+              title: "ES|QL"
+            - page: docs-content://explore-analyze/visualize/custom-visualizations-with-vega.md
+              title: Custom visualizations with Vega
+            - page: docs-content://explore-analyze/visualize/text-panels.md
+              title: Text panels
+            - page: docs-content://explore-analyze/visualize/image-panels.md
+              title: Image panels
+            - page: docs-content://explore-analyze/visualize/link-panels.md
+              title: Link panels
+            - page: docs-content://explore-analyze/visualize/alert-panels.md
+              title: Alert panels
+            - group: Canvas
+              page: docs-content://explore-analyze/visualize/canvas.md
+              children:
+              - page: docs-content://explore-analyze/visualize/canvas/edit-workpads.md
+                title: Edit workpads
+              - page: docs-content://explore-analyze/visualize/canvas/canvas-present-workpad.md
+                title: Present your workpad
+              - page: docs-content://explore-analyze/visualize/canvas/canvas-tutorial.md
+                title: "Tutorial: Create a workpad for monitoring sales"
+              - group: Canvas function reference
+                page: docs-content://explore-analyze/visualize/canvas/canvas-function-reference.md
+                children:
+                - page: docs-content://explore-analyze/visualize/canvas/canvas-tinymath-functions.md
+                  title: TinyMath functions
+            - group: Maps
+              page: docs-content://explore-analyze/visualize/maps.md
+              children:
+              - page: docs-content://explore-analyze/visualize/maps/maps-getting-started.md
+                title: Build a map to compare metrics by country or region
+              - page: docs-content://explore-analyze/visualize/maps/asset-tracking-tutorial.md
+                title: Track, visualize, and alert on assets in real time
+              - page: docs-content://explore-analyze/visualize/maps/reverse-geocoding-tutorial.md
+                title: Map custom regions with reverse geocoding
+              - page: docs-content://explore-analyze/visualize/maps/heatmap-layer.md
+                title: Heat map layer
+              - page: docs-content://explore-analyze/visualize/maps/tile-layer.md
+                title: Tile layer
+              - group: Vector layer
+                page: docs-content://explore-analyze/visualize/maps/vector-layer.md
+                children:
+                - page: docs-content://explore-analyze/visualize/maps/vector-style.md
+                  title: Vector styling
+                - page: docs-content://explore-analyze/visualize/maps/maps-vector-style-properties.md
+                  title: Vector style properties
+                - page: docs-content://explore-analyze/visualize/maps/vector-tooltip.md
+                  title: Vector tooltips
+              - group: Map aggregations
+                page: docs-content://explore-analyze/visualize/maps/maps-aggregations.md
+                children:
+                - page: docs-content://explore-analyze/visualize/maps/maps-grid-aggregation.md
+                  title: Clusters
+                - page: docs-content://explore-analyze/visualize/maps/maps-top-hits-aggregation.md
+                  title: Display the most relevant documents per entity
+                - page: docs-content://explore-analyze/visualize/maps/point-to-point.md
+                  title: Point to point
+                - page: docs-content://explore-analyze/visualize/maps/terms-join.md
+                  title: Term join
+              - group: Search and filter maps
+                page: docs-content://explore-analyze/visualize/maps/maps-search.md
+                children:
+                - page: docs-content://explore-analyze/visualize/maps/maps-create-filter-from-map.md
+                  title: Create filters from a map
+                - page: docs-content://explore-analyze/visualize/maps/maps-layer-based-filtering.md
+                  title: Filter a single layer
+                - page: docs-content://explore-analyze/visualize/maps/maps-search-across-multiple-indices.md
+                  title: Search across multiple indices
+              - page: docs-content://explore-analyze/visualize/maps/maps-settings.md
+                title: Configure map settings
+              - page: docs-content://explore-analyze/visualize/maps/maps-connect-to-ems.md
+                title: Connect to Elastic Maps Service
+              - group: Import geospatial data
+                page: docs-content://explore-analyze/visualize/maps/import-geospatial-data.md
+                children:
+                - page: docs-content://explore-analyze/visualize/maps/maps-clean-data.md
+                  title: Clean your data
+                - page: docs-content://explore-analyze/visualize/maps/indexing-geojson-data-tutorial.md
+                  title: "Tutorial: Index GeoJSON data"
+              - page: docs-content://explore-analyze/visualize/maps/maps-troubleshooting.md
+                title: Troubleshoot
+            - group: Graph
+              page: docs-content://explore-analyze/visualize/graph.md
+              children:
+              - page: docs-content://explore-analyze/visualize/graph/graph-configuration.md
+                title: Configure Graph
+              - page: docs-content://explore-analyze/visualize/graph/graph-troubleshooting.md
+                title: Troubleshooting and limitations
+            - group: Legacy editors
+              page: docs-content://explore-analyze/visualize/legacy-editors.md
+              children:
+              - page: docs-content://explore-analyze/visualize/legacy-editors/aggregation-based.md
+                title: Aggregation-based
+              - page: docs-content://explore-analyze/visualize/legacy-editors/tsvb.md
+                title: TSVB
+              - page: docs-content://explore-analyze/visualize/legacy-editors/timelion.md
+                title: Timelion
+          - group: Find and organize content
+            page: docs-content://explore-analyze/find-and-organize.md
+            children:
+            - page: docs-content://explore-analyze/find-and-organize/data-views.md
+              title: Data views
+            - page: docs-content://explore-analyze/find-and-organize/saved-objects.md
+              title: Saved objects
+            - page: docs-content://explore-analyze/find-and-organize/files.md
+              title: Files
+            - page: docs-content://explore-analyze/find-and-organize/reports.md
+              title: Reports
+            - page: docs-content://explore-analyze/find-and-organize/tags.md
+              title: Tags
+            - page: docs-content://explore-analyze/find-and-organize/find-apps-and-objects.md
+              title: Find apps and objects
+        - group: Track and respond
+          page: docs-content://explore-analyze/track-and-respond.md
+          children:
+          - group: Reporting and sharing
+            page: docs-content://explore-analyze/report-and-share.md
+            children:
+            - page: docs-content://explore-analyze/report-and-share/automating-report-generation.md
+              title: Automatically generate reports
+            - group: Reporting troubleshooting
+              page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting.md
+              children:
+              - page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting-csv.md
+                title: CSV
+              - page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting-pdf.md
+                title: PDF/PNG
+          - group: Alerting
+            page: docs-content://explore-analyze/alerting.md
+            children:
+            - group: Alerts
+              page: docs-content://explore-analyze/alerting/alerts.md
+              children:
+              - page: docs-content://explore-analyze/alerting/alerts/alerting-getting-started.md
+                title: Getting started with alerts
+              - page: docs-content://explore-analyze/alerting/alerts/alerting-setup.md
+                title: Set up
+              - page: docs-content://explore-analyze/alerting/alerts/create-manage-rules.md
+                title: Create and manage rules
+              - page: docs-content://explore-analyze/alerting/alerts/view-alerts.md
+                title: View and manage alerts
+              - page: docs-content://explore-analyze/alerting/alerts/query-alerts.md
+                title: Query alert indices
+              - group: Rule types
+                page: docs-content://explore-analyze/alerting/alerts/rule-types.md
+                children:
+                - page: docs-content://explore-analyze/alerting/alerts/rule-type-index-threshold.md
+                  title: Index threshold
+                - page: docs-content://explore-analyze/alerting/alerts/rule-type-es-query.md
+                  title: Elasticsearch query
+                - page: docs-content://explore-analyze/alerting/alerts/geo-alerting.md
+                  title: Tracking containment
+              - page: docs-content://explore-analyze/alerting/alerts/rule-action-variables.md
+                title: Rule action variables
+              - page: docs-content://explore-analyze/alerting/alerts/notifications-domain-allowlist.md
+                title: Notifications domain allowlist
+              - group: Alerting troubleshooting
+                page: docs-content://explore-analyze/alerting/alerts/alerting-troubleshooting.md
+                children:
+                - page: docs-content://explore-analyze/alerting/alerts/alerting-common-issues.md
+                  title: Common issues
+                - page: docs-content://explore-analyze/alerting/alerts/event-log-index.md
+                  title: Event log index
+                - page: docs-content://explore-analyze/alerting/alerts/testing-connectors.md
+                  title: Test connectors
+              - page: docs-content://explore-analyze/alerting/alerts/maintenance-windows.md
+                title: Maintenance windows
+            - group: Watcher
+              page: docs-content://explore-analyze/alerting/watcher.md
+              children:
+              - page: docs-content://explore-analyze/alerting/watcher/watcher-getting-started.md
+                title: Getting started with Watcher
+              - page: docs-content://explore-analyze/alerting/watcher/how-watcher-works.md
+                title: How Watcher works
+              - page: docs-content://explore-analyze/alerting/watcher/enable-watcher.md
+                title: Enable Watcher
+              - page: docs-content://explore-analyze/alerting/watcher/watcher-ui.md
+                title: Watcher UI
+              - page: docs-content://explore-analyze/alerting/watcher/encrypting-data.md
+                title: Encrypting sensitive data in Watcher
+              - group: Input
+                page: docs-content://explore-analyze/alerting/watcher/input.md
+                children:
+                - page: docs-content://explore-analyze/alerting/watcher/input-simple.md
+                  title: Simple input
+                - page: docs-content://explore-analyze/alerting/watcher/input-search.md
+                  title: Search input
+                - page: docs-content://explore-analyze/alerting/watcher/input-http.md
+                  title: HTTP input
+                - page: docs-content://explore-analyze/alerting/watcher/input-chain.md
+                  title: Chain input
+              - group: Trigger
+                page: docs-content://explore-analyze/alerting/watcher/trigger.md
+                children:
+                - page: docs-content://explore-analyze/alerting/watcher/trigger-schedule.md
+                  title: Schedule trigger
+                - page: docs-content://explore-analyze/alerting/watcher/throttling.md
+                  title: Throttling
+                - page: docs-content://explore-analyze/alerting/watcher/schedule-types.md
+                  title: Schedule Types
+              - group: Condition
+                page: docs-content://explore-analyze/alerting/watcher/condition.md
+                children:
+                - page: docs-content://explore-analyze/alerting/watcher/condition-always.md
+                  title: Always condition
+                - page: docs-content://explore-analyze/alerting/watcher/condition-never.md
+                  title: Never condition
+                - page: docs-content://explore-analyze/alerting/watcher/condition-compare.md
+                  title: Compare condition
+                - page: docs-content://explore-analyze/alerting/watcher/condition-array-compare.md
+                  title: Array compare condition
+                - page: docs-content://explore-analyze/alerting/watcher/condition-script.md
+                  title: Script condition
+              - group: Actions
+                page: docs-content://explore-analyze/alerting/watcher/actions.md
+                children:
+                - page: docs-content://explore-analyze/alerting/watcher/action-foreach.md
+                  title: Running an action for each element in an array
+                - page: docs-content://explore-analyze/alerting/watcher/action-conditions.md
+                  title: Adding conditions to actions
+                - page: docs-content://explore-analyze/alerting/watcher/actions-email.md
+                  title: Email action
+                - page: docs-content://explore-analyze/alerting/watcher/actions-webhook.md
+                  title: Webhook action
+                - page: docs-content://explore-analyze/alerting/watcher/actions-index.md
+                  title: Index action
+                - page: docs-content://explore-analyze/alerting/watcher/actions-logging.md
+                  title: Logging action
+                - page: docs-content://explore-analyze/alerting/watcher/actions-slack.md
+                  title: Slack action
+                - page: docs-content://explore-analyze/alerting/watcher/actions-pagerduty.md
+                  title: PagerDuty action
+                - page: docs-content://explore-analyze/alerting/watcher/actions-jira.md
+                  title: Jira action
+              - group: Transform
+                page: docs-content://explore-analyze/alerting/watcher/transform.md
+                children:
+                - page: docs-content://explore-analyze/alerting/watcher/transform-search.md
+                  title: Search payload transform
+                - page: docs-content://explore-analyze/alerting/watcher/transform-script.md
+                  title: Script payload transform
+                - page: docs-content://explore-analyze/alerting/watcher/transform-chain.md
+                  title: Chain payload transform
+              - page: docs-content://explore-analyze/alerting/watcher/managing-watches.md
+                title: Managing watches
+              - group: Example watches
+                page: docs-content://explore-analyze/alerting/watcher/example-watches.md
+                children:
+                - page: docs-content://explore-analyze/alerting/watcher/watch-cluster-status.md
+                  title: Watching the status of an Elasticsearch cluster
+                - page: docs-content://explore-analyze/alerting/watcher/execute-watch.md
+                  title: Execute a watch
+              - page: docs-content://explore-analyze/alerting/watcher/watcher-limitations.md
+                title: Limitations
+          - group: Cases
+            page: docs-content://explore-analyze/cases.md
+            children:
+            - page: docs-content://explore-analyze/cases/control-case-access.md
+              title: Control access
+            - page: docs-content://explore-analyze/cases/create-cases.md
+              title: Create cases
+            - page: docs-content://explore-analyze/cases/manage-cases.md
+              title: Manage cases
+            - page: docs-content://explore-analyze/cases/attach-objects-to-cases.md
+              title: Attach objects
+            - page: docs-content://explore-analyze/cases/search-share-cases.md
+              title: Search and share
+            - page: docs-content://explore-analyze/cases/configure-case-settings.md
+              title: Configure settings
+            - page: docs-content://explore-analyze/cases/cases-as-data.md
+              title: Cases as data
+      - label: Automate
+        children:
+        - group: Workflows
+          page: docs-content://explore-analyze/workflows.md
+          children:
+          - page: docs-content://explore-analyze/workflows/setup.md
+            title: Set up workflows
+          - page: docs-content://explore-analyze/workflows/get-started.md
+            title: Get started with workflows
+          - group: Core components
+            page: docs-content://explore-analyze/workflows/core-components.md
+            children:
+            - group: Triggers
+              page: docs-content://explore-analyze/workflows/triggers.md
+              children:
+              - page: docs-content://explore-analyze/workflows/triggers/manual-triggers.md
+                title: Manual triggers
+              - page: docs-content://explore-analyze/workflows/triggers/scheduled-triggers.md
+                title: Scheduled triggers
+              - page: docs-content://explore-analyze/workflows/triggers/alert-triggers.md
+                title: Alert triggers
+            - group: Steps
+              page: docs-content://explore-analyze/workflows/steps.md
+              children:
+              - group: Action steps
+                page: docs-content://explore-analyze/workflows/steps/action-steps.md
+                children:
+                - page: docs-content://explore-analyze/workflows/steps/elasticsearch.md
+                  title: Elasticsearch
+                - page: docs-content://explore-analyze/workflows/steps/kibana.md
+                  title: Kibana
+                - page: docs-content://explore-analyze/workflows/steps/external-systems-apps.md
+                  title: External systems and apps
+              - group: Flow control steps
+                page: docs-content://explore-analyze/workflows/steps/flow-control-steps.md
+                children:
+                - page: docs-content://explore-analyze/workflows/steps/if.md
+                  title: If
+                - page: docs-content://explore-analyze/workflows/steps/foreach.md
+                  title: Foreach
+                - page: docs-content://explore-analyze/workflows/steps/wait.md
+                  title: Wait
+              - page: docs-content://explore-analyze/workflows/steps/ai-steps.md
+                title: AI steps
+          - group: Data and error handling
+            page: docs-content://explore-analyze/workflows/data.md
+            children:
+            - page: docs-content://explore-analyze/workflows/data/templating.md
+              title: Templating engine
+          - page: docs-content://explore-analyze/workflows/author-workflows.md
+            title: Author workflows
+          - page: docs-content://explore-analyze/workflows/monitor-troubleshoot.md
+            title: Monitor and troubleshoot workflows
+          - page: docs-content://explore-analyze/workflows/manage-workflows.md
+            title: Manage workflows
+          - page: docs-content://explore-analyze/workflows/templates.md
+            title: Workflow templates
+      - label: AI and machine learning
+        children:
+        - group: Machine Learning and NLP
+          page: docs-content://explore-analyze/machine-learning.md
+          children:
+          - page: docs-content://explore-analyze/machine-learning/setting-up-machine-learning.md
+            title: Setup and security
+          - group: Anomaly detection
+            page: docs-content://explore-analyze/machine-learning/anomaly-detection.md
+            children:
+            - group: Finding anomalies
+              page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-finding-anomalies.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-plan.md
+                title: Plan your analysis
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-run-jobs.md
+                title: Run a job
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-view-results.md
+                title: View the results
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-forecast.md
+                title: Forecast future behavior
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-getting-started.md
+              title: Tutorial
+            - group: Concepts
+              page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-concepts.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-algorithms.md
+                title: Anomaly detection algorithms
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-explain.md
+                title: Anomaly score explanation
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-anomaly-detection-job-types.md
+                title: Job types
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/anomaly-detection-scale.md
+                title: Working with anomaly detection at scale
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-delayed-data-detection.md
+                title: Handling delayed data
+            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-api-quickref.md
+              title: API quick reference
+            - group: How-tos
+              page: docs-content://explore-analyze/machine-learning/anomaly-detection/anomaly-how-tos.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-alerts.md
+                title: Generating alerts for anomaly detection jobs
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-aggregation.md
+                title: Aggregating data for faster performance
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-transform.md
+                title: Altering data in your datafeed with runtime fields
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-detector-custom-rules.md
+                title: Customizing detectors with custom rules
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-categories.md
+                title: Detecting anomalous categories of data
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-populations.md
+                title: Performing population analysis
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-reverting-model-snapshot.md
+                title: Reverting to a model snapshot
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/geographic-anomalies.md
+                title: Detecting anomalous locations in geographic data
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/mapping-anomalies.md
+                title: Mapping anomalies by location
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-url.md
+                title: Adding custom URLs to machine learning results
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-jobs-from-lens.md
+                title: Anomaly detection jobs from visualizations
+            - group: Resources
+              page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-resources.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-limitations.md
+                title: Limitations
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-functions.md
+                title: Analysis function reference
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ootb-ml-jobs.md
+                title: Supplied configurations
+              - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-troubleshooting.md
+                title: Troubleshooting and FAQ
+          - group: Data frame analytics
+            page: docs-content://explore-analyze/machine-learning/data-frame-analytics.md
+            children:
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-overview.md
+              title: Overview
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-finding-outliers.md
+              title: Finding outliers
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-regression.md
+              title: Predicting numerical values with regression
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-classification.md
+              title: Predicting classes with classification
+            - group: Concepts
+              page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-concepts.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-phases.md
+                title: How data frame analytics jobs work
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-scale.md
+                title: Working with data frame analytics at scale
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-custom-urls.md
+                title: Adding custom URLs to data frame analytics jobs
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-encoding.md
+                title: Feature encoding
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-processors.md
+                title: Feature processors
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-importance.md
+                title: Feature importance
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/dfa-regression-lossfunction.md
+                title: Loss functions for regression analyses
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/hyperparameters.md
+                title: Hyperparameter optimization
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-trained-models.md
+                title: Trained models
+            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfanalytics-apis.md
+              title: API quick reference
+            - group: Resources
+              page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-resources.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-limitations.md
+                title: Limitations
+          - group: NLP
+            page: docs-content://explore-analyze/machine-learning/nlp.md
+            children:
+            - group: Overview
+              page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-overview.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-extract-info.md
+                title: Extract information
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-classify-text.md
+                title: Classify text
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-search-compare.md
+                title: Search and compare text
+            - group: Deploy models
+              page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-deploy-models.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-select-model.md
+                title: Select a trained model
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-import-model.md
+                title: Import the trained model and vocabulary
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-deploy-model.md
+                title: Deploy the model in your cluster
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-test-inference.md
+                title: Try it out
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-inference.md
+              title: Add NLP inference to ingest pipelines
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-apis.md
+              title: API quick reference
+            - group: Built-in models
+              page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-built-in-models.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-elser.md
+                title: ELSER
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-jina.md
+                title: Jina
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-rerank.md
+                title: Elastic Rerank
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-e5.md
+                title: E5
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-lang-ident.md
+                title: Language identification
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-model-ref.md
+              title: Compatible third party models
+            - group: Examples
+              page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-examples.md
+              children:
+              - page: docs-content://explore-analyze/machine-learning/nlp/nlp-end-to-end-tutorial.md
+                title: End-to-end tutorial
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-ner-example.md
+                title: Named entity recognition
+              - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-text-emb-vector-search-example.md
+                title: Text embedding and semantic search
+            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-limitations.md
+              title: Limitations
+          - group: Machine learning in Kibana
+            page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana.md
+            children:
+            - page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-aiops.md
+              title: AIOps Labs
+            - page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana/inference-processing.md
+              title: Inference processing
+        - group: Agent builder
+          page: docs-content://explore-analyze/ai-features/elastic-agent-builder.md
+          children:
+          - page: docs-content://explore-analyze/ai-features/agent-builder/get-started.md
+            title: Get started
+          - page: docs-content://explore-analyze/ai-features/agent-builder/models.md
+            title: Models
+          - group: Chat
+            page: docs-content://explore-analyze/ai-features/agent-builder/chat.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/agent-builder/standalone-and-flyout-modes.md
+              title: Chat UI modes
+          - group: Agents
+            page: docs-content://explore-analyze/ai-features/agent-builder/agent-builder-agents.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/agent-builder/custom-agents.md
+              title: Custom agents
+            - page: docs-content://explore-analyze/ai-features/agent-builder/builtin-agents-reference.md
+              title: Built-in agents
+            - page: docs-content://explore-analyze/ai-features/agent-builder/prompt-engineering.md
+              title: Prompting best practices
+            - page: docs-content://explore-analyze/ai-features/agent-builder/agents-and-workflows.md
+              title: Call agents from workflows
+          - group: Tools
+            page: docs-content://explore-analyze/ai-features/agent-builder/tools.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/builtin-tools-reference.md
+              title: Built-in tools
+            - group: Custom tools
+              page: docs-content://explore-analyze/ai-features/agent-builder/tools/custom-tools.md
+              children:
+              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/esql-tools.md
+                title: "ES|QL tools"
+              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/index-search-tools.md
+                title: Index search tools
+              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/mcp-tools.md
+                title: MCP tools
+              - page: docs-content://explore-analyze/ai-features/agent-builder/tools/workflow-tools.md
+                title: Workflow tools
+          - group: Programmatic access
+            page: docs-content://explore-analyze/ai-features/agent-builder/programmatic-access.md
+            children:
+            - group: Kibana API
+              page: docs-content://explore-analyze/ai-features/agent-builder/kibana-api.md
+              children:
+              - page: docs-content://explore-analyze/ai-features/agent-builder/agent-builder-api-tutorial.md
+                title: Kibana API tutorial
+            - page: docs-content://explore-analyze/ai-features/agent-builder/a2a-server.md
+              title: A2A server
+            - page: docs-content://explore-analyze/ai-features/agent-builder/mcp-server.md
+              title: MCP server
+          - page: docs-content://explore-analyze/ai-features/agent-builder/monitor-usage.md
+            title: Monitor token usage
+          - page: docs-content://explore-analyze/ai-features/agent-builder/permissions.md
+            title: Permissions
+          - group: Troubleshooting
+            page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting/context-length-exceeded.md
+              title: Context length exceeded
+            - page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting/api-calls-return-403-forbidden.md
+              title: 403 Forbidden
+          - page: docs-content://explore-analyze/ai-features/agent-builder/limitations-known-issues.md
+            title: Limitations
+        - group: Elastic Inference Service
+          page: docs-content://explore-analyze/elastic-inference.md
+          children:
+          - group: Elastic Inference Service
+            page: docs-content://explore-analyze/elastic-inference/eis.md
+            children:
+            - page: docs-content://explore-analyze/elastic-inference/connect-self-managed-cluster-to-eis.md
+              title: EIS for self-managed clusters
+          - page: docs-content://explore-analyze/elastic-inference/inference-api.md
+            title: Inference integrations
+        - group: AI chat and LLM configuration
+          page: docs-content://explore-analyze/ai-features.md
+          children:
+          - group: AI chat experiences
+            page: docs-content://explore-analyze/ai-features/ai-chat-experiences.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/ai-chat-experiences/ai-agent-or-ai-assistant.md
+              title: Compare Agent Builder and AI Assistant
+            - page: docs-content://explore-analyze/ai-features/ai-chat-experiences/ai-assistant.md
+              title: AI assistants
+          - group: LLM providers
+            page: docs-content://explore-analyze/ai-features/llm-guides/llm-connectors.md
+            children:
+            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-azure-openai.md
+              title: Connect to Azure OpenAI
+            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-amazon-bedrock.md
+              title: Connect to Amazon Bedrock
+            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-openai.md
+              title: Connect to OpenAI
+            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-google-vertex.md
+              title: Connect to Google Vertex
+            - group: Local LLMs
+              page: docs-content://explore-analyze/ai-features/llm-guides/local-llms-overview.md
+              children:
+              - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-lmstudio-observability.md
+                title: Connect to LM Studio for Observability
+              - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-lmstudio-security.md
+                title: Connect to LM Studio for Elastic Security
+              - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-vLLM.md
+                title: Connect to vLLM for Elastic Security
+          - page: docs-content://explore-analyze/ai-features/manage-access-to-ai-assistant.md
+            title: Manage access to AI features
+        - page: docs-content://explore-analyze/ai-features/agent-skills.md
+          title: AI agent skills for Elastic
+    - label: Solutions and project types
+      children:
+      - page: docs-content://solutions/index.md
+        title: Solutions overview
+      - group: Elasticsearch solution
+        page: docs-content://solutions/elasticsearch-solution-project.md
         children:
-        - title: Administration skills
-        - label: Deployment-specific administration
-        - group: Elastic Cloud Hosted
+        - group: Get started
+          page: docs-content://solutions/elasticsearch-solution-project/get-started.md
           children:
-          - group: Manage deployments
-            page: docs-content://deploy-manage/deploy/elastic-cloud/manage-deployments.md
-            children:
-            - group: Configure
-              page: docs-content://deploy-manage/deploy/elastic-cloud/configure.md
-              children:
-              - page: docs-content://deploy-manage/deploy/elastic-cloud/ec-change-hardware-profile.md
-                title: Manage hardware profiles
-                children:
-                - page: docs-content://deploy-manage/deploy/elastic-cloud/change-hardware.md
-                  title: Change instance configuration
-              - page: docs-content://deploy-manage/deploy/elastic-cloud/ec-customize-deployment-components.md  # BOTH PHASES
-                title: Customize deployment components
-              - page: docs-content://deploy-manage/deploy/elastic-cloud/edit-stack-settings.md
-                title: Edit stack settings
-              - page: docs-content://deploy-manage/deploy/elastic-cloud/add-plugins-extensions.md
-                title: Add plugins and extensions
-                children:
-                - page: docs-content://deploy-manage/deploy/elastic-cloud/upload-custom-plugins-bundles.md
-                  title: Upload custom plugins
-                - page: docs-content://deploy-manage/deploy/elastic-cloud/manage-plugins-extensions-through-api.md
-                  title: Manage through the API
-              - page: docs-content://deploy-manage/deploy/elastic-cloud/custom-endpoint-aliases.md
-                title: Custom endpoint aliases
-            - page: docs-content://deploy-manage/deploy/elastic-cloud/manage-integrations-server.md
-              title: Manage Integrations Server
-              children:
-              - page: docs-content://deploy-manage/deploy/elastic-cloud/switch-from-apm-to-integrations-server-payload.md
-                title: Switch from APM to Integrations Server
-            - page: docs-content://deploy-manage/deploy/elastic-cloud/find-cloud-id.md
-              title: Find your Cloud ID
-            - page: docs-content://deploy-manage/deploy/elastic-cloud/manage-deployments-using-elastic-cloud-api.md
-              title: Manage deployments using the API
-            - page: docs-content://deploy-manage/deploy/elastic-cloud/keep-track-of-deployment-activity.md
-              title: Keep track of deployment activity
-          - page: docs-content://deploy-manage/deploy/elastic-cloud/access-kibana.md  # BOTH PHASES
-            title: Access Kibana
-          - page: docs-content://deploy-manage/deploy/elastic-cloud/ec-vcpu-boost-instance.md
-            title: vCPU boosting and credits
-          - page: docs-content://deploy-manage/deploy/elastic-cloud/available-stack-versions.md
-            title: Available stack versions
-          - page: docs-content://deploy-manage/deploy/elastic-cloud/restrictions-known-problems.md
-            title: Restrictions and known problems
-          - page: docs-content://deploy-manage/deploy/elastic-cloud/tools-apis.md
-            title: Tools and APIs
-        - group: Elastic Cloud Serverless
+          - page: docs-content://solutions/elasticsearch-solution-project/search-connection-details.md
+            title: Find connection details
+        - group: Playground
+          page: docs-content://solutions/elasticsearch-solution-project/playground.md
+          children:
+          - page: docs-content://solutions/elasticsearch-solution-project/playground-context.md
+            title: Optimize model context
+          - page: docs-content://solutions/elasticsearch-solution-project/playground-query.md
+            title: View and modify queries
+          - page: docs-content://solutions/elasticsearch-solution-project/playground-troubleshooting.md
+            title: Troubleshooting
+        - page: docs-content://solutions/elasticsearch-solution-project/ai-assistant.md
+          title: AI Assistant
+        - page: docs-content://solutions/elasticsearch-solution-project/query-rules-ui.md
+          title: Query rules UI
+        - group: Search Applications
+          page: docs-content://solutions/elasticsearch-solution-project/search-applications.md
           children:
-          - page: docs-content://deploy-manage/deploy/elastic-cloud/project-settings.md
-            title: Manage project settings
-          - page: docs-content://deploy-manage/deploy/elastic-cloud/manage-serverless-projects-using-api.md
-            title: Manage projects with API
-          - page: docs-content://deploy-manage/deploy/elastic-cloud/tools-apis.md
-            title: Tools and APIs
-        - group: Elastic Cloud Enterprise
+          - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-api.md
+            title: Search API and templates
+          - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-security.md
+            title: Security
+          - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-client.md
+            title: Search Application client guide
+        - page: docs-content://solutions/elasticsearch-solution-project/es-serverless-add-ons.md
+          title: Add-ons
+      - group: Observability solution
+        page: docs-content://solutions/observability.md
+        children:
+        - group: Get started
+          page: docs-content://solutions/observability/get-started.md
           children:
-          - group: Manage your orchestrator
-            page: docs-content://deploy-manage/deploy/cloud-enterprise/configure.md
+          - group: Elastic Observability quickstarts
+            page: docs-content://solutions/observability/get-started/quickstarts.md
+            children:
+            - page: docs-content://solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md
+              title: "Quickstart: Monitor hosts with OpenTelemetry"
+            - page: docs-content://solutions/observability/get-started/quickstart-monitor-your-application-performance.md
+              title: "Quickstart: Monitor your application performance"
+            - page: docs-content://solutions/observability/get-started/quickstart-unified-kubernetes-observability-with-elastic-distributions-of-opentelemetry-edot.md
+              title: "Quickstart: Unified Kubernetes Observability with Elastic Distributions of OpenTelemetry (EDOT)"
+            - page: docs-content://solutions/observability/get-started/quickstart-elastic-cloud-otel-endpoint.md
+              title: "Quickstart: Send OTLP data to Elastic Serverless or Elastic Cloud Hosted"
+            - page: docs-content://solutions/observability/get-started/quickstart-create-synthetic-monitor.md
+              title: "Quickstart: Create a Synthetic Monitor"
+            - page: docs-content://solutions/observability/get-started/quickstart-monitor-hosts-with-elastic-agent.md
+              title: "Quickstart: Monitor hosts with Elastic Agent"
+            - page: docs-content://solutions/observability/get-started/quickstart-monitor-kubernetes-cluster-with-elastic-agent.md
+              title: "Quickstart: Monitor your Kubernetes cluster with Elastic Agent"
+            - page: docs-content://solutions/observability/get-started/quickstart-collect-data-with-aws-firehose.md
+              title: "Quickstart: Collect data with AWS Firehose"
+          - group: OpenTelemetry quickstarts
+            page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/index.md
             children:
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/log-into-cloud-ui.md  # BOTH PHASES
-              title: Log into the Cloud UI
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/assign-roles-to-hosts.md
-              title: Assign roles to hosts
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/system-deployments-configuration.md  # BOTH PHASES
-              title: System deployments configuration
+            - page: docs-content://solutions/observability/get-started/opentelemetry/custom-metrics-quickstart.md
+              title: Ingest custom metrics with EDOT
+            - group: Self-managed
+              page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/index.md
               children:
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/default-system-deployment-versions.md
-                title: Default system deployment versions
-            - group: Deployment templates
-              page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-deployment-templates.md  # BOTH PHASES
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/k8s.md
+                title: Kubernetes
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/hosts_vms.md
+                title: Hosts / VMs
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/docker.md
+                title: Docker
+            - group: Elastic Cloud Serverless
+              page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/index.md
               children:
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/deployment-templates.md  # BOTH PHASES
-                title: Deployment templates reference
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-tag-allocators.md
-                title: Tag allocators
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-edit.md
-                title: Edit instance configurations
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-create.md
-                title: Create instance configurations
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-create-templates.md
-                title: Create templates
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-configure-system-templates.md
-                title: Configure default templates
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configure-templates-index-management.md
-                title: Configure index management
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ce-add-support-for-node-roles-autoscaling.md
-                title: Data tiers and autoscaling support
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-ce-add-support-for-integrations-server.md
-                title: Integrations server support
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-default.md
-                title: Default instance configurations
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/change-ece-api-url.md
-              title: Change the API URL
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/change-endpoint-urls.md
-              title: Change endpoint URLs
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/enable-custom-endpoint-aliases.md
-              title: Enable custom endpoint aliases
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-manage-capacity.md
-              title: Manage allocator capacity
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-allocator-affinity.md
-              title: Configure allocator affinity
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/change-allocator-disconnect-timeout.md
-              title: Change allocator disconnect timeout
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/install-ece-on-additional-hosts.md
-              title: Add hosts
-              children:
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/generate-roles-tokens.md
-                title: Manage roles tokens
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md
-              title: Migrate to Podman
-              children:
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/migrate-to-podman-5.md
-                title: Migrate to Podman 5
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-include-additional-kibana-plugin.md
-              title: Include additional Kibana plugins
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/manage-elastic-stack-versions.md
-              title: Manage stack versions
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/statistics-collected-by-cloud-enterprise.md
-              title: Statistics collected by ECE
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/tools-apis.md
-              title: Tools and APIs
-          - group: Manage deployments
-            page: docs-content://deploy-manage/deploy/cloud-enterprise/working-with-deployments.md
-            children:
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/deployment-templates.md  # BOTH PHASES
-              title: Deployment templates reference
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/create-deployment.md  # BOTH PHASES
-              title: Create a deployment
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/access-kibana.md  # BOTH PHASES
-              title: Access Kibana
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/connect-elasticsearch.md  # BOTH PHASES
-              title: Connect to Elasticsearch
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/configure-deployment.md
-              title: Configure
-              children:
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/customize-deployment.md
-                title: Customize deployment components
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings.md
-                title: Edit stack settings
-                children:
-                - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings-elasticsearch.md
-                  title: Elasticsearch user settings
-                - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings-kibana.md
-                  title: Kibana user settings
-                - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings-apm.md
-                  title: APM user settings
-                - page: docs-content://deploy-manage/deploy/cloud-enterprise/edit-stack-settings-enterprise.md
-                  title: Enterprise search user settings
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/resize-deployment.md
-                title: Resize a deployment
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/add-plugins.md
-                title: Add plugins and extensions
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/add-custom-bundles-plugins.md
-                title: Add custom bundles and plugins
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-regional-deployment-aliases.md
-                title: Custom endpoint aliases
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/resource-overrides.md
-                title: Resource overrides
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/advanced-cluster-configuration.md
-                title: Advanced cluster configuration
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/search-filter-deployments.md
-              title: Search and filter deployments
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/keep-track-of-deployment-activity.md
-              title: Keep track of deployment activity
-            - page: docs-content://deploy-manage/deploy/cloud-enterprise/manage-integrations-server.md
-              title: Manage Integrations Server
-              children:
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/ece-integrations-server-api-example.md
-                title: Enable through the API
-              - page: docs-content://deploy-manage/deploy/cloud-enterprise/switch-from-apm-to-integrations-server-payload.md
-                title: Switch from APM
-        - group: Elastic Cloud on Kubernetes
-          children:
-          - group: Manage the ECK operator
-            page: docs-content://deploy-manage/deploy/cloud-on-k8s/configure.md
-            children:
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configure-eck.md
-              title: Apply configuration settings
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configure-validating-webhook.md
-              title: Validating webhook
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/restrict-cross-namespace-resource-associations.md
-              title: Cross-namespace restrictions
-            - group: Service meshes
-              page: docs-content://deploy-manage/deploy/cloud-on-k8s/service-meshes.md
-              children:
-              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-istio.md
-                title: Istio
-              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-linkerd.md
-                title: Linkerd
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/webhook-namespace-selectors.md
-              title: Webhook namespace selectors
-          - group: Manage deployments and workloads
-            page: docs-content://deploy-manage/deploy/cloud-on-k8s/manage-deployments.md
-            children:
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/managing-deployments-using-helm-chart.md
-              title: Elastic Stack Helm chart
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/update-deployments.md
-              title: Applying updates
-            - page: docs-content://deploy-manage/deploy/cloud-on-k8s/accessing-services.md  # BOTH PHASES
-              title: Accessing services
-            - group: Configure deployments
-              page: docs-content://deploy-manage/deploy/cloud-on-k8s/configure-deployments.md
-              children:
-              - group: Elasticsearch configuration
-                page: docs-content://deploy-manage/deploy/cloud-on-k8s/elasticsearch-configuration.md
-                children:
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/nodes-orchestration.md
-                  title: Nodes orchestration
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/storage-recommendations.md
-                  title: Storage recommendations
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/node-configuration.md
-                  title: Node configuration
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/volume-claim-templates.md
-                  title: Volume claim templates
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/virtual-memory.md
-                  title: Virtual memory
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/settings-managed-by-eck.md
-                  title: Settings managed by ECK
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/custom-configuration-files-plugins.md
-                  title: Custom configuration files and plugins
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/init-containers-for-plugin-downloads.md
-                  title: Init containers for plugins
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/update-strategy.md
-                  title: Update strategy
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/pod-disruption-budget.md
-                  title: Pod disruption budget
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/advanced-elasticsearch-node-scheduling.md
-                  title: Advanced node scheduling
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/readiness-probe.md
-                  title: Readiness probe
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/pod-prestop-hook.md
-                  title: Pod PreStop hook
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/security-context.md
-                  title: Security context
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/requests-routing-to-elasticsearch-nodes.md
-                  title: Traffic splitting
-              - group: Kibana configuration
-                page: docs-content://deploy-manage/deploy/cloud-on-k8s/kibana-configuration.md
-                children:
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-kibana-es.md
-                  title: Connect Kibana to Elasticsearch
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-kibana-advanced-configuration.md
-                  title: Advanced configuration
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-kibana-plugins.md
-                  title: Kibana plugins
-              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/customize-pods.md
-                title: Customize pods
-              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/propagate-labels-annotations.md
-                title: Labels and annotations
-              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/manage-compute-resources.md
-                title: Compute resources
-              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/recipes.md
-                title: Recipes
-              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/connect-to-external-elastic-resources.md
-                title: Connect to external resources
-              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/elastic-stack-configuration-policies.md
-                title: Stack configuration policies
-            - group: Other Elastic applications
-              page: docs-content://deploy-manage/deploy/cloud-on-k8s/orchestrate-other-elastic-applications.md
-              children:
-              - group: APM Server
-                page: docs-content://deploy-manage/deploy/cloud-on-k8s/apm-server.md
-                children:
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
-                  title: Use an ECK-managed cluster
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/advanced-configuration.md
-                  title: Advanced configuration
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/connect-to-apm-server.md
-                  title: Connect to APM Server
-              - group: Standalone Elastic Agent
-                page: docs-content://deploy-manage/deploy/cloud-on-k8s/standalone-elastic-agent.md
-                children:
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md
-                  title: Quickstart
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md
-                  title: Configuration
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-examples-standalone.md
-                  title: Configuration examples
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-agent.md
-                  title: Agent on OpenShift
-              - group: Fleet-managed Elastic Agent
-                page: docs-content://deploy-manage/deploy/cloud-on-k8s/fleet-managed-elastic-agent.md
-                children:
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/quickstart-fleet.md
-                  title: Quickstart
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md
-                  title: Configuration
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-examples-fleet.md
-                  title: Configuration examples
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/known-limitations.md
-                  title: Known limitations
-              - group: Elastic Maps Server
-                page: docs-content://deploy-manage/deploy/cloud-on-k8s/elastic-maps-server.md
-                children:
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/deploy-elastic-maps-server.md
-                  title: Deploy Maps Server
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/map-data.md
-                  title: Map data
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/advanced-configuration-maps-server.md
-                  title: Advanced configuration
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/http-configuration.md
-                  title: HTTP configuration
-              - group: Beats
-                page: docs-content://deploy-manage/deploy/cloud-on-k8s/beats.md
-                children:
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md
-                  title: Quickstart
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-beats.md
-                  title: Configuration
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-examples-beats.md
-                  title: Configuration examples
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/troubleshooting-beats.md
-                  title: Troubleshooting
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/k8s-openshift-beats.md
-                  title: Beats on OpenShift
-              - group: Logstash
-                page: docs-content://deploy-manage/deploy/cloud-on-k8s/logstash.md
-                children:
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md
-                  title: Quickstart
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-logstash.md
-                  title: Configuration
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/securing-logstash-api.md
-                  title: Securing the API
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/logstash-plugins.md
-                  title: Plugins
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/configuration-examples-logstash.md
-                  title: Configuration examples
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/update-strategy-logstash.md
-                  title: Update strategy
-                - page: docs-content://deploy-manage/deploy/cloud-on-k8s/advanced-configuration-logstash.md
-                  title: Advanced configuration
-              - page: docs-content://deploy-manage/deploy/cloud-on-k8s/package-registry.md
-                title: Elastic Package Registry
-          - page: docs-content://deploy-manage/deploy/cloud-on-k8s/create-custom-images.md
-            title: Custom images
-          - page: docs-content://deploy-manage/deploy/cloud-on-k8s/tools-apis.md
-            title: Tools and APIs
-        - group: Self-managed clusters
-          children:
-          - page: docs-content://deploy-manage/deploy/self-managed/configure-elasticsearch.md  # BOTH PHASES
-            title: Configure Elasticsearch
-          - page: docs-content://deploy-manage/deploy/self-managed/configure-kibana.md
-            title: Configure Kibana
-          - page: docs-content://deploy-manage/deploy/self-managed/plugins.md
-            title: Manage plugins
-          - page: docs-content://deploy-manage/deploy/self-managed/access-kibana.md
-            title: Access Kibana
-          - page: docs-content://deploy-manage/deploy/self-managed/tools-apis.md
-            title: Tools and APIs
-        - label: ───
-        - group: Security and encryption
-          page: docs-content://deploy-manage/security.md
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/k8s.md
+                title: Kubernetes
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/hosts_vms.md
+                title: Hosts and VMs
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/docker.md
+                title: Docker
+            - group: Elastic Cloud Hosted
+              page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/index.md
+              children:
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/k8s.md
+                title: Kubernetes
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/hosts_vms.md
+                title: Hosts and VMs
+              - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/docker.md
+                title: Docker
+          - group: OpenTelemetry use cases
+            page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/index.md
+            children:
+            - group: Kubernetes observability
+              page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/index.md
+              children:
+              - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/prerequisites-compatibility.md
+                title: Prerequisites and compatibility
+              - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/components.md
+                title: Components description
+              - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/deployment.md
+                title: Deployment
+              - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/instrumenting-applications.md
+                title: Instrumenting Applications
+              - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/upgrade.md
+                title: Upgrade
+              - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/customization.md
+                title: Customization
+            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/llms/index.md
+              title: LLM observability
+          - group: Other Observability tutorials
+            page: docs-content://solutions/observability/get-started/other-tutorials/index.md
+            children:
+            - page: docs-content://solutions/observability/get-started/other-tutorials/tutorial-monitor-java-application.md
+              title: "Tutorial: Monitor a Java application"
+          - page: docs-content://solutions/observability/get-started/logs-essentials.md
+            title: Logs Essentials
+        - group: Applications and services
+          page: docs-content://solutions/observability/applications/index.md
           children:
-          - page: docs-content://deploy-manage/security/secure-hosting-environment.md
+          - group: Application performance monitoring (APM)
+            page: docs-content://solutions/observability/apm/index.md
             children:
-            - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation.md
-              title: "Elastic Cloud Enterprise"
+            - page: docs-content://solutions/observability/apm/get-started.md
+              title: Get started with traces and APM
+            - group: Application data types
+              page: docs-content://solutions/observability/apm/data-types.md
               children:
-              - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/manage-security-certificates.md
-              - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/allow-x509-certificates-signed-with-sha-1.md
-              - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/configure-tls-version.md
-              - page: docs-content://deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/migrate-ece-on-podman-hosts-to-selinux-enforce.md
-            - page: docs-content://deploy-manage/security/secure-your-eck-installation.md
-              title: "Elastic Cloud on Kubernetes"
-          - page: docs-content://deploy-manage/security/secure-your-cluster-deployment.md
-            children:
-            - page: docs-content://deploy-manage/security/self-setup.md
-              title: "Self-managed security setup"
-              children:
-              - page: docs-content://deploy-manage/security/self-auto-setup.md
-                title: "Automatic security setup"
-              - page: docs-content://deploy-manage/security/set-up-minimal-security.md
-                title: "Minimal security setup"
-              - page: docs-content://deploy-manage/security/set-up-basic-security.md
-                title: "Set up transport TLS"
-              - page: docs-content://deploy-manage/security/set-up-basic-security-plus-https.md
-                title: "Set up HTTPS"
-              - page: docs-content://deploy-manage/security/using-kibana-with-security.md
-            - page: docs-content://deploy-manage/security/secure-cluster-communications.md
-              title: "Manage TLS encryption"
-              children:
-              - page: docs-content://deploy-manage/security/self-tls.md
-                title: "Self-managed"
-                children:
-                - page: docs-content://deploy-manage/security/updating-certificates.md
-                  title: "Update TLS certificates"
+              - page: docs-content://solutions/observability/apm/spans.md
+                title: Spans
+              - group: Transactions
+                page: docs-content://solutions/observability/apm/transactions.md
+                children:
+                - page: docs-content://solutions/observability/apm/transaction-sampling.md
+                  title: Transaction sampling
+              - page: docs-content://solutions/observability/apm/traces.md
+                title: Traces
+              - page: docs-content://solutions/observability/apm/errors.md
+                title: Errors
+              - page: docs-content://solutions/observability/apm/metrics.md
+                title: Metrics
+              - page: docs-content://solutions/observability/apm/metadata.md
+                title: Metadata
+            - group: Collect application data
+              page: docs-content://solutions/observability/apm/ingest/index.md
+              children:
+              - group: OpenTelemetry
+                page: docs-content://solutions/observability/apm/opentelemetry/index.md
+                children:
+                - page: docs-content://solutions/observability/apm/opentelemetry/upstream-opentelemetry-collectors-language-sdks.md
+                  title: Contrib OpenTelemetry Collectors and language SDKs
+                - page: docs-content://solutions/observability/apm/opentelemetry/collect-metrics.md
+                  title: Collect metrics
+                - page: docs-content://solutions/observability/apm/opentelemetry/create-apm-agent-key-for-edot-sdks.md
+                  title: Create APM agent key for EDOT SDKs
+                - page: docs-content://solutions/observability/apm/opentelemetry/edot-sdks-central-configuration.md
+                  title: Centrally configure EDOT SDKs
+                - page: docs-content://solutions/observability/apm/opentelemetry/limitations.md
+                  title: Limitations
+                - page: docs-content://solutions/observability/apm/opentelemetry/attributes.md
+                  title: Attributes and labels
+                - page: docs-content://solutions/observability/apm/opentelemetry/data-stream-routing.md
+                  title: Data stream routing
+              - group: APM agents
+                page: docs-content://solutions/observability/apm/apm-agents/index.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-agents/central-configuration.md
+                  title: Centrally configure APM agents
+                - page: docs-content://solutions/observability/apm/apm-agents/real-user-monitoring-rum.md
+                  title: Real User Monitoring (RUM)
+                - page: docs-content://solutions/observability/apm/apm-agents/create-upload-source-maps-rum.md
+                  title: Create and upload source maps (RUM)
+              - page: docs-content://solutions/observability/apm/ingest/apm-k8s-attacher.md
+                title: Kubernetes
+              - page: docs-content://solutions/observability/apm/ingest/monitor-aws-lambda-functions.md
+                title: AWS Lambda Functions
+              - page: docs-content://solutions/observability/apm/ingest/jaeger.md
+                title: Jaeger (deprecated)
+            - group: View and analyze data
+              page: docs-content://solutions/observability/apm/view-analyze-data.md
+              children:
+              - group: Overviews
+                page: docs-content://solutions/observability/apm/overviews.md
+                children:
+                - page: docs-content://solutions/observability/apm/services.md
+                  title: Services
+                - page: docs-content://solutions/observability/apm/traces-ui.md
+                  title: Traces UI
+                - page: docs-content://solutions/observability/apm/dependencies.md
+                  title: Dependencies
+                - page: docs-content://solutions/observability/apm/service-map.md
+                  title: Service Map
+                - page: docs-content://solutions/observability/apm/service-overview.md
+                  title: Service overview
+                - page: docs-content://solutions/observability/apm/mobile-service-overview.md
+                  title: Mobile service overview
+              - group: Drill down into data
+                page: docs-content://solutions/observability/apm/drill-down-into-data.md
+                children:
+                - page: docs-content://solutions/observability/apm/transactions-ui.md
+                  title: Transactions UI
+                - page: docs-content://solutions/observability/apm/trace-sample-timeline.md
+                  title: Trace sample timeline
+                - page: docs-content://solutions/observability/apm/errors-ui.md
+                  title: Errors UI
+                - page: docs-content://solutions/observability/apm/metrics-ui.md
+                  title: Metrics UI
+                - page: docs-content://solutions/observability/apm/infrastructure.md
+                  title: Infrastructure
+                - page: docs-content://solutions/observability/apm/logs.md
+                  title: Logs
+              - page: docs-content://solutions/observability/apm/discover-traces.md
+                title: Discover traces
+              - group: Filter and search data
+                page: docs-content://solutions/observability/apm/filter-search-data.md
+                children:
+                - page: docs-content://solutions/observability/apm/filter-data.md
+                  title: Filters
+                - page: docs-content://solutions/observability/apm/advanced-queries.md
+                  title: Advanced queries
+                - page: docs-content://solutions/observability/apm/cross-cluster-search.md
+                  title: Cross-cluster search
+              - group: Interpret data
+                page: docs-content://solutions/observability/apm/interpret-data.md
+                children:
+                - page: docs-content://solutions/observability/apm/find-transaction-latency-failure-correlations.md
+                  title: Find transaction latency and failure correlations
+                - page: docs-content://solutions/observability/apm/track-deployments-with-annotations.md
+                  title: Track deployments with annotations
+                - page: docs-content://solutions/observability/apm/explore-mobile-sessions.md
+                  title: Explore mobile sessions with Discover
+                - page: docs-content://solutions/observability/apm/observe-lambda-functions.md
+                  title: Observe Lambda functions
+              - page: docs-content://solutions/observability/apm/machine-learning.md
+                title: Integrate with machine learning
+              - page: docs-content://solutions/observability/apm/apm-agent-explorer.md
+                title: APM Agent explorer
+              - page: docs-content://solutions/observability/apm/applications-ui-settings.md
+                title: Settings
+            - group: Act on data
+              page: docs-content://solutions/observability/apm/act-on-data.md
+              children:
+              - page: docs-content://solutions/observability/apm/create-apm-rules-alerts.md
+                title: Create rules and alerts
+              - page: docs-content://solutions/observability/apm/create-custom-links.md
+                title: Create custom links
+            - group: Use APM securely
+              page: docs-content://solutions/observability/apm/use-apm-securely.md
+              children:
+              - group: Secure data
+                page: docs-content://solutions/observability/apm/secure-data.md
+                children:
+                - page: docs-content://solutions/observability/apm/control-access-to-apm-data.md
+                  title: Control access to APM data
+                - page: docs-content://solutions/observability/apm/built-in-data-filters.md
+                  title: Built-in data filters
+                - page: docs-content://solutions/observability/apm/custom-filters.md
+                  title: Custom filters
+                - page: docs-content://solutions/observability/apm/delete-sensitive-data.md
+                  title: Delete sensitive data
+              - group: Secure communication with APM agents
+                page: docs-content://solutions/observability/apm/secure-communication-with-apm-agents.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-agent-tls-communication.md
+                  title: APM agent TLS communication
+                - page: docs-content://solutions/observability/apm/api-keys.md
+                  title: API keys
+                - page: docs-content://solutions/observability/apm/secret-token.md
+                  title: Secret token
+                - page: docs-content://solutions/observability/apm/anonymous-authentication.md
+                  title: Anonymous authentication
+              - group: Secure communication with the Elastic Stack
+                page: docs-content://solutions/observability/apm/secure-communication-with-elastic-stack.md
+                children:
+                - page: docs-content://solutions/observability/apm/create-assign-feature-roles-to-apm-server-users.md
+                  title: Use feature roles
+                - page: docs-content://solutions/observability/apm/grant-access-using-api-keys.md
+                  title: Grant access using API keys
+              - group: Secure access to the Applications UI
+                page: docs-content://solutions/observability/apm/secure-access-to-applications-ui.md
+                children:
+                - page: docs-content://solutions/observability/apm/ui-user-reader.md
+                  title: Create an APM reader user
+                - page: docs-content://solutions/observability/apm/ui-user-annotation.md
+                  title: Create an annotation user
+                - page: docs-content://solutions/observability/apm/ui-user-api.md
+                  title: Create an API user
+                - page: docs-content://solutions/observability/apm/ui-user-central-config.md
+                  title: Create a central config user
+                - page: docs-content://solutions/observability/apm/ui-user-storage-explorer.md
+                  title: Create a storage explorer user
+            - group: Manage storage
+              page: docs-content://solutions/observability/apm/manage-storage.md
+              children:
+              - page: docs-content://solutions/observability/apm/storage-explorer.md
+                title: Storage Explorer
+              - page: docs-content://solutions/observability/apm/data-streams.md
+                title: Data streams
+              - page: docs-content://solutions/observability/apm/index-lifecycle-management.md
+                title: Index lifecycle management
+              - page: docs-content://solutions/observability/apm/view-elasticsearch-index-template.md
+                title: View the Elasticsearch index template
+              - page: docs-content://solutions/observability/apm/parse-data-using-ingest-pipelines.md
+                title: Parse data using ingest pipelines
+              - page: docs-content://solutions/observability/apm/storage-sizing-guide.md
+                title: Storage and sizing guide
+              - page: docs-content://solutions/observability/apm/reduce-storage.md
+                title: Reduce storage
+              - page: docs-content://solutions/observability/apm/explore-data-in-elasticsearch.md
+                title: Explore data in Elasticsearch
+            - group: "Work with APM Server"
+              page: docs-content://solutions/observability/apm/apm-server/index.md
+              children:
+              - group: Set up
+                page: docs-content://solutions/observability/apm/apm-server/setup.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-server/fleet-managed.md
+                  title: Fleet-managed APM Server
+                - page: docs-content://solutions/observability/apm/apm-server/binary.md
+                  title: APM Server binary
+              - group: Configure
+                page: docs-content://solutions/observability/apm/apm-server/configure.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-server/general-configuration-options.md
+                  title: General configuration options
+                - page: docs-content://solutions/observability/apm/apm-server/configure-anonymous-authentication.md
+                  title: Anonymous authentication
+                - page: docs-content://solutions/observability/apm/apm-server/apm-agent-authorization.md
+                  title: APM agent authorization
+                - page: docs-content://solutions/observability/apm/apm-server/apm-agent-central-configuration.md
+                  title: Configure APM Agent Central Configuration
+                - page: docs-content://solutions/observability/apm/apm-server/configure-apm-instrumentation.md
+                  title: Instrumentation
+                - page: docs-content://solutions/observability/apm/apm-server/configure-kibana-endpoint.md
+                  title: Kibana endpoint
+                - page: docs-content://solutions/observability/apm/apm-server/configure-logging.md
+                  title: Logging
+                - group: Output
+                  page: docs-content://solutions/observability/apm/apm-server/configure-output.md
                   children:
-                  - page: docs-content://deploy-manage/security/same-ca.md
-                    title: "With the same CA"
-                  - page: docs-content://deploy-manage/security/different-ca.md
-                    title: "With a different CA"
-                - page: docs-content://deploy-manage/security/kibana-es-mutual-tls.md
-                  title: "Mutual authentication"
-                - page: docs-content://deploy-manage/security/supported-ssltls-versions-by-jdk-version.md
-                - page: docs-content://deploy-manage/security/enabling-cipher-suites-for-stronger-encryption.md
-              - page: docs-content://deploy-manage/security/eck-tls.md
-                title: "ECK"
-                children:
-                - page: docs-content://deploy-manage/security/k8s-https-settings.md
-                - page: docs-content://deploy-manage/security/k8s-transport-settings.md
-              - page: docs-content://deploy-manage/security/external-ca-transport.md
-                title: "External CA for TLS"
-            - page: docs-content://deploy-manage/security/network-security.md
-              title: "Network security"
-              children:
-              - page: docs-content://deploy-manage/security/network-security-policies.md
-                title: "How network security policies work in Cloud"
-              - page: docs-content://deploy-manage/security/ece-filter-rules.md
-                title: "How IP filtering rules work in ECE"
-              - page: docs-content://deploy-manage/security/ip-filtering.md
-                title: "Add IP filters"
-                children:
-                - page: docs-content://deploy-manage/security/ip-filtering-cloud.md
-                  title: "In ECH or Serverless"
-                - page: docs-content://deploy-manage/security/ip-filtering-ece.md
-                  title: "In ECE"
-                - page: docs-content://deploy-manage/security/ip-filtering-basic.md
-                  title: "In ECK and Self Managed"
-              - page: docs-content://deploy-manage/security/remote-cluster-filtering.md
-                title: "Remote cluster filters"
-              - page: docs-content://deploy-manage/security/private-connectivity.md
-                children:
-                - page: docs-content://deploy-manage/security/private-connectivity-aws.md
-                  title: "AWS PrivateLink"
-                - page: docs-content://deploy-manage/security/private-connectivity-azure.md
-                  title: "Azure Private Link"
-                - page: docs-content://deploy-manage/security/private-connectivity-gcp.md
-                  title: "GCP Private Service Connect"
-                - page: docs-content://deploy-manage/security/claim-private-connection-api.md
-              - page: docs-content://deploy-manage/security/network-security-api.md
-                title: "Through the API"
-              - page: docs-content://deploy-manage/security/k8s-network-policies.md
-            - page: docs-content://deploy-manage/security/elastic-cloud-static-ips.md
-            - page: docs-content://deploy-manage/security/kibana-session-management.md
-            - page: docs-content://deploy-manage/security/data-security.md
-              children:
-              - page: docs-content://deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md
-            - page: docs-content://deploy-manage/security/secure-settings.md
-              children:
-              - page: docs-content://deploy-manage/security/k8s-secure-settings.md
-            - page: docs-content://deploy-manage/security/secure-saved-objects.md
-            - page: docs-content://deploy-manage/security/logging-configuration/security-event-audit-logging.md
-              children:
-              - page: docs-content://deploy-manage/security/logging-configuration/enabling-audit-logs.md
-              - page: docs-content://deploy-manage/security/logging-configuration/configuring-audit-logs.md
-                children:
-                - page: docs-content://deploy-manage/security/logging-configuration/logfile-audit-events-ignore-policies.md
-                  title: "Elasticsearch audit events ignore policies"
-                - page: docs-content://deploy-manage/security/logging-configuration/logfile-audit-output.md
-                  title: "Elasticsearch logfile output"
-              - page: docs-content://deploy-manage/security/logging-configuration/auditing-search-queries.md
-              - page: docs-content://deploy-manage/security/logging-configuration/correlating-kibana-elasticsearch-audit-logs.md
-                title: "Correlate audit events"
-          - page: docs-content://deploy-manage/security/secure-clients-integrations.md
-          - page: docs-content://deploy-manage/security/httprest-clients-security.md
-          - page: docs-content://deploy-manage/security/limitations.md
-            title: "Limitations"
-          - page: docs-content://deploy-manage/security/fips.md
-            children:
-            - page: docs-content://deploy-manage/security/fips-es.md
-            - page: docs-content://deploy-manage/security/fips-kib.md
-            - page: docs-content://deploy-manage/security/fips-ingest.md
-        - group: Authentication and authorization
-          page: docs-content://deploy-manage/users-roles.md
-          children:
-          - page: docs-content://deploy-manage/users-roles/cloud-organization.md
-            title: "Cloud organization"
-            children:
-            - page: docs-content://deploy-manage/users-roles/cloud-organization/manage-users.md
-            - page: docs-content://deploy-manage/users-roles/cloud-organization/user-roles.md
-            - page: docs-content://deploy-manage/users-roles/cloud-organization/configure-saml-authentication.md
-              title: "Configure SAML SSO"
-              children:
-              - page: docs-content://deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-okta.md
-                title: "Okta"
-              - page: docs-content://deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-microsoft-entra-id.md
-                title: "Microsoft Entra ID"
-          - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator.md
-            title: "ECE orchestrator"
-            children:
-            - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-system-passwords.md
-            - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-users-roles.md
-              children:
-              - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/native-user-authentication.md
-              - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/active-directory.md
-              - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/ldap.md
-              - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/saml.md
-            - page: docs-content://deploy-manage/users-roles/cloud-enterprise-orchestrator/configure-sso-for-deployments.md
-          - page: docs-content://deploy-manage/users-roles/serverless-custom-roles.md
-          - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth.md
-            title: "Cluster or deployment"
-            children:
-            - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/quickstart.md
-              title: "Quickstart"
-            - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/user-authentication.md
-              children:
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/authentication-realms.md
-                children:
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/realm-chains.md
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/security-domains.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/internal-authentication.md
-                children:
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/native.md
-                  title: "Native"
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/file-based.md
-                  title: "File-based"
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/external-authentication.md
-                children:
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/active-directory.md
-                  title: "Active Directory"
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/jwt.md
-                  title: "JWT"
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md
-                  title: "Kerberos"
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/ldap.md
-                  title: "LDAP"
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/openid-connect.md
-                  title: "OpenID Connect"
+                  - page: docs-content://solutions/observability/apm/apm-server/configure-output-for-elasticsearch-service-on-elastic-cloud.md
+                    title: Elastic Cloud Hosted
+                  - page: docs-content://solutions/observability/apm/apm-server/configure-elasticsearch-output.md
+                    title: Elasticsearch
+                  - page: docs-content://solutions/observability/apm/apm-server/configure-logstash-output.md
+                    title: "Logstash"
+                  - page: docs-content://solutions/observability/apm/apm-server/configure-kafka-output.md
+                    title: Kafka
+                  - page: docs-content://solutions/observability/apm/apm-server/configure-redis-output.md
+                    title: Redis
+                  - page: docs-content://solutions/observability/apm/apm-server/configure-console-output.md
+                    title: Console
+                - page: docs-content://solutions/observability/apm/apm-server/configure-project-paths.md
+                  title: Project paths
+                - page: docs-content://solutions/observability/apm/apm-server/configure-real-user-monitoring-rum.md
+                  title: Real User Monitoring (RUM)
+                - group: SSL/TLS settings
+                  page: docs-content://solutions/observability/apm/apm-server/ssl-tls-settings.md
                   children:
-                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/oidc-examples.md
-                    title: "With Azure, Google, or Okta"
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/saml.md
-                  title: "SAML"
+                  - page: docs-content://solutions/observability/apm/apm-server/ssl-tls-output-settings.md
+                    title: SSL/TLS output settings
+                  - page: docs-content://solutions/observability/apm/apm-server/ssl-tls-input-settings.md
+                    title: SSL/TLS input settings
+                - page: docs-content://solutions/observability/apm/apm-server/tail-based-sampling.md
+                  title: Tail-based sampling
+                - page: docs-content://solutions/observability/apm/apm-server/use-environment-variables-in-configuration.md
+                  title: Use environment variables in the configuration
+                - group: Advanced setup
+                  page: docs-content://solutions/observability/apm/apm-server/advanced-setup.md
                   children:
-                  - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/saml-entra.md
-                    title: "With Microsoft Entra ID"
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/pki.md
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/custom.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/built-in-users.md
-                title: "Built-in users"
-                children:
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/built-in-sm.md
-                  title: "Change passwords"
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/orchestrator-managed-users-overview.md
-                title: "Orchestrator-managed users"
-                children:
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/manage-elastic-user-cloud.md
-                  title: "ECH and ECE"
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/managed-credentials-eck.md
-                  title: "ECK managed credentials"
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kibana-authentication.md
-                title: "Kibana authentication"
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/access-agreement.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/anonymous-access.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/token-based-authentication-services.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/service-accounts.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/internal-users.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges.md
-                children:
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/configure-operator-privileges.md
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/operator-only-functionality.md
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges-for-snapshot-restore.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/user-profiles.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/looking-up-users-without-authentication.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/controlling-user-cache.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/manage-authentication-for-multiple-clusters.md
-            - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/user-roles.md
-              children:
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/defining-roles.md
-                children:
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/role-structure.md
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/granting-privileges-for-data-streams-aliases.md
-                  title: "For data streams and aliases"
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kibana-role-management.md
-                  title: "Using Kibana"
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/role-restriction.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/kibana-privileges.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/mapping-users-groups-to-roles.md
-                title: "Map users and groups to roles"
-                children:
-                - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/role-mapping-resources.md
-                  title: "Role mapping properties"
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/authorization-delegation.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/authorization-plugins.md
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/controlling-access-at-document-field-level.md
-                title: "Control access at the document and field level"
-              - page: docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/submitting-requests-on-behalf-of-other-users.md
-                title: "Submit requests on behalf of other users"
-        - group: API keys
-          page: docs-content://deploy-manage/api-keys.md
-          children:
-          - page: docs-content://deploy-manage/api-keys/elasticsearch-api-keys.md
-          - page: docs-content://deploy-manage/api-keys/serverless-project-api-keys.md
-          - page: docs-content://deploy-manage/api-keys/elastic-cloud-api-keys.md
-          - page: docs-content://deploy-manage/api-keys/elastic-cloud-enterprise-api-keys.md
-        - group: Spaces
-          page: docs-content://deploy-manage/manage-spaces.md
-        - group: Monitoring
-          page: docs-content://deploy-manage/monitor.md
-          children:
-          - page: docs-content://deploy-manage/monitor/autoops.md
-            children:
-            - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-how-to-access.md
-              title: "For Elastic Cloud Hosted"
-            - page: docs-content://deploy-manage/monitor/autoops/autoops-for-serverless.md
-              title: "For Elastic Cloud Serverless"
-              children:
-              - page: docs-content://deploy-manage/monitor/autoops/access-autoops-for-serverless.md
-                title: "Access AutoOps in your project"
-              - page: docs-content://deploy-manage/monitor/autoops/search-tier-view-autoops-serverless.md
-                title: "Search Tier view"
-              - page: docs-content://deploy-manage/monitor/autoops/indexing-tier-view-autoops-serverless.md
-                title: "Indexing Tier view"
-              - page: docs-content://deploy-manage/monitor/autoops/search-ai-lake-view-autoops-serverless.md
-                title: "Search AI Lake view"
-            - page: docs-content://deploy-manage/monitor/autoops/cc-autoops-as-cloud-connected.md
-              title: "For ECE, ECK, and self-managed clusters"
-              children:
-              - page: docs-content://deploy-manage/monitor/autoops/cc-connect-self-managed-to-autoops.md
-                title: "Connect your cluster"
-              - page: docs-content://deploy-manage/monitor/autoops/cc-connect-local-dev-to-autoops.md
-                title: "Connect your local development cluster"
-              - page: docs-content://deploy-manage/monitor/autoops/autoops-sm-custom-certification.md
-                title: "Configure Elastic agent with custom certificate"
-              - page: docs-content://deploy-manage/monitor/autoops/autoops-disable-metrics-collection.md
-                title: "Disable certain types of data collection"
-              - page: docs-content://deploy-manage/monitor/autoops/cc-manage-users.md
-                title: "Manage connected cluster users"
-              - page: docs-content://deploy-manage/monitor/autoops/cc-cloud-connect-autoops-troubleshooting.md
-                title: "Troubleshooting"
-                children:
-                - page: docs-content://deploy-manage/monitor/autoops/autoops-connectivity-check.md
-                  title: "Run the Connectivity Check"
-                - page: docs-content://deploy-manage/monitor/autoops/autoops-sm-troubleshoot-firewalls.md
-                  title: "Firewalls blocking Elastic Agent"
-                - page: docs-content://deploy-manage/monitor/autoops/autoops-sm-troubleshoot-eck-no-clusters.md
-                  title: "Connected clusters not appearing with ECK"
-            - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-regions.md
-              title: "Regions"
-            - page: docs-content://deploy-manage/monitor/autoops/views.md
-              title: "Views"
-              children:
-              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-overview-view.md
-                title: "Overview"
-              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-deployment-view.md
-                title: "Deployment or Cluster"
-              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-nodes-view.md
-                title: "Nodes"
-              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-index-view.md
-                title: "Indices"
-              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-shards-view.md
-                title: "Shards"
-              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-template-optimizer.md
-                title: "Template Optimizer"
-            - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-events.md
-              title: "Events"
-              children:
-              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-event-settings.md
-              - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-notifications-settings.md
-            - page: docs-content://deploy-manage/monitor/autoops/ec-autoops-faq.md
-              title: "FAQ"
-          - page: docs-content://deploy-manage/monitor/stack-monitoring.md
-            children:
-            - page: docs-content://deploy-manage/monitor/stack-monitoring/ece-ech-stack-monitoring.md
-              title: "Enable on ECH and ECE"
-            - page: docs-content://deploy-manage/monitor/stack-monitoring/eck-stack-monitoring.md
-              title: "Enable on ECK"
-            - page: docs-content://deploy-manage/monitor/stack-monitoring/elasticsearch-monitoring-self-managed.md
-              title: "Self-managed: Elasticsearch"
-              children:
-              - page: docs-content://deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-elastic-agent.md
-                title: "Collecting monitoring data with Elastic Agent"
-              - page: docs-content://deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-metricbeat.md
-                title: "Collecting monitoring data with Metricbeat"
-              - page: docs-content://deploy-manage/monitor/stack-monitoring/collecting-log-data-with-filebeat.md
-                title: "Collecting log data with Filebeat"
-              - page: docs-content://deploy-manage/monitor/stack-monitoring/es-self-monitoring-prod.md
-              - page: docs-content://deploy-manage/monitor/stack-monitoring/es-legacy-collection-methods.md
-                title: "Legacy collection methods"
-                children:
-                - page: docs-content://deploy-manage/monitor/stack-monitoring/es-monitoring-collectors.md
-                - page: docs-content://deploy-manage/monitor/stack-monitoring/es-monitoring-exporters.md
-                - page: docs-content://deploy-manage/monitor/stack-monitoring/es-local-exporter.md
-                - page: docs-content://deploy-manage/monitor/stack-monitoring/es-http-exporter.md
-                - page: docs-content://deploy-manage/monitor/stack-monitoring/es-pause-export.md
-            - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-self-managed.md
-              title: "Self-managed: Kibana"
-              children:
-              - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-elastic-agent.md
-                title: "Collect monitoring data with Elastic Agent"
-              - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-metricbeat.md
-                title: "Collect monitoring data with Metricbeat"
-              - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-legacy.md
-                title: "Legacy collection methods"
-            - page: docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
-            - page: docs-content://deploy-manage/monitor/monitoring-data/visualizing-monitoring-data.md
-              children:
-              - page: docs-content://deploy-manage/monitor/monitoring-data/beats-page.md
-              - page: docs-content://deploy-manage/monitor/monitoring-data/elasticsearch-metrics.md
-              - page: docs-content://deploy-manage/monitor/monitoring-data/kibana-page.md
-              - page: docs-content://deploy-manage/monitor/monitoring-data/integrations-server-page.md
-              - page: docs-content://deploy-manage/monitor/monitoring-data/logstash-page.md
-              - page: docs-content://deploy-manage/monitor/monitoring-data/monitor-troubleshooting.md
-                title: "Troubleshooting"
-            - page: docs-content://deploy-manage/monitor/monitoring-data/configure-stack-monitoring-alerts.md
-            - page: docs-content://deploy-manage/monitor/monitoring-data/configuring-data-streamsindices-for-monitoring.md
-              children:
-              - page: docs-content://deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-elastic-agent.md
-              - page: docs-content://deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-metricbeat-8.md
-              - page: docs-content://deploy-manage/monitor/monitoring-data/config-monitoring-indices-metricbeat-7-internal-collection.md
-          - page: docs-content://deploy-manage/monitor/autoops-vs-stack-monitoring.md
-            title: "AutoOps vs. Stack Monitoring"
-          - page: docs-content://deploy-manage/monitor/cloud-health-perf.md
-            title: "Cloud deployment health"
-            children:
-            - page: docs-content://deploy-manage/monitor/access-performance-metrics-on-elastic-cloud.md
-            - page: docs-content://deploy-manage/monitor/ec-memory-pressure.md
-          - page: docs-content://deploy-manage/monitor/kibana-task-manager-health-monitoring.md
-            title: "Kibana task manager monitoring"
-          - page: docs-content://deploy-manage/monitor/orchestrators.md
-            children:
-            - page: docs-content://deploy-manage/monitor/orchestrators/eck-metrics-configuration.md
-              children:
-              - page: docs-content://deploy-manage/monitor/orchestrators/k8s-enabling-metrics-endpoint.md
-              - page: docs-content://deploy-manage/monitor/orchestrators/k8s-securing-metrics-endpoint.md
-              - page: docs-content://deploy-manage/monitor/orchestrators/k8s-prometheus-requirements.md
-            - page: docs-content://deploy-manage/monitor/orchestrators/ece-platform-monitoring.md
-              children:
-              - page: docs-content://deploy-manage/monitor/orchestrators/ece-monitoring-ece-access.md
-              - page: docs-content://deploy-manage/monitor/orchestrators/ece-proxy-log-fields.md
-              - page: docs-content://deploy-manage/monitor/orchestrators/ece-monitoring-ece-set-retention.md
-          - page: docs-content://deploy-manage/monitor/logging-configuration.md
-            children:
-            - page: docs-content://deploy-manage/monitor/logging-configuration/elasticsearch-log4j-configuration-self-managed.md
-            - page: docs-content://deploy-manage/monitor/logging-configuration/update-elasticsearch-logging-levels.md
-            - page: docs-content://deploy-manage/monitor/logging-configuration/elasticsearch-deprecation-logs.md
-            - page: docs-content://deploy-manage/monitor/logging-configuration/slow-logs.md
-            - page: docs-content://deploy-manage/monitor/logging-configuration/kibana-logging.md
-              children:
-              - page: docs-content://deploy-manage/monitor/logging-configuration/kibana-log-levels.md
-              - page: docs-content://deploy-manage/monitor/logging-configuration/kib-advanced-logging.md
-                children:
-                - page: docs-content://deploy-manage/monitor/logging-configuration/kibana-log-settings-examples.md
-                  title: "Examples"
-        - page: docs-content://deploy-manage/kibana-reporting-configuration.md
-          title: Configure Kibana reporting
-        - group: Backup, high availability, and resilience tools
-          page: docs-content://deploy-manage/tools.md
-          children:
-          - page: docs-content://deploy-manage/tools/snapshot-and-restore.md
-            children:
-            - page: docs-content://deploy-manage/tools/snapshot-and-restore/manage-snapshot-repositories.md
-              children:
-              - page: docs-content://deploy-manage/tools/snapshot-and-restore/self-managed.md
-                title: "Self-managed"
-                children:
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/azure-repository.md
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/google-cloud-storage-repository.md
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/s3-repository.md
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/shared-file-system-repository.md
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/read-only-url-repository.md
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/source-only-repository.md
-              - page: docs-content://deploy-manage/tools/snapshot-and-restore/elastic-cloud-hosted.md
-                title: "Elastic Cloud Hosted"
-                children:
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md
-                  title: "AWS S3"
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ec-gcs-snapshotting.md
-                  title: "Google Cloud Storage"
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ec-azure-snapshotting.md
-                  title: "Azure Blob Storage"
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/access-isolation-for-found-snapshots-repository.md
+                  - page: docs-content://solutions/observability/apm/apm-server/installation-layout.md
+                    title: Installation layout
+                  - page: docs-content://solutions/observability/apm/apm-server/secrets-keystore-for-secure-settings.md
+                    title: Secrets keystore
+                  - page: docs-content://solutions/observability/apm/apm-server/command-reference.md
+                    title: Command reference
+                  - page: docs-content://solutions/observability/apm/apm-server/tune-data-ingestion.md
+                    title: Tune data ingestion
+                  - page: docs-content://solutions/observability/apm/apm-server/high-availability.md
+                    title: High Availability
+                  - page: docs-content://solutions/observability/apm/apm-server/systemd.md
+                    title: APM Server and systemd
+              - group: Monitor
+                page: docs-content://solutions/observability/apm/apm-server/monitor.md
+                children:
+                - page: docs-content://solutions/observability/apm/apm-server/monitor-fleet-managed.md
+                  title: Fleet-managed
+                - group: APM Server binary
+                  page: docs-content://solutions/observability/apm/apm-server/monitor-binary.md
                   children:
-                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/repository-isolation-on-azure.md
-                    title: "Azure"
-                  - page: docs-content://deploy-manage/tools/snapshot-and-restore/repository-isolation-on-aws-gcp.md
-                    title: "AWS and GCP"
-              - page: docs-content://deploy-manage/tools/snapshot-and-restore/cloud-enterprise.md
-                title: "Elastic Cloud Enterprise"
+                  - page: docs-content://solutions/observability/apm/apm-server/use-internal-collection-to-send-monitoring-data.md
+                    title: Use internal collection
+                  - page: docs-content://solutions/observability/apm/apm-server/use-metricbeat-to-send-monitoring-data.md
+                    title: "Use Metricbeat collection"
+                  - page: docs-content://solutions/observability/apm/apm-server/use-select-metrics-emitted-directly-to-monitoring-cluster.md
+                    title: Use local collection
+            - group: APM APIs
+              page: docs-content://solutions/observability/apm/apis.md
+              children:
+              - page: docs-content://solutions/observability/apm/apm-ui-api.md
+                title: APM UI API
+              - group: "APM Server API"
+                page: docs-content://solutions/observability/apm/apm-server/api.md
                 children:
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md
-                  title: "AWS S3"
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/google-cloud-storage-gcs-repository.md
-                  title: "Google Cloud Storage"
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/azure-storage-repository.md
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/minio-on-premise-repository.md
-              - page: docs-content://deploy-manage/tools/snapshot-and-restore/cloud-on-k8s.md
-                title: "Elastic Cloud on Kubernetes"
-            - page: docs-content://deploy-manage/tools/snapshot-and-restore/create-snapshots.md
-            - page: docs-content://deploy-manage/tools/snapshot-and-restore/restore-snapshot.md
-              children:
-              - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-across-clusters.md
-                children:
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-new-deployment.md
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-existing-deployment.md
-                - page: docs-content://deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-containing-searchable-snapshots-indices-across-clusters.md
-            - page: docs-content://deploy-manage/tools/snapshot-and-restore/searchable-snapshots.md
-          - page: docs-content://deploy-manage/tools/cross-cluster-replication.md
-            children:
-            - page: docs-content://deploy-manage/tools/cross-cluster-replication/set-up-cross-cluster-replication.md
-              title: "Set up cross-cluster replication"
-              children:
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-getting-started-prerequisites.md
-                title: "Prerequisites"
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_connect_to_a_remote_cluster.md
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_configure_privileges_for_cross_cluster_replication_2.md
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-getting-started-follower-index.md
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-getting-started-auto-follow.md
-            - page: docs-content://deploy-manage/tools/cross-cluster-replication/manage-cross-cluster-replication.md
-              children:
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-inspect-progress.md
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-pause-replication.md
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-recreate-follower-index.md
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-terminate-replication.md
-            - page: docs-content://deploy-manage/tools/cross-cluster-replication/manage-auto-follow-patterns.md
-              children:
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-create.md
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-retrieve.md
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-pause.md
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-delete.md
-            - page: docs-content://deploy-manage/tools/cross-cluster-replication/upgrading-clusters.md
-              title: "Upgrading clusters"
-              children:
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-uni-directional-upgrade.md
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-bi-directional-upgrade.md
-            - page: docs-content://deploy-manage/tools/cross-cluster-replication/uni-directional-disaster-recovery.md
-              title: "Uni-directional disaster recovery"
-              children:
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_prerequisites_14.md
-                title: "Prerequisites"
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down.md
-                title: "Failover when clusterA is down"
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back.md
-                title: "Failback when clusterA comes back"
-            - page: docs-content://deploy-manage/tools/cross-cluster-replication/bi-directional-disaster-recovery.md
-              title: "Bi-directional disaster recovery"
-              children:
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/ccr-tutorial-initial-setup.md
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down_2.md
-                title: "Failover when clusterA is down"
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back_2.md
-                title: "Failback when clusterA comes back"
-              - page: docs-content://deploy-manage/tools/cross-cluster-replication/_perform_update_or_delete_by_query.md
-        - group: Autoscaling
-          page: docs-content://deploy-manage/autoscaling.md
-          children:
-          - page: docs-content://deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md
-            title: "In ECE and ECH"
-          - page: docs-content://deploy-manage/autoscaling/autoscaling-in-eck.md
-            title: "In ECK"
-          - page: docs-content://deploy-manage/autoscaling/autoscaling-deciders.md
-          - page: docs-content://deploy-manage/autoscaling/trained-model-autoscaling.md
-        - page: docs-content://deploy-manage/stack-settings.md
-          title: Stack settings
-        - page: docs-content://deploy-manage/manage-connectors.md
-          title: Connectors
-        - group: Remote clusters
-          page: docs-content://deploy-manage/remote-clusters.md
-          children:
-          - page: docs-content://deploy-manage/remote-clusters/security-models.md
-            title: "Security models"
-          - page: docs-content://deploy-manage/remote-clusters/connection-modes.md
-            title: "Connection modes"
-          - page: docs-content://deploy-manage/remote-clusters/ec-enable-ccs.md
-            title: "On Elastic Cloud Hosted"
-            children:
-            - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-same-ess.md
-              title: "To the same Elastic Cloud organization"
-            - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-other-ess.md
-              title: "To a different Elastic Cloud organization"
-            - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-ece.md
-              title: "To Elastic Cloud Enterprise"
-            - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-self-managed.md
-              title: "To a self-managed cluster"
-            - page: docs-content://deploy-manage/remote-clusters/ec-enable-ccs-for-eck.md
-              title: "To Elastic Cloud on Kubernetes"
-            - page: docs-content://deploy-manage/remote-clusters/ec-remote-cluster-strong-identity.md
-              title: "Strong identity verification"
-            - page: docs-content://deploy-manage/remote-clusters/ec-edit-remove-trusted-environment.md
-              title: "Manage trusted environments"
-            - page: docs-content://deploy-manage/remote-clusters/ec-migrate-ccs.md
-              title: "Migrate from the CCS deployment template"
-          - page: docs-content://deploy-manage/remote-clusters/ece-enable-ccs.md
-            title: "On Elastic Cloud Enterprise"
-            children:
-            - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-same-ece.md
-              title: "To the same ECE environment"
-            - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-other-ece.md
-              title: "To a different ECE environment"
-            - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-ece-ess.md
-              title: "To Elastic Cloud"
-            - page: docs-content://deploy-manage/remote-clusters/ece-remote-cluster-self-managed.md
-              title: "To a self-managed cluster"
-            - page: docs-content://deploy-manage/remote-clusters/ece-enable-ccs-for-eck.md
-              title: "To Elastic Cloud on Kubernetes"
-            - page: docs-content://deploy-manage/remote-clusters/ece-edit-remove-trusted-environment.md
-              title: "Manage trusted environments"
-            - page: docs-content://deploy-manage/remote-clusters/ece-migrate-ccs.md
-              title: "Migrate from the CCS deployment template"
-          - page: docs-content://deploy-manage/remote-clusters/remote-clusters-self-managed.md
-            title: "On self-managed Elastic Stack"
-            children:
-            - page: docs-content://deploy-manage/remote-clusters/remote-clusters-api-key.md
-            - page: docs-content://deploy-manage/remote-clusters/remote-clusters-cert.md
-            - page: docs-content://deploy-manage/remote-clusters/self-remote-cluster-eck.md
-              title: "To Elastic Cloud on Kubernetes"
-            - page: docs-content://deploy-manage/remote-clusters/remote-clusters-migrate.md
-              title: "Migrate from certificate to API key authentication"
-          - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-landing.md
-            title: "On Elastic Cloud on Kubernetes"
-            children:
-            - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters.md
-              title: "To the same ECK environment"
-            - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-to-other-eck.md
-              title: "To a different ECK environment"
-            - page: docs-content://deploy-manage/remote-clusters/eck-remote-clusters-to-external.md
-              title: "To an external cluster or deployment"
-        - group: Cross-project search
-          page: docs-content://deploy-manage/cross-project-search-config.md
-          children:
-          - page: docs-content://deploy-manage/cross-project-search-config/cps-config-link-and-manage.md
-            title: Link and manage projects
-          - page: docs-content://deploy-manage/cross-project-search-config/cps-config-access-and-scope.md
-            title: Access and scope
-        - page: docs-content://deploy-manage/cloud-connect.md
-          title: Cloud Connect
-        - label: ───
-        - group: Maintenance
-          page: docs-content://deploy-manage/maintenance.md
-          children:
-          - page: docs-content://deploy-manage/maintenance/ece.md
-            children:
-            - page: docs-content://deploy-manage/maintenance/ece/deployments-maintenance.md
-              children:
-              - page: docs-content://deploy-manage/maintenance/ece/pause-instance.md
-            - page: docs-content://deploy-manage/maintenance/ece/maintenance-activities.md
-              children:
-              - page: docs-content://deploy-manage/maintenance/ece/enable-maintenance-mode.md
-              - page: docs-content://deploy-manage/maintenance/ece/scale-out-installation.md
-              - page: docs-content://deploy-manage/maintenance/ece/move-nodes-instances-from-allocators.md
-              - page: docs-content://deploy-manage/maintenance/ece/perform-ece-hosts-maintenance.md
-              - page: docs-content://deploy-manage/maintenance/ece/delete-ece-hosts.md
-          - page: docs-content://deploy-manage/maintenance/start-stop-services.md
-            children:
-            - page: docs-content://deploy-manage/maintenance/start-stop-services/start-stop-elasticsearch.md
-            - page: docs-content://deploy-manage/maintenance/start-stop-services/start-stop-kibana.md
-            - page: docs-content://deploy-manage/maintenance/start-stop-services/restart-cloud-hosted-deployment.md
-            - page: docs-content://deploy-manage/maintenance/start-stop-services/restart-an-ece-deployment.md
-            - page: docs-content://deploy-manage/maintenance/start-stop-services/full-cluster-restart-rolling-restart-procedures.md
-          - page: docs-content://deploy-manage/maintenance/start-stop-routing-requests.md
-          - page: docs-content://deploy-manage/maintenance/add-and-remove-elasticsearch-nodes.md
-        - group: Upgrade
-          page: docs-content://deploy-manage/upgrade.md
-          children:
-          - page: docs-content://deploy-manage/upgrade/plan-upgrade.md
-          - page: docs-content://deploy-manage/upgrade/prepare-to-upgrade.md
-            title: "Preparation steps"
-            children:
-            - page: docs-content://deploy-manage/upgrade/prepare-to-upgrade/upgrade-assistant.md
-          - page: docs-content://deploy-manage/upgrade/deployment-or-cluster.md
-            children:
-            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-717.md
-            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ech.md
-              title: "Upgrade on Elastic Cloud Hosted"
-            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ece.md
-              title: "Upgrade on Elastic Cloud Enterprise"
-            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-on-eck.md
-              title: "Upgrade on Elastic Cloud on Kubernetes"
-            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/self-managed.md
-              title: "Upgrade Elastic on a self-managed cluster"
-              children:
-              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/elasticsearch.md
-              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/upgrade-elasticsearch-docker.md
-                title: "Upgrade Elasticsearch running on Docker"
-              - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/kibana.md
-                children:
-                - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/saved-object-migrations.md
-                - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/kibana-roll-back.md
-                  title: "Roll back to a previous version"
-            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/archived-settings.md
-              title: "Archived settings"
-            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/reading-indices-from-older-elasticsearch-versions.md
-              title: "Reading indices from older versions"
-            - page: docs-content://deploy-manage/upgrade/deployment-or-cluster/enterprise-search.md
-          - page: docs-content://deploy-manage/upgrade/ingest-components.md
-          - page: docs-content://deploy-manage/upgrade/orchestrator.md
-            title: "Upgrade your ECE or ECK orchestrator"
-            children:
-            - page: docs-content://deploy-manage/upgrade/orchestrator/upgrade-cloud-enterprise.md
-              children:
-              - page: docs-content://deploy-manage/upgrade/orchestrator/re-running-the-ece-upgrade.md
-            - page: docs-content://deploy-manage/upgrade/orchestrator/upgrade-cloud-on-k8s.md
-        - group: Uninstall
-          page: docs-content://deploy-manage/uninstall.md
-          children:
-          - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md
-          - page: docs-content://deploy-manage/uninstall/uninstall-elastic-cloud-on-kubernetes.md
-          - page: docs-content://deploy-manage/uninstall/delete-a-cloud-deployment.md
-            title: "Delete an orchestrated deployment"
-        - group: Licenses and subscriptions
-          page: docs-content://deploy-manage/license.md
-          children:
-          - page: docs-content://deploy-manage/license/manage-your-license-in-ece.md
-            title: "Elastic Cloud Enterprise"
-          - page: docs-content://deploy-manage/license/manage-your-license-in-eck.md
-            title: "Elastic Cloud on Kubernetes"
-          - page: docs-content://deploy-manage/license/manage-your-license-in-self-managed-cluster.md
-            title: "Self-managed cluster"
-        - group: Manage your Cloud organization
-          page: docs-content://deploy-manage/cloud-organization.md
-          children:
-          - page: docs-content://deploy-manage/cloud-organization/billing.md
-            children:
-            - page: docs-content://deploy-manage/cloud-organization/billing/cloud-hosted-deployment-billing-dimensions.md
-              title: "Hosted billing dimensions"
-            - page: docs-content://deploy-manage/cloud-organization/billing/serverless-project-billing-dimensions.md
-              title: "Serverless billing dimensions"
-              children:
-              - page: docs-content://deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md
-                title: "Elasticsearch projects"
-              - page: docs-content://deploy-manage/cloud-organization/billing/elastic-observability-billing-dimensions.md
-                title: "Observability projects"
-              - page: docs-content://deploy-manage/cloud-organization/billing/security-billing-dimensions.md
-                title: "Security projects"
-            - page: docs-content://deploy-manage/cloud-organization/billing/billing-models.md
-            - page: docs-content://deploy-manage/cloud-organization/billing/add-billing-details.md
-            - page: docs-content://deploy-manage/cloud-organization/billing/view-billing-history.md
-            - page: docs-content://deploy-manage/cloud-organization/billing/manage-billing-notifications.md
-              title: "Manage notifications"
-            - page: docs-content://deploy-manage/cloud-organization/billing/manage-subscription.md
-            - page: docs-content://deploy-manage/cloud-organization/billing/monitor-analyze-usage.md
-            - page: docs-content://deploy-manage/cloud-organization/billing/ecu.md
-            - page: docs-content://deploy-manage/cloud-organization/billing/billing-faq.md
-          - page: docs-content://deploy-manage/cloud-organization/operational-emails.md
-          - page: docs-content://deploy-manage/cloud-organization/billing/update-billing-operational-contacts.md
-          - page: docs-content://deploy-manage/cloud-organization/service-status.md
-          - page: docs-content://deploy-manage/cloud-organization/tools-and-apis.md
-            title: "Tools and APIs"
-      - group: Deployment and administration tools
-        children:
-        - toc: ecctl://reference
-        - page: elasticsearch://reference/elasticsearch/command-line-tools/index.md
-          title: Command-line tools
-  - label: The Elasticsearch platform
-    children:
-    - label: Ingest and manage data
-      children:
-      - group: "Ingest or migrate: bring your data into Elasticsearch"
-        children:
-        - page: docs-content://manage-data/ingest.md
-          title: Choose/Plan your ingest method
-        - group: Ingest architectures
-          page: docs-content://manage-data/ingest/ingest-reference-architectures.md
+                - page: docs-content://solutions/observability/apm/apm-server/information-api.md
+                  title: APM Server information API
+                - page: docs-content://solutions/observability/apm/elastic-apm-events-intake-api.md
+                  title: Elastic APM events intake API
+                - page: docs-content://solutions/observability/apm/elastic-apm-agent-configuration-api.md
+                  title: Elastic APM agent configuration API
+                - page: docs-content://solutions/observability/apm/opentelemetry-intake-api.md
+                  title: OpenTelemetry intake API
+                - page: docs-content://solutions/observability/apm/jaeger-event-intake.md
+                  title: Jaeger event intake
+              - page: docs-content://solutions/observability/apm/managed-intake-service-event-api.md
+                title: Managed intake service event API
+            - group: Upgrade
+              page: docs-content://solutions/observability/apm/upgrade.md
+              children:
+              - page: docs-content://solutions/observability/apm/apm-agent-compatibility.md
+                title: APM agent compatibility
+              - group: "Upgrade to version 9.0 [apm-upgrading-to-9.0]"
+                page: docs-content://solutions/observability/apm/upgrade-to-version-9.md
+                children:
+                - page: docs-content://solutions/observability/apm/upgrade-self-installation-of-apm-server-standalone-to-9.md
+                  title: Self-installation standalone
+                - page: docs-content://solutions/observability/apm/upgrade-self-installation-of-apm-integration-to-9.md
+                  title: Self-installation APM integration
+                - page: docs-content://solutions/observability/apm/upgrade-elastic-cloud-apm-server-standalone-to-9.md
+                  title: "Elastic Cloud standalone"
+                - page: docs-content://solutions/observability/apm/upgrade-elastic-cloud-with-apm-integration-to-9.md
+                  title: "Elastic Cloud APM integration"
+              - group: Switch to the Elastic APM integration
+                page: docs-content://solutions/observability/apm/switch-to-elastic-apm-integration.md
+                children:
+                - page: docs-content://solutions/observability/apm/switch-self-installation-to-apm-integration.md
+                  title: Switch a self-installation
+                - page: docs-content://solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md
+                  title: "Switch an Elastic Cloud cluster"
+          - group: Synthetic monitoring
+            page: docs-content://solutions/observability/synthetics/index.md
+            children:
+            - group: Get started
+              page: docs-content://solutions/observability/synthetics/get-started.md
+              children:
+              - page: docs-content://solutions/observability/synthetics/create-monitors-with-projects.md
+                title: Use a Synthetics project
+              - page: docs-content://solutions/observability/synthetics/create-monitors-ui.md
+                title: Use the Synthetics UI
+            - group: Scripting browser monitors
+              page: docs-content://solutions/observability/synthetics/scripting-browser-monitors.md
+              children:
+              - page: docs-content://solutions/observability/synthetics/write-synthetic-test.md
+                title: Write a synthetic test
+              - page: docs-content://solutions/observability/synthetics/configure-individual-browser-monitors.md
+                title: Configure individual monitors
+              - page: docs-content://solutions/observability/synthetics/use-synthetics-recorder.md
+                title: Use the Synthetics Recorder
+            - page: docs-content://solutions/observability/synthetics/configure-lightweight-monitors.md
+              title: Configure lightweight monitors
+            - page: docs-content://solutions/observability/synthetics/manage-monitors.md
+              title: Manage monitors
+            - page: docs-content://solutions/observability/synthetics/work-with-params-secrets.md
+              title: Work with params and secrets
+            - page: docs-content://solutions/observability/synthetics/analyze-data.md
+              title: Analyze monitor data
+            - page: docs-content://solutions/observability/synthetics/monitor-resources-on-private-networks.md
+              title: Monitor resources on private networks
+            - page: docs-content://solutions/observability/synthetics/cli.md
+              title: Use the CLI
+            - page: docs-content://solutions/observability/synthetics/configure-projects.md
+              title: Configure a Synthetics project
+            - page: docs-content://solutions/observability/synthetics/mfa-for-browser-monitors.md
+              title: Multi-factor Authentication
+            - page: docs-content://solutions/observability/synthetics/configure-settings.md
+              title: Configure Synthetics settings
+            - group: Grant users access to secured resources
+              page: docs-content://solutions/observability/synthetics/grant-access-to-secured-resources.md
+              children:
+              - page: docs-content://solutions/observability/synthetics/setup-role.md
+                title: Setup role
+              - page: docs-content://solutions/observability/synthetics/writer-role.md
+                title: Writer role
+              - page: docs-content://solutions/observability/synthetics/reader-role.md
+                title: Reader role
+            - page: docs-content://solutions/observability/synthetics/manage-data-retention.md
+              title: Manage data retention
+            - page: docs-content://solutions/observability/synthetics/network-security.md
+              title: Use Synthetics with network security
+            - page: docs-content://solutions/observability/synthetics/migrate-from-elastic-synthetics-integration.md
+              title: Migrate from the Elastic Synthetics integration
+            - page: docs-content://solutions/observability/synthetics/scale-architect-synthetics-deployment.md
+              title: Scale and architect a deployment
+            - page: docs-content://solutions/observability/synthetics/support-matrix.md
+              title: Synthetics support matrix
+            - page: docs-content://solutions/observability/synthetics/encryption-security.md
+              title: Synthetics Encryption and Security
+          - group: Real user monitoring
+            page: docs-content://solutions/observability/applications/user-experience.md
+            children:
+            - page: docs-content://solutions/observability/applications/otel-rum.md
+              title: OpenTelemetry for Real User Monitoring (RUM)
+          - page: docs-content://solutions/observability/applications/llm-observability.md
+            title: LLM and agentic AI observability
+          - group: Uptime monitoring (deprecated)
+            page: docs-content://solutions/observability/uptime/index.md
+            children:
+            - page: docs-content://solutions/observability/uptime/get-started.md
+              title: Get started
+            - group: Analyze
+              page: docs-content://solutions/observability/uptime/analyze.md
+              children:
+              - page: docs-content://solutions/observability/uptime/view-monitor-status.md
+                title: View monitor status
+              - page: docs-content://solutions/observability/uptime/analyze-monitors.md
+                title: Analyze monitors
+              - page: docs-content://solutions/observability/uptime/inspect-duration-anomalies.md
+                title: Inspect uptime duration anomalies
+            - page: docs-content://solutions/observability/uptime/configure-settings.md
+              title: Configure settings
+          - page: docs-content://solutions/observability/otlp-visualize.md
+            title: Visualize OpenTelemetry data
+        - page: docs-content://solutions/observability/cicd.md
+          title: CI/CD
+        - group: Cloud
+          page: docs-content://solutions/observability/cloud.md
           children:
-          - group: Agent to Elasticsearch
-            page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-to-es.md
-            children:
-            - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-installed.md
-              title: Elastic Agent (installed)
-            - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-apis.md
-              title: Elastic Agent via APIs
-          - group: Agent with Logstash
-            page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-ls.md
-            children:
-            - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-enrich.md
-              title: Logstash for enrichment
-            - page: docs-content://manage-data/ingest/ingest-reference-architectures/lspq.md
-              title: Logstash persistent queue
-            - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-networkbridge.md
-              title: Logstash as a network bridge
-            - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-multi.md
-              title: Logstash for multiple destinations
-          - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-proxy.md
-            title: Agent through a proxy
-          - group: Agent with Kafka
-            page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-kafka-es.md
-            children:
-            - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-kafka-ls.md
-              title: Agent to Kafka via Logstash
-            - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-kafka-essink.md
-              title: Agent to Kafka with Elasticsearch sink
-          - page: docs-content://manage-data/ingest/ingest-reference-architectures/ls-for-input.md
-            title: Logstash as input
-          - group: Air-gapped environments
-            page: docs-content://manage-data/ingest/ingest-reference-architectures/airgapped-env.md
-            children:
-            - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-es-airgapped.md
-              title: Agent to Elasticsearch (air-gapped)
-            - page: docs-content://manage-data/ingest/ingest-reference-architectures/agent-ls-airgapped.md
-              title: Agent with Logstash (air-gapped)
-        - group: Ingest by solution
-          page: docs-content://manage-data/ingest/ingesting-data-for-elastic-solutions.md
+          - group: AWS
+            page: docs-content://solutions/observability/cloud/amazon-web-services-aws-monitoring.md
+            children:
+            - page: docs-content://solutions/observability/cloud/ingestion-options.md
+              title: Ingestion options
+            - group: "Monitor AWS with Elastic Agent"
+              page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-agent.md
+              children:
+              - page: docs-content://solutions/observability/cloud/monitor-amazon-cloud-compute-ec2.md
+                title: EC2
+              - page: docs-content://solutions/observability/cloud/monitor-amazon-kinesis-data-streams.md
+                title: Kinesis data streams
+              - page: docs-content://solutions/observability/cloud/monitor-amazon-simple-storage-service-s3.md
+                title: S3
+              - page: docs-content://solutions/observability/cloud/monitor-amazon-simple-queue-service-sqs.md
+                title: SQS
+            - page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md
+              title: "Monitor AWS with Beats"
+            - group: "Monitor AWS with Amazon Data Firehose"
+              page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-amazon-data-firehose.md
+              children:
+              - page: docs-content://solutions/observability/cloud/monitor-virtual-private-cloud-vpc-flow-logs.md
+                title: VPC Flow Logs
+              - page: docs-content://solutions/observability/cloud/monitor-cloudtrail-logs.md
+                title: CloudTrail logs
+              - page: docs-content://solutions/observability/cloud/monitor-aws-network-firewall-logs.md
+                title: Network Firewall logs
+              - page: docs-content://solutions/observability/cloud/monitor-web-application-firewall-waf-logs.md
+                title: WAF logs
+              - page: docs-content://solutions/observability/cloud/monitor-cloudwatch-logs.md
+                title: CloudWatch logs
+            - page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-serverless-forwarder.md
+              title: "Monitor AWS with Elastic Serverless Forwarder"
+          - group: Azure
+            page: docs-content://solutions/observability/cloud/azure-monitoring.md
+            children:
+            - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-elastic-agent.md
+              title: Monitor Microsoft Azure with Elastic Agent
+            - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-beats.md
+              title: Monitor Microsoft Azure with Beats
+            - page: docs-content://solutions/observability/cloud/multi-tenant-data-ingestion-with-beats.md
+              title: Ingest multi-tenant Azure Event Hub logs with Filebeat
+            - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-azure-native-isv-service.md
+              title: Monitor Microsoft Azure with the Azure Native ISV Service
+            - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-openai.md
+              title: Monitor Microsoft Azure OpenAI
+          - group: GCP
+            page: docs-content://solutions/observability/cloud/monitor-google-cloud-platform-gcp.md
+            children:
+            - page: docs-content://solutions/observability/cloud/gcp-dataflow-templates.md
+              title: GCP Dataflow templates
+        - group: Infrastructure and hosts
+          page: docs-content://solutions/observability/infra-and-hosts.md
           children:
-          - page: docs-content://solutions/search/ingest-for-search.md
-            title: Ingesting data for search use cases
-          - title: Ingesting data for observability
-          - page: docs-content://solutions/security/get-started/ingest-data-to-elastic-security.md
-            title: Ingesting data for security (Move from Solutions)
-        - page: docs-content://manage-data/ingest/ingesting-timeseries-data.md
-          title: Ingesting time series data
-        - group: Ingest logs
+          - group: Analyze infrastructure and host metrics
+            page: docs-content://solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md
+            children:
+            - page: docs-content://solutions/observability/infra-and-hosts/get-started-with-system-metrics.md
+              title: Get started with system metrics
+            - page: docs-content://solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
+              title: View infrastructure metrics by resource type
+            - page: docs-content://solutions/observability/infra-and-hosts/discover-metrics.md
+              title: Explore metrics data with Discover in Kibana
+            - page: docs-content://solutions/observability/infra-and-hosts/explore-infrastructure-metrics-over-time.md
+              title: Explore infrastructure metrics over time
+            - page: docs-content://solutions/observability/infra-and-hosts/analyze-compare-hosts.md
+              title: Analyze and compare hosts
+            - page: docs-content://solutions/observability/infra-and-hosts/detect-metric-anomalies.md
+              title: Detect metric anomalies
+            - page: docs-content://solutions/observability/infra-and-hosts/configure-settings.md
+              title: Configure settings
+          - group: Universal Profiling
+            page: docs-content://solutions/observability/infra-and-hosts/universal-profiling.md
+            children:
+            - page: docs-content://solutions/observability/infra-and-hosts/get-started-with-universal-profiling.md
+              title: Get started
+            - group: Manage data storage
+              page: docs-content://solutions/observability/infra-and-hosts/manage-data-storage.md
+              children:
+              - page: docs-content://solutions/observability/infra-and-hosts/universal-profiling-index-life-cycle-management.md
+                title: Index lifecycle management
+              - page: docs-content://solutions/observability/infra-and-hosts/configure-probabilistic-profiling.md
+                title: Configure probabilistic profiling
+            - group: Advanced configuration
+              page: docs-content://solutions/observability/infra-and-hosts/advanced-configuration.md
+              children:
+              - page: docs-content://solutions/observability/infra-and-hosts/tag-data-for-querying.md
+                title: Tag data for querying
+              - page: docs-content://solutions/observability/infra-and-hosts/add-symbols-for-native-frames.md
+                title: Add symbols for native frames
+              - page: docs-content://solutions/observability/infra-and-hosts/use-proxy-with-universal-profiling-agent.md
+                title: Use a proxy
+              - page: docs-content://solutions/observability/infra-and-hosts/override-kernel-version-check.md
+                title: Override kernel version check
+              - page: docs-content://solutions/observability/infra-and-hosts/environment-variables-to-configure-universal-profiling-agent.md
+                title: Environment variables to configure the Universal Profiling Agent
+              - page: docs-content://solutions/observability/infra-and-hosts/configuration-file-of-universal-profiling-agent.md
+                title: Configuration file of the Universal Profiling Agent
+            - page: docs-content://solutions/observability/infra-and-hosts/upgrade-universal-profiling.md
+              title: Upgrade
+            - page: docs-content://solutions/observability/infra-and-hosts/run-universal-profiling-on-self-hosted-elastic-stack.md
+              title: Self-hosted infrastructure
+            - group: Install the backend
+              page: docs-content://solutions/observability/infra-and-hosts/install-backend.md
+              children:
+              - page: docs-content://solutions/observability/infra-and-hosts/step-1-update-stack.md
+                title: "Step 1: Update the stack"
+              - page: docs-content://solutions/observability/infra-and-hosts/step-2-enable-universal-profiling-in-kibana.md
+                title: "Step 2: Enable Universal Profiling in Kibana"
+              - page: docs-content://solutions/observability/infra-and-hosts/step-3-set-up-universal-profiling-in-kibana.md
+                title: "Step 3: Set up Universal Profiling in Kibana"
+              - page: docs-content://solutions/observability/infra-and-hosts/step-4-run-backend-applications.md
+                title: "Step 4: Run the backend applications"
+              - page: docs-content://solutions/observability/infra-and-hosts/step-5-next-steps.md
+                title: "Step 5: Next steps"
+            - page: docs-content://solutions/observability/infra-and-hosts/operate-universal-profiling-backend.md
+              title: Operate the backend
+          - page: docs-content://solutions/observability/infra-and-hosts/tutorial-observe-kubernetes-deployments.md
+            title: "Tutorial: Observe your Kubernetes deployments"
+          - group: "Tutorial: Observe your nginx instances"
+            page: docs-content://solutions/observability/infra-and-hosts/tutorial-observe-nginx-instances.md
+            children:
+            - page: docs-content://solutions/observability/infra-and-hosts/understanding-no-results-found-message.md
+              title: Understanding "no results found" message
+          - page: docs-content://solutions/observability/infra-and-hosts/collect-nginx-data-otel-integration-fleet-managed.md
+            title: Collect NGINX data with OpenTelemetry integrations (Fleet-managed)
+          - page: docs-content://solutions/observability/infra-and-hosts/collect-nginx-data-otel-integration-standalone.md
+            title: Collect NGINX data with OpenTelemetry integrations (standalone)
+        - group: Logs
           page: docs-content://solutions/observability/logs.md
           children:
           - page: docs-content://solutions/observability/logs/get-started-with-system-logs.md
             title: Get started with system logs
           - page: docs-content://solutions/observability/logs/stream-any-log-file.md
-            title: Stream any log file
+            title: Send any log file using Elastic Agent
           - page: docs-content://solutions/observability/logs/stream-any-log-file-using-edot-collector.md
-            title: Stream any log file using EDOT Collector
-          - group: Stream application logs
+            title: Send any log file using OTel Collector
+          - group: Send application log data
             page: docs-content://solutions/observability/logs/stream-application-logs.md
             children:
             - page: docs-content://solutions/observability/logs/plaintext-application-logs.md
@@ -1515,2372 +3639,655 @@ nav:
             - page: docs-content://solutions/observability/logs/apm-agent-log-sending.md
               title: APM agent log sending
           - page: docs-content://solutions/observability/logs/parse-route-logs.md
-            title: Parse and route logs
+            title: Parse and route logs using ingest pipelines
           - page: docs-content://solutions/observability/logs/filter-aggregate-logs.md
             title: Filter and aggregate logs
           - group: Explore logs
             page: docs-content://solutions/observability/logs/explore-logs.md
             children:
             - page: docs-content://solutions/observability/logs/discover-logs.md
-              title: Discover logs
+              title: Explore logs in Discover
             - page: docs-content://solutions/observability/logs/categorize-log-entries.md
               title: Categorize log entries
             - page: docs-content://solutions/observability/logs/inspect-log-anomalies.md
               title: Inspect log anomalies
           - page: docs-content://solutions/observability/logs/run-pattern-analysis-on-log-data.md
-            title: Run pattern analysis on log data
+            title: Run a pattern analysis on log data
           - page: docs-content://solutions/observability/logs/log-data-sources.md
-            title: Log data sources
+            title: Configure log data sources
           - page: docs-content://solutions/observability/logs/logs-data-retention.md
-            title: Logs data retention
+            title: Configure log data retention
           - page: docs-content://solutions/observability/logs/add-service-name-to-logs.md
-            title: Add service name to logs
+            title: Add a service name to logs
           - group: Logs index template reference
             page: docs-content://solutions/observability/logs/logs-index-template-reference.md
             children:
             - page: docs-content://solutions/observability/logs/logs-index-template-defaults.md
-              title: Logs index template defaults
-        - group: Ingest data with agentless integrations
-          page: docs-content://manage-data/ingest/agentless/agentless-integrations.md
-          children:
-          - page: docs-content://manage-data/ingest/agentless/cloud-connector-deployment.md
-            title: Cloud connector deployment
-          - page: docs-content://manage-data/ingest/agentless/agentless-integrations-faq.md
-            title: Agentless integrations FAQ
-          - page: integration-docs://reference/agentless_integrations.md
-            title: Agentless integrations reference
-        - group: Ingest data from applications
-          page: docs-content://manage-data/ingest/ingesting-data-from-applications.md
-          children:
-          - toc: docs-content://reference/apm-agents
-          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-with-nodejs-on-elasticsearch-service.md
-            title: Ingest data with Node.js
-          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-with-python-on-elasticsearch-service.md
-            title: Ingest data with Python
-          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-from-beats-to-elasticsearch-service-with-logstash-as-proxy.md
-            title: Ingest data from Beats with Logstash as a proxy
-          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-data-from-relational-database-into-elasticsearch-service.md
-            title: Ingest data from a relational database
-          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-python-application-using-filebeat.md
-            title: Ingest logs from a Python application using Filebeat
-          - page: docs-content://manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-nodejs-web-application-using-filebeat.md
-            title: Ingest logs from a Node.js web application using Filebeat
-        - title: Ingest data using the API
-        - page: docs-content://manage-data/ingest/tools.md
-          title: Ingest tools overview
-        - page: docs-content://manage-data/ingest/upload-data-files.md
-          title: Upload data files
-        - page: docs-content://manage-data/ingest/sample-data.md
-          title: Sample data
-        - group: Migrating your Elasticsearch data
-          page: docs-content://manage-data/migrate.md
-          children:
-          - page: docs-content://manage-data/migrate/migrate-from-a-self-managed-cluster-with-a-self-signed-certificate-using-remote-reindex.md
-            title: Reindex using a private CA
-          - page: docs-content://manage-data/migrate/migrate-with-logstash.md
-            title: Migrate Elastic Cloud Hosted data to Serverless with Logstash
-          - page: docs-content://manage-data/migrate/migrate-data-between-elasticsearch-clusters-with-minimal-downtime.md
-            title: Minimal-downtime migration using snapshots
-          - page: docs-content://manage-data/migrate/migrate-internal-indices.md
-            title: Migrate system indices
-      - group: Ingest tools
-        page: docs-content://reference/ingestion-tools/index.md
-        children:
-        - toc: opentelemetry://reference
-        - toc: docs-content://reference/fleet
-        - toc: integration-docs://reference
-        - toc: elasticsearch://reference/search-connectors
-        - toc: logstash://reference
-        - toc: docs-content://reference/apm
-        - toc: beats://reference
-        - group: Other ingest tools
-          children:
-          - toc: elasticsearch-hadoop://reference
-          - toc: elastic-serverless-forwarder://reference
-      - group: Data storage and lifecycle
-        children:
-        - group: The Elasticsearch data store
-          page: docs-content://manage-data/data-store.md
-          children:
-          - group: Index basics
-            page: docs-content://manage-data/data-store/index-basics.md
-            children:
-            - page: elasticsearch://reference/elasticsearch/index-settings/index.md
-              title: Index settings reference
-            - page: elasticsearch://reference/elasticsearch/index-lifecycle-actions/index.md
-              title: Index lifecycle management actions
-          - page: docs-content://manage-data/data-store/near-real-time-search.md
-            title: Near real-time search
-          - group: Data streams
-            page: docs-content://manage-data/data-store/data-streams.md
-            children:
-            - page: docs-content://manage-data/data-store/data-streams/set-up-data-stream.md
-              title: Set up a data stream
-            - page: docs-content://manage-data/data-store/data-streams/use-data-stream.md
-              title: Use a data stream
-            - page: docs-content://manage-data/data-store/data-streams/modify-data-stream.md
-              title: Modify a data stream
-            - page: docs-content://manage-data/data-store/data-streams/manage-data-stream.md
-              title: Manage a data stream
-            - group: Time series data stream (TSDS)
-              page: docs-content://manage-data/data-store/data-streams/time-series-data-stream-tsds.md
-              children:
-              - page: docs-content://manage-data/data-store/data-streams/quickstart-tsds.md
-                title: Quickstart
-              - page: docs-content://manage-data/data-store/data-streams/set-up-tsds.md
-                title: Set up TSDS
-              - group: Downsampling
-                page: docs-content://manage-data/data-store/data-streams/downsampling-time-series-data-stream.md
-                children:
-                - page: docs-content://manage-data/data-store/data-streams/downsampling-concepts.md
-                  title: Downsampling concepts
-                - page: docs-content://manage-data/data-store/data-streams/run-downsampling.md
-                  title: Run downsampling
-                - page: docs-content://manage-data/data-store/data-streams/query-downsampled-data.md
-                  title: Query downsampled data
-              - group: Advanced topics
-                page: docs-content://manage-data/data-store/data-streams/advanced-topics-tsds.md
-                children:
-                - page: docs-content://manage-data/data-store/data-streams/time-bound-tsds.md
-                  title: Time-bound TSDS
-                - page: docs-content://manage-data/data-store/data-streams/reindex-tsds.md
-                  title: Reindex TSDS
-                - page: docs-content://manage-data/data-store/data-streams/tsds-ingest-otlp.md
-                  title: TSDS ingest OTLP
-            - group: Logs data stream
-              page: docs-content://manage-data/data-store/data-streams/logs-data-stream.md
-              children:
-              - page: docs-content://manage-data/data-store/data-streams/logs-data-stream-configure.md
-                title: Configure
-              - page: docs-content://manage-data/data-store/data-streams/logs-data-stream-integrations.md
-                title: Integrations
-            - group: Failure store
-              page: docs-content://manage-data/data-store/data-streams/failure-store.md
-              children:
-              - page: docs-content://manage-data/data-store/data-streams/failure-store-recipes.md
-                title: Recipes
-          - group: Mapping
-            page: docs-content://manage-data/data-store/mapping.md
-            children:
-            - page: elasticsearch://reference/elasticsearch/mapping-reference/index.md
-              title: Mapping reference
-            - group: Dynamic mapping
-              page: docs-content://manage-data/data-store/mapping/dynamic-mapping.md
-              children:
-              - page: docs-content://manage-data/data-store/mapping/dynamic-field-mapping.md
-                title: Dynamic field mapping
-              - page: docs-content://manage-data/data-store/mapping/dynamic-templates.md
-                title: Dynamic templates
-            - page: docs-content://manage-data/data-store/mapping/explicit-mapping.md
-              title: Explicit mapping
-            - group: Runtime fields
-              page: docs-content://manage-data/data-store/mapping/runtime-fields.md
-              children:
-              - page: docs-content://manage-data/data-store/mapping/map-runtime-field.md
-                title: Map a runtime field
-              - page: docs-content://manage-data/data-store/mapping/define-runtime-fields-in-search-request.md
-                title: Define in search request
-              - page: docs-content://manage-data/data-store/mapping/override-field-values-at-query-time.md
-                title: Override values at query time
-              - page: docs-content://manage-data/data-store/mapping/retrieve-runtime-field.md
-                title: Retrieve a runtime field
-              - page: docs-content://manage-data/data-store/mapping/index-runtime-field.md
-                title: Index a runtime field
-              - page: docs-content://manage-data/data-store/mapping/explore-data-with-runtime-fields.md
-                title: Explore data with runtime fields
-            - page: docs-content://manage-data/data-store/mapping/removal-of-mapping-types.md
-              title: Removal of mapping types
-            - page: docs-content://manage-data/data-store/mapping/update-mappings-examples.md
-              title: Update mappings examples
-          - group: Text analysis
-            page: docs-content://manage-data/data-store/text-analysis.md
-            children:
-            - page: elasticsearch://reference/text-analysis/index.md
-              title: Text analysis components
-            - group: Concepts
-              page: docs-content://manage-data/data-store/text-analysis/concepts.md
-              children:
-              - page: docs-content://manage-data/data-store/text-analysis/anatomy-of-an-analyzer.md
-                title: Anatomy of an analyzer
-              - page: docs-content://manage-data/data-store/text-analysis/index-search-analysis.md
-                title: Index and search analysis
-              - page: docs-content://manage-data/data-store/text-analysis/stemming.md
-                title: Stemming
-              - page: docs-content://manage-data/data-store/text-analysis/token-graphs.md
-                title: Token graphs
-            - group: Configure text analysis
-              page: docs-content://manage-data/data-store/text-analysis/configure-text-analysis.md
-              children:
-              - page: docs-content://manage-data/data-store/text-analysis/test-an-analyzer.md
-                title: Test an analyzer
-              - page: docs-content://manage-data/data-store/text-analysis/configuring-built-in-analyzers.md
-                title: Configuring built-in analyzers
-              - page: docs-content://manage-data/data-store/text-analysis/create-custom-analyzer.md
-                title: Create custom analyzer
-              - page: docs-content://manage-data/data-store/text-analysis/specify-an-analyzer.md
-                title: Specify an analyzer
-          - group: Templates
-            page: docs-content://manage-data/data-store/templates.md
-            children:
-            - page: docs-content://manage-data/data-store/templates/simulate-multi-component-templates.md
-              title: Simulate multi-component templates
-            - page: docs-content://manage-data/data-store/templates/ignore-missing-component-templates.md
-              title: Ignore missing component templates
-          - page: docs-content://manage-data/data-store/aliases.md
-            title: Aliases
-          - group: Perform index operations
-            page: docs-content://manage-data/data-store/perform-index-operations.md
-            children:
-            - page: docs-content://manage-data/data-store/index-operations-reference.md
-              title: Index operations reference
-          - page: docs-content://manage-data/data-store/manage-data-from-the-command-line.md
-            title: Manage data from the command line
-        - group: Data lifecycle
-          page: docs-content://manage-data/lifecycle.md
-          children:
-          - page: docs-content://manage-data/lifecycle/data-tiers.md
-            title: "Data tiers: hot warm cold frozen"
-          - group: Index lifecycle management (ILM)
-            page: docs-content://manage-data/lifecycle/index-lifecycle-management.md
-            children:
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/index-lifecycle.md
-              title: Index lifecycle
-            - group: Rollover
-              page: docs-content://manage-data/lifecycle/index-lifecycle-management/rollover.md
-              children:
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/skip-rollover.md
-                title: Skip rollover
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/configure-lifecycle-policy.md
-              title: Configure lifecycle policy
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-apply.md
-              title: Apply policy
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-view-status.md
-              title: View policy status
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/manage-lifecycle-integrations-data.md
-              title: Manage integrations data
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/policy-updates.md
-              title: Policy updates
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/start-stop-index-lifecycle-management.md
-              title: Start and stop ILM
-            - page: docs-content://manage-data/lifecycle/index-lifecycle-management/restore-managed-data-stream-index.md
-              title: Restore managed index
-            - group: ILM tutorials
-              page: docs-content://manage-data/lifecycle/index-lifecycle-management/ilm-tutorials.md
-              children:
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-time-series-with-data-streams.md
-                title: Time series with data streams
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-time-series-without-data-streams.md
-                title: Time series without data streams
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-general-content-with-data-streams.md
-                title: General content with data streams
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-customize-built-in-policies.md
-                title: Customize built-in policies
-            - group: Migrate ILM
-              page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-ilm.md
-              children:
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-index-management.md
-                title: Migrate index management
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/manage-existing-indices.md
-                title: Manage existing indices
-              - page: docs-content://manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md
-                title: Migrate allocation filters to node roles
-          - group: Data stream lifecycle
-            page: docs-content://manage-data/lifecycle/data-stream.md
-            children:
-            - page: docs-content://manage-data/lifecycle/data-stream/tutorial-create-data-stream-with-lifecycle.md
-              title: "Tutorial: Create with lifecycle"
-            - page: docs-content://manage-data/lifecycle/data-stream/tutorial-update-existing-data-stream.md
-              title: "Tutorial: Update existing"
-            - page: docs-content://manage-data/lifecycle/data-stream/tutorial-data-stream-retention.md
-              title: "Tutorial: Retention"
-            - page: docs-content://manage-data/lifecycle/data-stream/tutorial-migrate-ilm-managed-data-stream-to-data-stream-lifecycle.md
-              title: "Tutorial: Migrate from ILM"
-          - page: docs-content://manage-data/lifecycle/curator.md
-            title: Elasticsearch Curator
-          - group: Rollup
-            page: docs-content://manage-data/lifecycle/rollup.md
-            children:
-            - page: docs-content://manage-data/lifecycle/rollup/getting-started-api.md
-              title: Getting started (API)
-            - page: docs-content://manage-data/lifecycle/rollup/getting-started-kibana.md
-              title: Getting started (Kibana)
-            - page: docs-content://manage-data/lifecycle/rollup/understanding-groups.md
-              title: Understanding groups
-            - page: docs-content://manage-data/lifecycle/rollup/rollup-aggregation-limitations.md
-              title: Aggregation limitations
-            - page: docs-content://manage-data/lifecycle/rollup/rollup-search-limitations.md
-              title: Search limitations
-            - page: docs-content://manage-data/lifecycle/rollup/migrating-from-rollup-to-downsampling.md
-              title: Migrating to downsampling
-        - page: docs-content://manage-data/use-case-use-elasticsearch-to-manage-time-series-data.md
-          title: "Use case: time series data management"
-      - group: Transform and enrich data
-        page: docs-content://manage-data/ingest/transform-enrich.md
-        children:
-        - group: Data pipelines
+              title: Default `logs` index template
+        - page: docs-content://solutions/observability/streams/streams.md
+          title: Streams
+        - page: docs-content://solutions/observability/streams/management/retention.md
+          title: Manage data retention
+        - group: Process documents
+          page: docs-content://solutions/observability/streams/management/extract.md
           children:
-          - page: opentelemetry://reference/motlp/index.md
-            title: Managed pipelines (mOTLP)
-          - group: Elasticsearch ingest pipelines
-            page: docs-content://manage-data/ingest/transform-enrich/ingest-pipelines.md
-            children:
-            - page: docs-content://manage-data/ingest/transform-enrich/example-parse-logs.md
-              title: "Example: Parse logs"
-            - page: docs-content://manage-data/ingest/transform-enrich/readable-maintainable-ingest-pipelines.md
-              title: Readable maintainable pipelines
-            - page: docs-content://manage-data/ingest/transform-enrich/error-handling.md
-              title: Error handling
-          - page: docs-content://manage-data/ingest/transform-enrich/logstash-pipelines.md
-            title: Logstash pipelines
-        - group: Data enrichment
-          page: docs-content://manage-data/ingest/transform-enrich/data-enrichment.md
-          children:
-          - page: docs-content://manage-data/ingest/transform-enrich/set-up-an-enrich-processor.md
-            title: Set up an enrich processor
-          - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-based-on-geolocation.md
-            title: "Example: Enrich by geolocation"
-          - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-based-on-exact-values.md
-            title: "Example: Enrich by exact values"
-          - page: docs-content://manage-data/ingest/transform-enrich/example-enrich-data-by-matching-value-to-range.md
-            title: "Example: Enrich by matching value to range"
-        - page: docs-content://manage-data/ingest/transform-enrich/index-mapping-text-analysis.md
-          title: Index mapping and text analysis
-        - page: docs-content://manage-data/ingest/transform-enrich/ingest-lag.md
-          title: Calculate ingest lag metadata
-    - label: Search, visualize and analyze
-      children:
-      - group: Search and query
-        children:
-        - group: Get started with search
-          children:
-          - title: APIs and tools for search
-        - group: Search strategies
-          children:
-          - title: Full-text search
-          - title: AI-powered search
-          - title: Hybrid search
-          - title: Ranking and reranking
-        - group: Build search queries with APIs and query languages and search templates
-          children:
-          - title: ES|QL
-          - title: Query DSL
-          - title: "..."
-        - group: Cross-project search
-          children:
-          - title: Link projects for cross-project search
-          - title: Using project routing to limit search scope
-          - title: How search works in CPS
-          - title: Using tags to control search
-        - title: Cross-cluster search
-        - title: Add search to your site or app
-        - group: Querying and filtering in Kibana
-          children:
-          - title: Filtering in Kibana
-          - title: Query languages
-          - title: Query tools
-      - group: Explore and visualize
-        page: docs-content://explore-analyze/explore-and-visualize.md
-        children:
-        - page: docs-content://explore-analyze/kibana-data-exploration-learning-tutorial.md
-          title: Learn data exploration and visualization
-        - group: Discover
-          page: docs-content://explore-analyze/discover.md
-          children:
-          - page: docs-content://explore-analyze/discover/discover-get-started.md
-            title: Explore fields and data with Discover
-          - page: docs-content://explore-analyze/discover/document-explorer.md
-            title: Customize the Discover view
-          - page: docs-content://explore-analyze/discover/discover-search-for-relevance.md
-            title: Search for relevance
-          - page: docs-content://explore-analyze/discover/save-open-search.md
-            title: Save a search for reuse
-          - page: docs-content://explore-analyze/discover/show-field-statistics.md
-            title: View field statistics
-          - page: docs-content://explore-analyze/discover/run-pattern-analysis-discover.md
-            title: Run a pattern analysis on your log data
-          - page: docs-content://explore-analyze/discover/background-search.md
-            title: Run queries in the background
-          - page: docs-content://explore-analyze/discover/try-esql.md
-            title: "Using ES|QL"
-        - group: Dashboards
-          page: docs-content://explore-analyze/dashboards.md
-          children:
-          - page: docs-content://explore-analyze/dashboards/using.md
-            title: Exploring dashboards
-          - group: Building dashboards
-            page: docs-content://explore-analyze/dashboards/building.md
-            children:
-            - page: docs-content://explore-analyze/dashboards/create-dashboard.md
-              title: Create a dashboard
-            - page: docs-content://explore-analyze/dashboards/open-dashboard.md
-              title: Edit a dashboard
-            - page: docs-content://explore-analyze/dashboards/add-controls.md
-              title: Add filter controls
-            - page: docs-content://explore-analyze/dashboards/drilldowns.md
-              title: Add drilldowns
-            - page: docs-content://explore-analyze/dashboards/arrange-panels.md
-              title: Organize dashboard panels
-            - page: docs-content://explore-analyze/dashboards/duplicate-dashboards.md
-              title: Duplicate a dashboard
-            - page: docs-content://explore-analyze/dashboards/import-dashboards.md
-              title: Import a dashboard
-          - page: docs-content://explore-analyze/dashboards/managing.md
-            title: Managing dashboards
-          - page: docs-content://explore-analyze/dashboards/sharing.md
-            title: Sharing dashboards
-          - group: Tutorials
-            page: docs-content://explore-analyze/dashboards/tutorials.md
-            children:
-            - page: docs-content://explore-analyze/dashboards/create-dashboard-of-panels-with-web-server-data.md
-              title: Create a simple dashboard to monitor website logs
-            - page: docs-content://explore-analyze/dashboards/create-dashboard-of-panels-with-ecommerce-data.md
-              title: Create a dashboard with time series charts
-        - group: Panels and visualizations
-          page: docs-content://explore-analyze/visualize.md
-          children:
-          - page: docs-content://explore-analyze/visualize/visualize-library.md
-            title: Visualize Library
-          - page: docs-content://explore-analyze/visualize/manage-panels.md
-            title: Manage panels
-          - group: Lens
-            page: docs-content://explore-analyze/visualize/lens.md
-            children:
-            - page: docs-content://explore-analyze/visualize/charts/area-charts.md
-              title: Area charts
-            - page: docs-content://explore-analyze/visualize/charts/bar-charts.md
-              title: Bar charts
-            - page: docs-content://explore-analyze/visualize/charts/heat-map-charts.md
-              title: Heat map charts
-            - page: docs-content://explore-analyze/visualize/charts/gauge-charts.md
-              title: Gauge charts
-            - page: docs-content://explore-analyze/visualize/charts/line-charts.md
-              title: Line charts
-            - page: docs-content://explore-analyze/visualize/charts/metric-charts.md
-              title: Metric charts
-            - page: docs-content://explore-analyze/visualize/charts/mosaic-charts.md
-              title: Mosaic charts
-            - page: docs-content://explore-analyze/visualize/charts/pie-charts.md
-              title: Pie charts
-            - page: docs-content://explore-analyze/visualize/charts/region-map-charts.md
-              title: Region map charts
-            - page: docs-content://explore-analyze/visualize/charts/tables.md
-              title: Tables
-            - page: docs-content://explore-analyze/visualize/charts/waffle-charts.md
-              title: Waffle charts
-            - page: docs-content://explore-analyze/visualize/charts/tag-cloud-charts.md
-              title: Tag cloud charts
-            - page: docs-content://explore-analyze/visualize/charts/treemap-charts.md
-              title: Treemap charts
-          - page: docs-content://explore-analyze/visualize/esorql.md
-            title: "ES|QL"
-          - page: docs-content://explore-analyze/visualize/custom-visualizations-with-vega.md
-            title: Custom visualizations with Vega
-          - page: docs-content://explore-analyze/visualize/text-panels.md
-            title: Text panels
-          - page: docs-content://explore-analyze/visualize/image-panels.md
-            title: Image panels
-          - page: docs-content://explore-analyze/visualize/link-panels.md
-            title: Link panels
-          - page: docs-content://explore-analyze/visualize/alert-panels.md
-            title: Alert panels
-          - group: Canvas
-            page: docs-content://explore-analyze/visualize/canvas.md
-            children:
-            - page: docs-content://explore-analyze/visualize/canvas/edit-workpads.md
-              title: Edit workpads
-            - page: docs-content://explore-analyze/visualize/canvas/canvas-present-workpad.md
-              title: Present your workpad
-            - page: docs-content://explore-analyze/visualize/canvas/canvas-tutorial.md
-              title: "Tutorial: Create a workpad for monitoring sales"
-            - group: Canvas function reference
-              page: docs-content://explore-analyze/visualize/canvas/canvas-function-reference.md
-              children:
-              - page: docs-content://explore-analyze/visualize/canvas/canvas-tinymath-functions.md
-                title: TinyMath functions
-          - group: Maps
-            page: docs-content://explore-analyze/visualize/maps.md
-            children:
-            - page: docs-content://explore-analyze/visualize/maps/maps-getting-started.md
-              title: Build a map to compare metrics by country or region
-            - page: docs-content://explore-analyze/visualize/maps/asset-tracking-tutorial.md
-              title: Track, visualize, and alert on assets in real time
-            - page: docs-content://explore-analyze/visualize/maps/reverse-geocoding-tutorial.md
-              title: Map custom regions with reverse geocoding
-            - page: docs-content://explore-analyze/visualize/maps/heatmap-layer.md
-              title: Heat map layer
-            - page: docs-content://explore-analyze/visualize/maps/tile-layer.md
-              title: Tile layer
-            - group: Vector layer
-              page: docs-content://explore-analyze/visualize/maps/vector-layer.md
-              children:
-              - page: docs-content://explore-analyze/visualize/maps/vector-style.md
-                title: Vector styling
-              - page: docs-content://explore-analyze/visualize/maps/maps-vector-style-properties.md
-                title: Vector style properties
-              - page: docs-content://explore-analyze/visualize/maps/vector-tooltip.md
-                title: Vector tooltips
-            - group: Map aggregations
-              page: docs-content://explore-analyze/visualize/maps/maps-aggregations.md
-              children:
-              - page: docs-content://explore-analyze/visualize/maps/maps-grid-aggregation.md
-                title: Clusters
-              - page: docs-content://explore-analyze/visualize/maps/maps-top-hits-aggregation.md
-                title: Display the most relevant documents per entity
-              - page: docs-content://explore-analyze/visualize/maps/point-to-point.md
-                title: Point to point
-              - page: docs-content://explore-analyze/visualize/maps/terms-join.md
-                title: Term join
-            - group: Search and filter maps
-              page: docs-content://explore-analyze/visualize/maps/maps-search.md
-              children:
-              - page: docs-content://explore-analyze/visualize/maps/maps-create-filter-from-map.md
-                title: Create filters from a map
-              - page: docs-content://explore-analyze/visualize/maps/maps-layer-based-filtering.md
-                title: Filter a single layer
-              - page: docs-content://explore-analyze/visualize/maps/maps-search-across-multiple-indices.md
-                title: Search across multiple indices
-            - page: docs-content://explore-analyze/visualize/maps/maps-settings.md
-              title: Configure map settings
-            - page: docs-content://explore-analyze/visualize/maps/maps-connect-to-ems.md
-              title: Connect to Elastic Maps Service
-            - group: Import geospatial data
-              page: docs-content://explore-analyze/visualize/maps/import-geospatial-data.md
-              children:
-              - page: docs-content://explore-analyze/visualize/maps/maps-clean-data.md
-                title: Clean your data
-              - page: docs-content://explore-analyze/visualize/maps/indexing-geojson-data-tutorial.md
-                title: "Tutorial: Index GeoJSON data"
-            - page: docs-content://explore-analyze/visualize/maps/maps-troubleshooting.md
-              title: Troubleshoot
-          - group: Graph
-            page: docs-content://explore-analyze/visualize/graph.md
-            children:
-            - page: docs-content://explore-analyze/visualize/graph/graph-configuration.md
-              title: Configure Graph
-            - page: docs-content://explore-analyze/visualize/graph/graph-troubleshooting.md
-              title: Troubleshooting and limitations
-          - group: Legacy editors
-            page: docs-content://explore-analyze/visualize/legacy-editors.md
-            children:
-            - page: docs-content://explore-analyze/visualize/legacy-editors/aggregation-based.md
-              title: Aggregation-based
-            - page: docs-content://explore-analyze/visualize/legacy-editors/tsvb.md
-              title: TSVB
-            - page: docs-content://explore-analyze/visualize/legacy-editors/timelion.md
-              title: Timelion
-        - group: Find and organize content
-          page: docs-content://explore-analyze/find-and-organize.md
-          children:
-          - page: docs-content://explore-analyze/find-and-organize/data-views.md
-            title: Data views
-          - page: docs-content://explore-analyze/find-and-organize/saved-objects.md
-            title: Saved objects
-          - page: docs-content://explore-analyze/find-and-organize/files.md
-            title: Files
-          - page: docs-content://explore-analyze/find-and-organize/reports.md
-            title: Reports
-          - page: docs-content://explore-analyze/find-and-organize/tags.md
-            title: Tags
-          - page: docs-content://explore-analyze/find-and-organize/find-apps-and-objects.md
-            title: Find apps and objects
-      - group: Track and respond
-        page: docs-content://explore-analyze/track-and-respond.md
-        children:
-        - group: Reporting and sharing
-          page: docs-content://explore-analyze/report-and-share.md
-          children:
-          - page: docs-content://explore-analyze/report-and-share/automating-report-generation.md
-            title: Automatically generate reports
-          - group: Reporting troubleshooting
-            page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting.md
-            children:
-            - page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting-csv.md
-              title: CSV
-            - page: docs-content://explore-analyze/report-and-share/reporting-troubleshooting-pdf.md
-              title: PDF/PNG
-        - group: Alerting
-          page: docs-content://explore-analyze/alerting.md
+          - page: docs-content://solutions/observability/streams/management/extract/drop.md
+            title: Drop document processor
+          - page: docs-content://solutions/observability/streams/management/extract/remove.md
+            title: Remove processor
+          - page: docs-content://solutions/observability/streams/management/extract/date.md
+            title: Date processor
+          - page: docs-content://solutions/observability/streams/management/extract/convert.md
+            title: Convert processor
+          - page: docs-content://solutions/observability/streams/management/extract/replace.md
+            title: Replace processor
+          - page: docs-content://solutions/observability/streams/management/extract/dissect.md
+            title: Dissect processor
+          - page: docs-content://solutions/observability/streams/management/extract/grok.md
+            title: Grok processor
+          - page: docs-content://solutions/observability/streams/management/extract/set.md
+            title: Set processor
+          - page: docs-content://solutions/observability/streams/management/extract/math.md
+            title: Math processor
+          - page: docs-content://solutions/observability/streams/management/extract/rename.md
+            title: Rename processor
+          - page: docs-content://solutions/observability/streams/management/extract/append.md
+            title: Append processor
+          - page: docs-content://solutions/observability/streams/management/extract/concat.md
+            title: Concat processor
+          - page: docs-content://solutions/observability/streams/management/extract/join.md
+            title: Join processor
+          - page: docs-content://solutions/observability/streams/management/extract/lowercase.md
+            title: Lowercase processor
+          - page: docs-content://solutions/observability/streams/management/extract/uppercase.md
+            title: Uppercase processor
+          - page: docs-content://solutions/observability/streams/management/extract/trim.md
+            title: Trim processor
+          - page: docs-content://solutions/observability/streams/management/extract/redact.md
+            title: Redact processor
+          - page: docs-content://solutions/observability/streams/management/extract/network-direction.md
+            title: Network direction processor
+          - page: docs-content://solutions/observability/streams/management/extract/manual-pipeline-configuration.md
+            title: Manual pipeline configuration
+        - page: docs-content://solutions/observability/streams/management/streamlang.md
+          title: Streamlang
+        - page: docs-content://solutions/observability/streams/management/partitioning.md
+          title: Partition data into child streams
+        - page: docs-content://solutions/observability/streams/management/schema.md
+          title: Map fields
+        - page: docs-content://solutions/observability/streams/management/data-quality.md
+          title: Manage data quality
+        - page: docs-content://solutions/observability/streams/management/advanced.md
+          title: Configure advanced settings
+        - page: docs-content://solutions/observability/streams/wired-streams.md
+          title: Wired streams
+        - group: Incident management
+          page: docs-content://solutions/observability/incident-management.md
           children:
-          - group: Alerts
-            page: docs-content://explore-analyze/alerting/alerts.md
-            children:
-            - page: docs-content://explore-analyze/alerting/alerts/alerting-getting-started.md
-              title: Getting started with alerts
-            - page: docs-content://explore-analyze/alerting/alerts/alerting-setup.md
-              title: Set up
-            - page: docs-content://explore-analyze/alerting/alerts/create-manage-rules.md
-              title: Create and manage rules
-            - page: docs-content://explore-analyze/alerting/alerts/view-alerts.md
-              title: View and manage alerts
-            - page: docs-content://explore-analyze/alerting/alerts/query-alerts.md
-              title: Query alert indices
-            - group: Rule types
-              page: docs-content://explore-analyze/alerting/alerts/rule-types.md
+          - group: Alerting
+            page: docs-content://solutions/observability/incident-management/alerting.md
+            children:
+            - group: Create and manage rules
+              page: docs-content://solutions/observability/incident-management/create-manage-rules.md
               children:
-              - page: docs-content://explore-analyze/alerting/alerts/rule-type-index-threshold.md
-                title: Index threshold
-              - page: docs-content://explore-analyze/alerting/alerts/rule-type-es-query.md
+              - page: docs-content://solutions/observability/incident-management/create-an-anomaly-detection-rule.md
+                title: Anomaly detection
+              - page: docs-content://solutions/observability/incident-management/create-an-apm-anomaly-rule.md
+                title: APM anomaly
+              - page: docs-content://solutions/observability/incident-management/create-custom-threshold-rule.md
+                title: Custom threshold
+              - page: docs-content://solutions/observability/incident-management/create-a-degraded-docs-rule.md
+                title: Degraded docs
+              - page: docs-content://solutions/observability/incident-management/create-an-elasticsearch-query-rule.md
                 title: Elasticsearch query
-              - page: docs-content://explore-analyze/alerting/alerts/geo-alerting.md
-                title: Tracking containment
-            - page: docs-content://explore-analyze/alerting/alerts/rule-action-variables.md
-              title: Rule action variables
-            - page: docs-content://explore-analyze/alerting/alerts/notifications-domain-allowlist.md
-              title: Notifications domain allowlist
-            - group: Alerting troubleshooting
-              page: docs-content://explore-analyze/alerting/alerts/alerting-troubleshooting.md
-              children:
-              - page: docs-content://explore-analyze/alerting/alerts/alerting-common-issues.md
-                title: Common issues
-              - page: docs-content://explore-analyze/alerting/alerts/event-log-index.md
-                title: Event log index
-              - page: docs-content://explore-analyze/alerting/alerts/testing-connectors.md
-                title: Test connectors
-            - page: docs-content://explore-analyze/alerting/alerts/maintenance-windows.md
-              title: Maintenance windows
-          - group: Watcher
-            page: docs-content://explore-analyze/alerting/watcher.md
-            children:
-            - page: docs-content://explore-analyze/alerting/watcher/watcher-getting-started.md
-              title: Getting started with Watcher
-            - page: docs-content://explore-analyze/alerting/watcher/how-watcher-works.md
-              title: How Watcher works
-            - page: docs-content://explore-analyze/alerting/watcher/enable-watcher.md
-              title: Enable Watcher
-            - page: docs-content://explore-analyze/alerting/watcher/watcher-ui.md
-              title: Watcher UI
-            - page: docs-content://explore-analyze/alerting/watcher/encrypting-data.md
-              title: Encrypting sensitive data in Watcher
-            - group: Input
-              page: docs-content://explore-analyze/alerting/watcher/input.md
-              children:
-              - page: docs-content://explore-analyze/alerting/watcher/input-simple.md
-                title: Simple input
-              - page: docs-content://explore-analyze/alerting/watcher/input-search.md
-                title: Search input
-              - page: docs-content://explore-analyze/alerting/watcher/input-http.md
-                title: HTTP input
-              - page: docs-content://explore-analyze/alerting/watcher/input-chain.md
-                title: Chain input
-            - group: Trigger
-              page: docs-content://explore-analyze/alerting/watcher/trigger.md
-              children:
-              - page: docs-content://explore-analyze/alerting/watcher/trigger-schedule.md
-                title: Schedule trigger
-              - page: docs-content://explore-analyze/alerting/watcher/throttling.md
-                title: Throttling
-              - page: docs-content://explore-analyze/alerting/watcher/schedule-types.md
-                title: Schedule Types
-            - group: Condition
-              page: docs-content://explore-analyze/alerting/watcher/condition.md
-              children:
-              - page: docs-content://explore-analyze/alerting/watcher/condition-always.md
-                title: Always condition
-              - page: docs-content://explore-analyze/alerting/watcher/condition-never.md
-                title: Never condition
-              - page: docs-content://explore-analyze/alerting/watcher/condition-compare.md
-                title: Compare condition
-              - page: docs-content://explore-analyze/alerting/watcher/condition-array-compare.md
-                title: Array compare condition
-              - page: docs-content://explore-analyze/alerting/watcher/condition-script.md
-                title: Script condition
-            - group: Actions
-              page: docs-content://explore-analyze/alerting/watcher/actions.md
-              children:
-              - page: docs-content://explore-analyze/alerting/watcher/action-foreach.md
-                title: Running an action for each element in an array
-              - page: docs-content://explore-analyze/alerting/watcher/action-conditions.md
-                title: Adding conditions to actions
-              - page: docs-content://explore-analyze/alerting/watcher/actions-email.md
-                title: Email action
-              - page: docs-content://explore-analyze/alerting/watcher/actions-webhook.md
-                title: Webhook action
-              - page: docs-content://explore-analyze/alerting/watcher/actions-index.md
-                title: Index action
-              - page: docs-content://explore-analyze/alerting/watcher/actions-logging.md
-                title: Logging action
-              - page: docs-content://explore-analyze/alerting/watcher/actions-slack.md
-                title: Slack action
-              - page: docs-content://explore-analyze/alerting/watcher/actions-pagerduty.md
-                title: PagerDuty action
-              - page: docs-content://explore-analyze/alerting/watcher/actions-jira.md
-                title: Jira action
-            - group: Transform
-              page: docs-content://explore-analyze/alerting/watcher/transform.md
-              children:
-              - page: docs-content://explore-analyze/alerting/watcher/transform-search.md
-                title: Search payload transform
-              - page: docs-content://explore-analyze/alerting/watcher/transform-script.md
-                title: Script payload transform
-              - page: docs-content://explore-analyze/alerting/watcher/transform-chain.md
-                title: Chain payload transform
-            - page: docs-content://explore-analyze/alerting/watcher/managing-watches.md
-              title: Managing watches
-            - group: Example watches
-              page: docs-content://explore-analyze/alerting/watcher/example-watches.md
-              children:
-              - page: docs-content://explore-analyze/alerting/watcher/watch-cluster-status.md
-                title: Watching the status of an Elasticsearch cluster
-              - page: docs-content://explore-analyze/alerting/watcher/execute-watch.md
-                title: Execute a watch
-            - page: docs-content://explore-analyze/alerting/watcher/watcher-limitations.md
-              title: Limitations
-        - group: Cases
-          page: docs-content://explore-analyze/cases.md
-          children:
-          - page: docs-content://explore-analyze/cases/control-case-access.md
-            title: Control access
-          - page: docs-content://explore-analyze/cases/create-cases.md
-            title: Create cases
-          - page: docs-content://explore-analyze/cases/manage-cases.md
-            title: Manage cases
-          - page: docs-content://explore-analyze/cases/attach-objects-to-cases.md
-            title: Attach objects
-          - page: docs-content://explore-analyze/cases/search-share-cases.md
-            title: Search and share
-          - page: docs-content://explore-analyze/cases/configure-case-settings.md
-            title: Configure settings
-          - page: docs-content://explore-analyze/cases/cases-as-data.md
-            title: Cases as data
-    - label: Automate
-      children:
-      - group: Workflows
-        page: docs-content://explore-analyze/workflows.md
-        children:
-        - page: docs-content://explore-analyze/workflows/setup.md
-          title: Set up workflows
-        - page: docs-content://explore-analyze/workflows/get-started.md
-          title: Get started with workflows
-        - group: Core components
-          page: docs-content://explore-analyze/workflows/core-components.md
-          children:
-          - group: Triggers
-            page: docs-content://explore-analyze/workflows/triggers.md
-            children:
-            - page: docs-content://explore-analyze/workflows/triggers/manual-triggers.md
-              title: Manual triggers
-            - page: docs-content://explore-analyze/workflows/triggers/scheduled-triggers.md
-              title: Scheduled triggers
-            - page: docs-content://explore-analyze/workflows/triggers/alert-triggers.md
-              title: Alert triggers
-          - group: Steps
-            page: docs-content://explore-analyze/workflows/steps.md
-            children:
-            - group: Action steps
-              page: docs-content://explore-analyze/workflows/steps/action-steps.md
-              children:
-              - page: docs-content://explore-analyze/workflows/steps/elasticsearch.md
-                title: Elasticsearch
-              - page: docs-content://explore-analyze/workflows/steps/kibana.md
-                title: Kibana
-              - page: docs-content://explore-analyze/workflows/steps/external-systems-apps.md
-                title: External systems and apps
-            - group: Flow control steps
-              page: docs-content://explore-analyze/workflows/steps/flow-control-steps.md
-              children:
-              - page: docs-content://explore-analyze/workflows/steps/if.md
-                title: If
-              - page: docs-content://explore-analyze/workflows/steps/foreach.md
-                title: Foreach
-              - page: docs-content://explore-analyze/workflows/steps/wait.md
-                title: Wait
-            - page: docs-content://explore-analyze/workflows/steps/ai-steps.md
-              title: AI steps
-        - group: Data and error handling
-          page: docs-content://explore-analyze/workflows/data.md
-          children:
-          - page: docs-content://explore-analyze/workflows/data/templating.md
-            title: Templating engine
-        - page: docs-content://explore-analyze/workflows/author-workflows.md
-          title: Author workflows
-        - page: docs-content://explore-analyze/workflows/monitor-troubleshoot.md
-          title: Monitor and troubleshoot workflows
-        - page: docs-content://explore-analyze/workflows/manage-workflows.md
-          title: Manage workflows
-        - page: docs-content://explore-analyze/workflows/templates.md
-          title: Workflow templates
-    - label: AI and machine learning
-      children:
-      - group: Machine Learning and NLP
-        page: docs-content://explore-analyze/machine-learning.md
-        children:
-        - page: docs-content://explore-analyze/machine-learning/setting-up-machine-learning.md
-          title: Setup and security
-        - group: Anomaly detection
-          page: docs-content://explore-analyze/machine-learning/anomaly-detection.md
-          children:
-          - group: Finding anomalies
-            page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-finding-anomalies.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-plan.md
-              title: Plan your analysis
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-run-jobs.md
-              title: Run a job
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-view-results.md
-              title: View the results
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-forecast.md
-              title: Forecast future behavior
-          - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-getting-started.md
-            title: Tutorial
-          - group: Concepts
-            page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-concepts.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-algorithms.md
-              title: Anomaly detection algorithms
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-explain.md
-              title: Anomaly score explanation
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-anomaly-detection-job-types.md
-              title: Job types
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/anomaly-detection-scale.md
-              title: Working with anomaly detection at scale
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-delayed-data-detection.md
-              title: Handling delayed data
-          - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-api-quickref.md
-            title: API quick reference
-          - group: How-tos
-            page: docs-content://explore-analyze/machine-learning/anomaly-detection/anomaly-how-tos.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-alerts.md
-              title: Generating alerts for anomaly detection jobs
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-aggregation.md
-              title: Aggregating data for faster performance
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-transform.md
-              title: Altering data in your datafeed with runtime fields
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-detector-custom-rules.md
-              title: Customizing detectors with custom rules
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-categories.md
-              title: Detecting anomalous categories of data
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-populations.md
-              title: Performing population analysis
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-reverting-model-snapshot.md
-              title: Reverting to a model snapshot
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/geographic-anomalies.md
-              title: Detecting anomalous locations in geographic data
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/mapping-anomalies.md
-              title: Mapping anomalies by location
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-configuring-url.md
-              title: Adding custom URLs to machine learning results
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-jobs-from-lens.md
-              title: Anomaly detection jobs from visualizations
-          - group: Resources
-            page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-resources.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-limitations.md
-              title: Limitations
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-functions.md
-              title: Analysis function reference
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ootb-ml-jobs.md
-              title: Supplied configurations
-            - page: docs-content://explore-analyze/machine-learning/anomaly-detection/ml-ad-troubleshooting.md
-              title: Troubleshooting and FAQ
-        - group: Data frame analytics
-          page: docs-content://explore-analyze/machine-learning/data-frame-analytics.md
-          children:
-          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-overview.md
-            title: Overview
-          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-finding-outliers.md
-            title: Finding outliers
-          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-regression.md
-            title: Predicting numerical values with regression
-          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-classification.md
-            title: Predicting classes with classification
-          - group: Concepts
-            page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-concepts.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-phases.md
-              title: How data frame analytics jobs work
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-scale.md
-              title: Working with data frame analytics at scale
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-custom-urls.md
-              title: Adding custom URLs to data frame analytics jobs
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-encoding.md
-              title: Feature encoding
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-processors.md
-              title: Feature processors
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-feature-importance.md
-              title: Feature importance
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/dfa-regression-lossfunction.md
-              title: Loss functions for regression analyses
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/hyperparameters.md
-              title: Hyperparameter optimization
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-trained-models.md
-              title: Trained models
-          - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfanalytics-apis.md
-            title: API quick reference
-          - group: Resources
-            page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-resources.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/data-frame-analytics/ml-dfa-limitations.md
-              title: Limitations
-        - group: NLP
-          page: docs-content://explore-analyze/machine-learning/nlp.md
-          children:
-          - group: Overview
-            page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-overview.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-extract-info.md
-              title: Extract information
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-classify-text.md
-              title: Classify text
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-search-compare.md
-              title: Search and compare text
-          - group: Deploy models
-            page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-deploy-models.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-select-model.md
-              title: Select a trained model
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-import-model.md
-              title: Import the trained model and vocabulary
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-deploy-model.md
-              title: Deploy the model in your cluster
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-test-inference.md
-              title: Try it out
-          - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-inference.md
-            title: Add NLP inference to ingest pipelines
-          - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-apis.md
-            title: API quick reference
-          - group: Built-in models
-            page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-built-in-models.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-elser.md
-              title: ELSER
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-jina.md
-              title: Jina
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-rerank.md
-              title: Elastic Rerank
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-e5.md
-              title: E5
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-lang-ident.md
-              title: Language identification
-          - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-model-ref.md
-            title: Compatible third party models
-          - group: Examples
-            page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-examples.md
-            children:
-            - page: docs-content://explore-analyze/machine-learning/nlp/nlp-end-to-end-tutorial.md
-              title: End-to-end tutorial
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-ner-example.md
-              title: Named entity recognition
-            - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-text-emb-vector-search-example.md
-              title: Text embedding and semantic search
-          - page: docs-content://explore-analyze/machine-learning/nlp/ml-nlp-limitations.md
-            title: Limitations
-        - group: Machine learning in Kibana
-          page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana.md
-          children:
-          - page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-aiops.md
-            title: AIOps Labs
-          - page: docs-content://explore-analyze/machine-learning/machine-learning-in-kibana/inference-processing.md
-            title: Inference processing
-      - group: Agent builder
-        page: docs-content://explore-analyze/ai-features/elastic-agent-builder.md
-        children:
-        - page: docs-content://explore-analyze/ai-features/agent-builder/get-started.md
-          title: Get started
-        - page: docs-content://explore-analyze/ai-features/agent-builder/models.md
-          title: Models
-        - group: Chat
-          page: docs-content://explore-analyze/ai-features/agent-builder/chat.md
-          children:
-          - page: docs-content://explore-analyze/ai-features/agent-builder/standalone-and-flyout-modes.md
-            title: Chat UI modes
-        - group: Agents
-          page: docs-content://explore-analyze/ai-features/agent-builder/agent-builder-agents.md
-          children:
-          - page: docs-content://explore-analyze/ai-features/agent-builder/custom-agents.md
-            title: Custom agents
-          - page: docs-content://explore-analyze/ai-features/agent-builder/builtin-agents-reference.md
-            title: Built-in agents
-          - page: docs-content://explore-analyze/ai-features/agent-builder/prompt-engineering.md
-            title: Prompting best practices
-          - page: docs-content://explore-analyze/ai-features/agent-builder/agents-and-workflows.md
-            title: Call agents from workflows
-        - group: Tools
-          page: docs-content://explore-analyze/ai-features/agent-builder/tools.md
-          children:
-          - page: docs-content://explore-analyze/ai-features/agent-builder/tools/builtin-tools-reference.md
-            title: Built-in tools
-          - group: Custom tools
-            page: docs-content://explore-analyze/ai-features/agent-builder/tools/custom-tools.md
-            children:
-            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/esql-tools.md
-              title: "ES|QL tools"
-            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/index-search-tools.md
-              title: Index search tools
-            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/mcp-tools.md
-              title: MCP tools
-            - page: docs-content://explore-analyze/ai-features/agent-builder/tools/workflow-tools.md
-              title: Workflow tools
-        - group: Programmatic access
-          page: docs-content://explore-analyze/ai-features/agent-builder/programmatic-access.md
-          children:
-          - group: Kibana API
-            page: docs-content://explore-analyze/ai-features/agent-builder/kibana-api.md
-            children:
-            - page: docs-content://explore-analyze/ai-features/agent-builder/agent-builder-api-tutorial.md
-              title: Kibana API tutorial
-          - page: docs-content://explore-analyze/ai-features/agent-builder/a2a-server.md
-            title: A2A server
-          - page: docs-content://explore-analyze/ai-features/agent-builder/mcp-server.md
-            title: MCP server
-        - page: docs-content://explore-analyze/ai-features/agent-builder/monitor-usage.md
-          title: Monitor token usage
-        - page: docs-content://explore-analyze/ai-features/agent-builder/permissions.md
-          title: Permissions
-        - group: Troubleshooting
-          page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting.md
-          children:
-          - page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting/context-length-exceeded.md
-            title: Context length exceeded
-          - page: docs-content://explore-analyze/ai-features/agent-builder/troubleshooting/api-calls-return-403-forbidden.md
-            title: 403 Forbidden
-        - page: docs-content://explore-analyze/ai-features/agent-builder/limitations-known-issues.md
-          title: Limitations
-      - group: Elastic Inference Service
-        page: docs-content://explore-analyze/elastic-inference.md
-        children:
-        - group: Elastic Inference Service
-          page: docs-content://explore-analyze/elastic-inference/eis.md
-          children:
-          - page: docs-content://explore-analyze/elastic-inference/connect-self-managed-cluster-to-eis.md
-            title: EIS for self-managed clusters
-        - page: docs-content://explore-analyze/elastic-inference/inference-api.md
-          title: Inference integrations
-      - group: AI chat and LLM configuration
-        page: docs-content://explore-analyze/ai-features.md
-        children:
-        - group: AI chat experiences
-          page: docs-content://explore-analyze/ai-features/ai-chat-experiences.md
-          children:
-          - page: docs-content://explore-analyze/ai-features/ai-chat-experiences/ai-agent-or-ai-assistant.md
-            title: Compare Agent Builder and AI Assistant
-          - page: docs-content://explore-analyze/ai-features/ai-chat-experiences/ai-assistant.md
-            title: AI assistants
-        - group: LLM providers
-          page: docs-content://explore-analyze/ai-features/llm-guides/llm-connectors.md
-          children:
-          - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-azure-openai.md
-            title: Connect to Azure OpenAI
-          - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-amazon-bedrock.md
-            title: Connect to Amazon Bedrock
-          - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-openai.md
-            title: Connect to OpenAI
-          - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-google-vertex.md
-            title: Connect to Google Vertex
-          - group: Local LLMs
-            page: docs-content://explore-analyze/ai-features/llm-guides/local-llms-overview.md
-            children:
-            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-lmstudio-observability.md
-              title: Connect to LM Studio for Observability
-            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-lmstudio-security.md
-              title: Connect to LM Studio for Elastic Security
-            - page: docs-content://explore-analyze/ai-features/llm-guides/connect-to-vLLM.md
-              title: Connect to vLLM for Elastic Security
-        - page: docs-content://explore-analyze/ai-features/manage-access-to-ai-assistant.md
-          title: Manage access to AI features
-      - page: docs-content://explore-analyze/ai-features/agent-skills.md
-        title: AI agent skills for Elastic
-  - label: Solutions and project types
-    children:
-    - page: docs-content://solutions/index.md
-      title: Solutions overview
-    - group: Elasticsearch solution
-      page: docs-content://solutions/elasticsearch-solution-project.md
-      children:
-      - group: Get started
-        page: docs-content://solutions/elasticsearch-solution-project/get-started.md
-        children:
-        - page: docs-content://solutions/elasticsearch-solution-project/search-connection-details.md
-          title: Find connection details
-      - group: Playground
-        page: docs-content://solutions/elasticsearch-solution-project/playground.md
-        children:
-        - page: docs-content://solutions/elasticsearch-solution-project/playground-context.md
-          title: Optimize model context
-        - page: docs-content://solutions/elasticsearch-solution-project/playground-query.md
-          title: View and modify queries
-        - page: docs-content://solutions/elasticsearch-solution-project/playground-troubleshooting.md
-          title: Troubleshooting
-      - page: docs-content://solutions/elasticsearch-solution-project/ai-assistant.md
-        title: AI Assistant
-      - page: docs-content://solutions/elasticsearch-solution-project/query-rules-ui.md
-        title: Query rules UI
-      - group: Search Applications
-        page: docs-content://solutions/elasticsearch-solution-project/search-applications.md
-        children:
-        - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-api.md
-          title: Search API and templates
-        - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-security.md
-          title: Security
-        - page: docs-content://solutions/elasticsearch-solution-project/search-applications/search-application-client.md
-          title: Search Application client guide
-      - page: docs-content://solutions/elasticsearch-solution-project/es-serverless-add-ons.md
-        title: Add-ons
-    - group: Observability solution
-      page: docs-content://solutions/observability.md
-      children:
-      - group: Get started
-        page: docs-content://solutions/observability/get-started.md
-        children:
-        - group: Elastic Observability quickstarts
-          page: docs-content://solutions/observability/get-started/quickstarts.md
-          children:
-          - page: docs-content://solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md
-            title: "Quickstart: Monitor hosts with OpenTelemetry"
-          - page: docs-content://solutions/observability/get-started/quickstart-monitor-your-application-performance.md
-            title: "Quickstart: Monitor your application performance"
-          - page: docs-content://solutions/observability/get-started/quickstart-unified-kubernetes-observability-with-elastic-distributions-of-opentelemetry-edot.md
-            title: "Quickstart: Unified Kubernetes Observability with Elastic Distributions of OpenTelemetry (EDOT)"
-          - page: docs-content://solutions/observability/get-started/quickstart-elastic-cloud-otel-endpoint.md
-            title: "Quickstart: Send OTLP data to Elastic Serverless or Elastic Cloud Hosted"
-          - page: docs-content://solutions/observability/get-started/quickstart-create-synthetic-monitor.md
-            title: "Quickstart: Create a Synthetic Monitor"
-          - page: docs-content://solutions/observability/get-started/quickstart-monitor-hosts-with-elastic-agent.md
-            title: "Quickstart: Monitor hosts with Elastic Agent"
-          - page: docs-content://solutions/observability/get-started/quickstart-monitor-kubernetes-cluster-with-elastic-agent.md
-            title: "Quickstart: Monitor your Kubernetes cluster with Elastic Agent"
-          - page: docs-content://solutions/observability/get-started/quickstart-collect-data-with-aws-firehose.md
-            title: "Quickstart: Collect data with AWS Firehose"
-        - group: OpenTelemetry quickstarts
-          page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/index.md
-          children:
-          - page: docs-content://solutions/observability/get-started/opentelemetry/custom-metrics-quickstart.md
-            title: Ingest custom metrics with EDOT
-          - group: Self-managed
-            page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/index.md
-            children:
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/k8s.md
-              title: Kubernetes
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/hosts_vms.md
-              title: Hosts / VMs
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/docker.md
-              title: Docker
-          - group: Elastic Cloud Serverless
-            page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/index.md
-            children:
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/k8s.md
-              title: Kubernetes
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/hosts_vms.md
-              title: Hosts and VMs
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/serverless/docker.md
-              title: Docker
-          - group: Elastic Cloud Hosted
-            page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/index.md
-            children:
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/k8s.md
-              title: Kubernetes
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/hosts_vms.md
-              title: Hosts and VMs
-            - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/ech/docker.md
-              title: Docker
-        - group: OpenTelemetry use cases
-          page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/index.md
-          children:
-          - group: Kubernetes observability
-            page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/index.md
-            children:
-            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/prerequisites-compatibility.md
-              title: Prerequisites and compatibility
-            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/components.md
-              title: Components description
-            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/deployment.md
-              title: Deployment
-            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/instrumenting-applications.md
-              title: Instrumenting Applications
-            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/upgrade.md
-              title: Upgrade
-            - page: docs-content://solutions/observability/get-started/opentelemetry/use-cases/kubernetes/customization.md
-              title: Customization
-        - group: Other Observability tutorials
-          page: docs-content://solutions/observability/get-started/other-tutorials/index.md
-          children:
-          - page: docs-content://solutions/observability/get-started/other-tutorials/tutorial-monitor-java-application.md
-            title: "Tutorial: Monitor a Java application"
-        - page: docs-content://solutions/observability/get-started/logs-essentials.md
-          title: Logs Essentials
-      - group: Applications and services
-        page: docs-content://solutions/observability/applications/index.md
-        children:
-        - group: Application performance monitoring (APM)
-          page: docs-content://solutions/observability/apm/index.md
-          children:
-          - page: docs-content://solutions/observability/apm/get-started.md
-            title: Get started with traces and APM
-          - group: Application data types
-            page: docs-content://solutions/observability/apm/data-types.md
-            children:
-            - page: docs-content://solutions/observability/apm/spans.md
-              title: Spans
-            - group: Transactions
-              page: docs-content://solutions/observability/apm/transactions.md
-              children:
-              - page: docs-content://solutions/observability/apm/transaction-sampling.md
-                title: Transaction sampling
-            - page: docs-content://solutions/observability/apm/traces.md
-              title: Traces
-            - page: docs-content://solutions/observability/apm/errors.md
-              title: Errors
-            - page: docs-content://solutions/observability/apm/metrics.md
-              title: Metrics
-            - page: docs-content://solutions/observability/apm/metadata.md
-              title: Metadata
-          - group: Collect application data
-            page: docs-content://solutions/observability/apm/ingest/index.md
-            children:
-            - group: OpenTelemetry
-              page: docs-content://solutions/observability/apm/opentelemetry/index.md
-              children:
-              - page: docs-content://solutions/observability/apm/opentelemetry/upstream-opentelemetry-collectors-language-sdks.md
-                title: Contrib OpenTelemetry Collectors and language SDKs
-              - page: docs-content://solutions/observability/apm/opentelemetry/collect-metrics.md
-                title: Collect metrics
-              - page: docs-content://solutions/observability/apm/opentelemetry/create-apm-agent-key-for-edot-sdks.md
-                title: Create APM agent key for EDOT SDKs
-              - page: docs-content://solutions/observability/apm/opentelemetry/edot-sdks-central-configuration.md
-                title: Centrally configure EDOT SDKs
-              - page: docs-content://solutions/observability/apm/opentelemetry/limitations.md
-                title: Limitations
-              - page: docs-content://solutions/observability/apm/opentelemetry/attributes.md
-                title: Attributes and labels
-              - page: docs-content://solutions/observability/apm/opentelemetry/data-stream-routing.md
-                title: Data stream routing
-            - group: APM agents
-              page: docs-content://solutions/observability/apm/apm-agents/index.md
-              children:
-              - page: docs-content://solutions/observability/apm/apm-agents/central-configuration.md
-                title: Centrally configure APM agents
-              - page: docs-content://solutions/observability/apm/apm-agents/real-user-monitoring-rum.md
-                title: Real User Monitoring (RUM)
-              - page: docs-content://solutions/observability/apm/apm-agents/create-upload-source-maps-rum.md
-                title: Create and upload source maps (RUM)
-            - page: docs-content://solutions/observability/apm/ingest/apm-k8s-attacher.md
-              title: Kubernetes
-            - page: docs-content://solutions/observability/apm/ingest/monitor-aws-lambda-functions.md
-              title: AWS Lambda Functions
-            - page: docs-content://solutions/observability/apm/ingest/jaeger.md
-              title: Jaeger (deprecated)
-          - group: View and analyze data
-            page: docs-content://solutions/observability/apm/view-analyze-data.md
-            children:
-            - group: Overviews
-              page: docs-content://solutions/observability/apm/overviews.md
-              children:
-              - page: docs-content://solutions/observability/apm/services.md
-                title: Services
-              - page: docs-content://solutions/observability/apm/traces-ui.md
-                title: Traces UI
-              - page: docs-content://solutions/observability/apm/dependencies.md
-                title: Dependencies
-              - page: docs-content://solutions/observability/apm/service-map.md
-                title: Service Map
-              - page: docs-content://solutions/observability/apm/service-overview.md
-                title: Service overview
-              - page: docs-content://solutions/observability/apm/mobile-service-overview.md
-                title: Mobile service overview
-            - group: Drill down into data
-              page: docs-content://solutions/observability/apm/drill-down-into-data.md
-              children:
-              - page: docs-content://solutions/observability/apm/transactions-ui.md
-                title: Transactions UI
-              - page: docs-content://solutions/observability/apm/trace-sample-timeline.md
-                title: Trace sample timeline
-              - page: docs-content://solutions/observability/apm/errors-ui.md
-                title: Errors UI
-              - page: docs-content://solutions/observability/apm/metrics-ui.md
-                title: Metrics UI
-              - page: docs-content://solutions/observability/apm/infrastructure.md
-                title: Infrastructure
-              - page: docs-content://solutions/observability/apm/logs.md
-                title: Logs
-            - group: Filter and search data
-              page: docs-content://solutions/observability/apm/filter-search-data.md
-              children:
-              - page: docs-content://solutions/observability/apm/filter-data.md
-                title: Filters
-              - page: docs-content://solutions/observability/apm/advanced-queries.md
-                title: Advanced queries
-              - page: docs-content://solutions/observability/apm/cross-cluster-search.md
-                title: Cross-cluster search
-            - group: Interpret data
-              page: docs-content://solutions/observability/apm/interpret-data.md
-              children:
-              - page: docs-content://solutions/observability/apm/find-transaction-latency-failure-correlations.md
-                title: Find transaction latency and failure correlations
-              - page: docs-content://solutions/observability/apm/track-deployments-with-annotations.md
-                title: Track deployments with annotations
-              - page: docs-content://solutions/observability/apm/explore-mobile-sessions.md
-                title: Explore mobile sessions with Discover
-              - page: docs-content://solutions/observability/apm/observe-lambda-functions.md
-                title: Observe Lambda functions
-            - page: docs-content://solutions/observability/apm/machine-learning.md
-              title: Integrate with machine learning
-            - page: docs-content://solutions/observability/apm/apm-agent-explorer.md
-              title: APM Agent explorer
-            - page: docs-content://solutions/observability/apm/applications-ui-settings.md
-              title: Settings
-          - group: Act on data
-            page: docs-content://solutions/observability/apm/act-on-data.md
-            children:
-            - page: docs-content://solutions/observability/apm/create-apm-rules-alerts.md
-              title: Create rules and alerts
-            - page: docs-content://solutions/observability/apm/create-custom-links.md
-              title: Create custom links
-          - group: Use APM securely
-            page: docs-content://solutions/observability/apm/use-apm-securely.md
-            children:
-            - group: Secure data
-              page: docs-content://solutions/observability/apm/secure-data.md
-              children:
-              - page: docs-content://solutions/observability/apm/control-access-to-apm-data.md
-                title: Control access to APM data
-              - page: docs-content://solutions/observability/apm/built-in-data-filters.md
-                title: Built-in data filters
-              - page: docs-content://solutions/observability/apm/custom-filters.md
-                title: Custom filters
-              - page: docs-content://solutions/observability/apm/delete-sensitive-data.md
-                title: Delete sensitive data
-            - group: Secure communication with APM agents
-              page: docs-content://solutions/observability/apm/secure-communication-with-apm-agents.md
-              children:
-              - page: docs-content://solutions/observability/apm/apm-agent-tls-communication.md
-                title: APM agent TLS communication
-              - page: docs-content://solutions/observability/apm/api-keys.md
-                title: API keys
-              - page: docs-content://solutions/observability/apm/secret-token.md
-                title: Secret token
-              - page: docs-content://solutions/observability/apm/anonymous-authentication.md
-                title: Anonymous authentication
-            - group: Secure communication with the Elastic Stack
-              page: docs-content://solutions/observability/apm/secure-communication-with-elastic-stack.md
-              children:
-              - page: docs-content://solutions/observability/apm/create-assign-feature-roles-to-apm-server-users.md
-                title: Use feature roles
-              - page: docs-content://solutions/observability/apm/grant-access-using-api-keys.md
-                title: Grant access using API keys
-            - group: Secure access to the Applications UI
-              page: docs-content://solutions/observability/apm/secure-access-to-applications-ui.md
-              children:
-              - page: docs-content://solutions/observability/apm/ui-user-reader.md
-                title: Create an APM reader user
-              - page: docs-content://solutions/observability/apm/ui-user-annotation.md
-                title: Create an annotation user
-              - page: docs-content://solutions/observability/apm/ui-user-api.md
-                title: Create an API user
-              - page: docs-content://solutions/observability/apm/ui-user-central-config.md
-                title: Create a central config user
-              - page: docs-content://solutions/observability/apm/ui-user-storage-explorer.md
-                title: Create a storage explorer user
-          - group: Manage storage
-            page: docs-content://solutions/observability/apm/manage-storage.md
-            children:
-            - page: docs-content://solutions/observability/apm/storage-explorer.md
-              title: Storage Explorer
-            - page: docs-content://solutions/observability/apm/data-streams.md
-              title: Data streams
-            - page: docs-content://solutions/observability/apm/index-lifecycle-management.md
-              title: Index lifecycle management
-            - page: docs-content://solutions/observability/apm/view-elasticsearch-index-template.md
-              title: View the Elasticsearch index template
-            - page: docs-content://solutions/observability/apm/parse-data-using-ingest-pipelines.md
-              title: Parse data using ingest pipelines
-            - page: docs-content://solutions/observability/apm/storage-sizing-guide.md
-              title: Storage and sizing guide
-            - page: docs-content://solutions/observability/apm/reduce-storage.md
-              title: Reduce storage
-            - page: docs-content://solutions/observability/apm/explore-data-in-elasticsearch.md
-              title: Explore data in Elasticsearch
-          - group: "Work with APM Server"
-            page: docs-content://solutions/observability/apm/apm-server/index.md
-            children:
-            - group: Set up
-              page: docs-content://solutions/observability/apm/apm-server/setup.md
-              children:
-              - page: docs-content://solutions/observability/apm/apm-server/fleet-managed.md
-                title: Fleet-managed APM Server
-              - page: docs-content://solutions/observability/apm/apm-server/binary.md
-                title: APM Server binary
-            - group: Configure
-              page: docs-content://solutions/observability/apm/apm-server/configure.md
-              children:
-              - page: docs-content://solutions/observability/apm/apm-server/general-configuration-options.md
-                title: General configuration options
-              - page: docs-content://solutions/observability/apm/apm-server/configure-anonymous-authentication.md
-                title: Anonymous authentication
-              - page: docs-content://solutions/observability/apm/apm-server/apm-agent-authorization.md
-                title: APM agent authorization
-              - page: docs-content://solutions/observability/apm/apm-server/apm-agent-central-configuration.md
-                title: Configure APM Agent Central Configuration
-              - page: docs-content://solutions/observability/apm/apm-server/configure-apm-instrumentation.md
-                title: Instrumentation
-              - page: docs-content://solutions/observability/apm/apm-server/configure-kibana-endpoint.md
-                title: Kibana endpoint
-              - page: docs-content://solutions/observability/apm/apm-server/configure-logging.md
-                title: Logging
-              - group: Output
-                page: docs-content://solutions/observability/apm/apm-server/configure-output.md
-                children:
-                - page: docs-content://solutions/observability/apm/apm-server/configure-output-for-elasticsearch-service-on-elastic-cloud.md
-                  title: Elastic Cloud Hosted
-                - page: docs-content://solutions/observability/apm/apm-server/configure-elasticsearch-output.md
-                  title: Elasticsearch
-                - page: docs-content://solutions/observability/apm/apm-server/configure-logstash-output.md
-                  title: "Logstash"
-                - page: docs-content://solutions/observability/apm/apm-server/configure-kafka-output.md
-                  title: Kafka
-                - page: docs-content://solutions/observability/apm/apm-server/configure-redis-output.md
-                  title: Redis
-                - page: docs-content://solutions/observability/apm/apm-server/configure-console-output.md
-                  title: Console
-              - page: docs-content://solutions/observability/apm/apm-server/configure-project-paths.md
-                title: Project paths
-              - page: docs-content://solutions/observability/apm/apm-server/configure-real-user-monitoring-rum.md
-                title: Real User Monitoring (RUM)
-              - group: SSL/TLS settings
-                page: docs-content://solutions/observability/apm/apm-server/ssl-tls-settings.md
-                children:
-                - page: docs-content://solutions/observability/apm/apm-server/ssl-tls-output-settings.md
-                  title: SSL/TLS output settings
-                - page: docs-content://solutions/observability/apm/apm-server/ssl-tls-input-settings.md
-                  title: SSL/TLS input settings
-              - page: docs-content://solutions/observability/apm/apm-server/tail-based-sampling.md
-                title: Tail-based sampling
-              - page: docs-content://solutions/observability/apm/apm-server/use-environment-variables-in-configuration.md
-                title: Use environment variables in the configuration
-              - group: Advanced setup
-                page: docs-content://solutions/observability/apm/apm-server/advanced-setup.md
-                children:
-                - page: docs-content://solutions/observability/apm/apm-server/installation-layout.md
-                  title: Installation layout
-                - page: docs-content://solutions/observability/apm/apm-server/secrets-keystore-for-secure-settings.md
-                  title: Secrets keystore
-                - page: docs-content://solutions/observability/apm/apm-server/command-reference.md
-                  title: Command reference
-                - page: docs-content://solutions/observability/apm/apm-server/tune-data-ingestion.md
-                  title: Tune data ingestion
-                - page: docs-content://solutions/observability/apm/apm-server/high-availability.md
-                  title: High Availability
-                - page: docs-content://solutions/observability/apm/apm-server/systemd.md
-                  title: APM Server and systemd
-            - group: Monitor
-              page: docs-content://solutions/observability/apm/apm-server/monitor.md
-              children:
-              - page: docs-content://solutions/observability/apm/apm-server/monitor-fleet-managed.md
-                title: Fleet-managed
-              - group: APM Server binary
-                page: docs-content://solutions/observability/apm/apm-server/monitor-binary.md
-                children:
-                - page: docs-content://solutions/observability/apm/apm-server/use-internal-collection-to-send-monitoring-data.md
-                  title: Use internal collection
-                - page: docs-content://solutions/observability/apm/apm-server/use-metricbeat-to-send-monitoring-data.md
-                  title: "Use Metricbeat collection"
-                - page: docs-content://solutions/observability/apm/apm-server/use-select-metrics-emitted-directly-to-monitoring-cluster.md
-                  title: Use local collection
-          - group: APM APIs
-            page: docs-content://solutions/observability/apm/apis.md
-            children:
-            - page: docs-content://solutions/observability/apm/apm-ui-api.md
-              title: APM UI API
-            - group: "APM Server API"
-              page: docs-content://solutions/observability/apm/apm-server/api.md
-              children:
-              - page: docs-content://solutions/observability/apm/apm-server/information-api.md
-                title: APM Server information API
-              - page: docs-content://solutions/observability/apm/elastic-apm-events-intake-api.md
-                title: Elastic APM events intake API
-              - page: docs-content://solutions/observability/apm/elastic-apm-agent-configuration-api.md
-                title: Elastic APM agent configuration API
-              - page: docs-content://solutions/observability/apm/opentelemetry-intake-api.md
-                title: OpenTelemetry intake API
-              - page: docs-content://solutions/observability/apm/jaeger-event-intake.md
-                title: Jaeger event intake
-            - page: docs-content://solutions/observability/apm/managed-intake-service-event-api.md
-              title: Managed intake service event API
-          - group: Upgrade
-            page: docs-content://solutions/observability/apm/upgrade.md
-            children:
-            - page: docs-content://solutions/observability/apm/apm-agent-compatibility.md
-              title: APM agent compatibility
-            - group: "Upgrade to version 9.0 [apm-upgrading-to-9.0]"
-              page: docs-content://solutions/observability/apm/upgrade-to-version-9.md
-              children:
-              - page: docs-content://solutions/observability/apm/upgrade-self-installation-of-apm-server-standalone-to-9.md
-                title: Self-installation standalone
-              - page: docs-content://solutions/observability/apm/upgrade-self-installation-of-apm-integration-to-9.md
-                title: Self-installation APM integration
-              - page: docs-content://solutions/observability/apm/upgrade-elastic-cloud-apm-server-standalone-to-9.md
-                title: "Elastic Cloud standalone"
-              - page: docs-content://solutions/observability/apm/upgrade-elastic-cloud-with-apm-integration-to-9.md
-                title: "Elastic Cloud APM integration"
-            - group: Switch to the Elastic APM integration
-              page: docs-content://solutions/observability/apm/switch-to-elastic-apm-integration.md
-              children:
-              - page: docs-content://solutions/observability/apm/switch-self-installation-to-apm-integration.md
-                title: Switch a self-installation
-              - page: docs-content://solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md
-                title: "Switch an Elastic Cloud cluster"
-        - group: Synthetic monitoring
-          page: docs-content://solutions/observability/synthetics/index.md
-          children:
-          - group: Get started
-            page: docs-content://solutions/observability/synthetics/get-started.md
-            children:
-            - page: docs-content://solutions/observability/synthetics/create-monitors-with-projects.md
-              title: Use a Synthetics project
-            - page: docs-content://solutions/observability/synthetics/create-monitors-ui.md
-              title: Use the Synthetics UI
-          - group: Scripting browser monitors
-            page: docs-content://solutions/observability/synthetics/scripting-browser-monitors.md
-            children:
-            - page: docs-content://solutions/observability/synthetics/write-synthetic-test.md
-              title: Write a synthetic test
-            - page: docs-content://solutions/observability/synthetics/configure-individual-browser-monitors.md
-              title: Configure individual monitors
-            - page: docs-content://solutions/observability/synthetics/use-synthetics-recorder.md
-              title: Use the Synthetics Recorder
-          - page: docs-content://solutions/observability/synthetics/configure-lightweight-monitors.md
-            title: Configure lightweight monitors
-          - page: docs-content://solutions/observability/synthetics/manage-monitors.md
-            title: Manage monitors
-          - page: docs-content://solutions/observability/synthetics/work-with-params-secrets.md
-            title: Work with params and secrets
-          - page: docs-content://solutions/observability/synthetics/analyze-data.md
-            title: Analyze monitor data
-          - page: docs-content://solutions/observability/synthetics/monitor-resources-on-private-networks.md
-            title: Monitor resources on private networks
-          - page: docs-content://solutions/observability/synthetics/cli.md
-            title: Use the CLI
-          - page: docs-content://solutions/observability/synthetics/configure-projects.md
-            title: Configure a Synthetics project
-          - page: docs-content://solutions/observability/synthetics/mfa-for-browser-monitors.md
-            title: Multi-factor Authentication
-          - page: docs-content://solutions/observability/synthetics/configure-settings.md
-            title: Configure Synthetics settings
-          - group: Grant users access to secured resources
-            page: docs-content://solutions/observability/synthetics/grant-access-to-secured-resources.md
-            children:
-            - page: docs-content://solutions/observability/synthetics/setup-role.md
-              title: Setup role
-            - page: docs-content://solutions/observability/synthetics/writer-role.md
-              title: Writer role
-            - page: docs-content://solutions/observability/synthetics/reader-role.md
-              title: Reader role
-          - page: docs-content://solutions/observability/synthetics/manage-data-retention.md
-            title: Manage data retention
-          - page: docs-content://solutions/observability/synthetics/network-security.md
-            title: Use Synthetics with network security
-          - page: docs-content://solutions/observability/synthetics/migrate-from-elastic-synthetics-integration.md
-            title: Migrate from the Elastic Synthetics integration
-          - page: docs-content://solutions/observability/synthetics/scale-architect-synthetics-deployment.md
-            title: Scale and architect a deployment
-          - page: docs-content://solutions/observability/synthetics/support-matrix.md
-            title: Synthetics support matrix
-          - page: docs-content://solutions/observability/synthetics/encryption-security.md
-            title: Synthetics Encryption and Security
-        - group: Real user monitoring
-          page: docs-content://solutions/observability/applications/user-experience.md
-          children:
-          - page: docs-content://solutions/observability/applications/otel-rum.md
-            title: OpenTelemetry for Real User Monitoring (RUM)
-        - page: docs-content://solutions/observability/applications/llm-observability.md
-          title: LLM and agentic AI observability
-        - group: Uptime monitoring (deprecated)
-          page: docs-content://solutions/observability/uptime/index.md
-          children:
-          - page: docs-content://solutions/observability/uptime/get-started.md
-            title: Get started
-          - group: Analyze
-            page: docs-content://solutions/observability/uptime/analyze.md
-            children:
-            - page: docs-content://solutions/observability/uptime/view-monitor-status.md
-              title: View monitor status
-            - page: docs-content://solutions/observability/uptime/analyze-monitors.md
-              title: Analyze monitors
-            - page: docs-content://solutions/observability/uptime/inspect-duration-anomalies.md
-              title: Inspect uptime duration anomalies
-          - page: docs-content://solutions/observability/uptime/configure-settings.md
-            title: Configure settings
-        - page: docs-content://solutions/observability/otlp-visualize.md
-          title: Visualize OpenTelemetry data
-      - page: docs-content://solutions/observability/cicd.md
-        title: CI/CD
-      - group: Cloud
-        page: docs-content://solutions/observability/cloud.md
-        children:
-        - group: AWS
-          page: docs-content://solutions/observability/cloud/amazon-web-services-aws-monitoring.md
-          children:
-          - page: docs-content://solutions/observability/cloud/ingestion-options.md
-            title: Ingestion options
-          - group: "Monitor AWS with Elastic Agent"
-            page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-agent.md
-            children:
-            - page: docs-content://solutions/observability/cloud/monitor-amazon-cloud-compute-ec2.md
-              title: EC2
-            - page: docs-content://solutions/observability/cloud/monitor-amazon-kinesis-data-streams.md
-              title: Kinesis data streams
-            - page: docs-content://solutions/observability/cloud/monitor-amazon-simple-storage-service-s3.md
-              title: S3
-            - page: docs-content://solutions/observability/cloud/monitor-amazon-simple-queue-service-sqs.md
-              title: SQS
-          - page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md
-            title: "Monitor AWS with Beats"
-          - group: "Monitor AWS with Amazon Data Firehose"
-            page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-amazon-data-firehose.md
-            children:
-            - page: docs-content://solutions/observability/cloud/monitor-virtual-private-cloud-vpc-flow-logs.md
-              title: VPC Flow Logs
-            - page: docs-content://solutions/observability/cloud/monitor-cloudtrail-logs.md
-              title: CloudTrail logs
-            - page: docs-content://solutions/observability/cloud/monitor-aws-network-firewall-logs.md
-              title: Network Firewall logs
-            - page: docs-content://solutions/observability/cloud/monitor-web-application-firewall-waf-logs.md
-              title: WAF logs
-            - page: docs-content://solutions/observability/cloud/monitor-cloudwatch-logs.md
-              title: CloudWatch logs
-          - page: docs-content://solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-serverless-forwarder.md
-            title: "Monitor AWS with Elastic Serverless Forwarder"
-        - group: Azure
-          page: docs-content://solutions/observability/cloud/azure-monitoring.md
-          children:
-          - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-elastic-agent.md
-            title: Monitor Microsoft Azure with Elastic Agent
-          - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-beats.md
-            title: Monitor Microsoft Azure with Beats
-          - page: docs-content://solutions/observability/cloud/multi-tenant-data-ingestion-with-beats.md
-            title: Ingest multi-tenant Azure Event Hub logs with Filebeat
-          - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-with-azure-native-isv-service.md
-            title: Monitor Microsoft Azure with the Azure Native ISV Service
-          - page: docs-content://solutions/observability/cloud/monitor-microsoft-azure-openai.md
-            title: Monitor Microsoft Azure OpenAI
-        - group: GCP
-          page: docs-content://solutions/observability/cloud/monitor-google-cloud-platform-gcp.md
-          children:
-          - page: docs-content://solutions/observability/cloud/gcp-dataflow-templates.md
-            title: GCP Dataflow templates
-      - group: Infrastructure and hosts
-        page: docs-content://solutions/observability/infra-and-hosts.md
-        children:
-        - group: Analyze infrastructure and host metrics
-          page: docs-content://solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md
-          children:
-          - page: docs-content://solutions/observability/infra-and-hosts/get-started-with-system-metrics.md
-            title: Get started with system metrics
-          - page: docs-content://solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
-            title: View infrastructure metrics by resource type
-          - page: docs-content://solutions/observability/infra-and-hosts/discover-metrics.md
-            title: Explore metrics data with Discover in Kibana
-          - page: docs-content://solutions/observability/infra-and-hosts/explore-infrastructure-metrics-over-time.md
-            title: Explore infrastructure metrics over time
-          - page: docs-content://solutions/observability/infra-and-hosts/analyze-compare-hosts.md
-            title: Analyze and compare hosts
-          - page: docs-content://solutions/observability/infra-and-hosts/detect-metric-anomalies.md
-            title: Detect metric anomalies
-          - page: docs-content://solutions/observability/infra-and-hosts/configure-settings.md
-            title: Configure settings
-        - group: Universal Profiling
-          page: docs-content://solutions/observability/infra-and-hosts/universal-profiling.md
-          children:
-          - page: docs-content://solutions/observability/infra-and-hosts/get-started-with-universal-profiling.md
-            title: Get started
-          - group: Manage data storage
-            page: docs-content://solutions/observability/infra-and-hosts/manage-data-storage.md
-            children:
-            - page: docs-content://solutions/observability/infra-and-hosts/universal-profiling-index-life-cycle-management.md
-              title: Index lifecycle management
-            - page: docs-content://solutions/observability/infra-and-hosts/configure-probabilistic-profiling.md
-              title: Configure probabilistic profiling
-          - group: Advanced configuration
-            page: docs-content://solutions/observability/infra-and-hosts/advanced-configuration.md
-            children:
-            - page: docs-content://solutions/observability/infra-and-hosts/tag-data-for-querying.md
-              title: Tag data for querying
-            - page: docs-content://solutions/observability/infra-and-hosts/add-symbols-for-native-frames.md
-              title: Add symbols for native frames
-            - page: docs-content://solutions/observability/infra-and-hosts/use-proxy-with-universal-profiling-agent.md
-              title: Use a proxy
-            - page: docs-content://solutions/observability/infra-and-hosts/override-kernel-version-check.md
-              title: Override kernel version check
-            - page: docs-content://solutions/observability/infra-and-hosts/environment-variables-to-configure-universal-profiling-agent.md
-              title: Environment variables to configure the Universal Profiling Agent
-            - page: docs-content://solutions/observability/infra-and-hosts/configuration-file-of-universal-profiling-agent.md
-              title: Configuration file of the Universal Profiling Agent
-          - page: docs-content://solutions/observability/infra-and-hosts/upgrade-universal-profiling.md
-            title: Upgrade
-          - page: docs-content://solutions/observability/infra-and-hosts/run-universal-profiling-on-self-hosted-elastic-stack.md
-            title: Self-hosted infrastructure
-          - group: Install the backend
-            page: docs-content://solutions/observability/infra-and-hosts/install-backend.md
-            children:
-            - page: docs-content://solutions/observability/infra-and-hosts/step-1-update-stack.md
-              title: "Step 1: Update the stack"
-            - page: docs-content://solutions/observability/infra-and-hosts/step-2-enable-universal-profiling-in-kibana.md
-              title: "Step 2: Enable Universal Profiling in Kibana"
-            - page: docs-content://solutions/observability/infra-and-hosts/step-3-set-up-universal-profiling-in-kibana.md
-              title: "Step 3: Set up Universal Profiling in Kibana"
-            - page: docs-content://solutions/observability/infra-and-hosts/step-4-run-backend-applications.md
-              title: "Step 4: Run the backend applications"
-            - page: docs-content://solutions/observability/infra-and-hosts/step-5-next-steps.md
-              title: "Step 5: Next steps"
-          - page: docs-content://solutions/observability/infra-and-hosts/operate-universal-profiling-backend.md
-            title: Operate the backend
-        - page: docs-content://solutions/observability/infra-and-hosts/tutorial-observe-kubernetes-deployments.md
-          title: "Tutorial: Observe your Kubernetes deployments"
-        - group: "Tutorial: Observe your nginx instances"
-          page: docs-content://solutions/observability/infra-and-hosts/tutorial-observe-nginx-instances.md
-          children:
-          - page: docs-content://solutions/observability/infra-and-hosts/understanding-no-results-found-message.md
-            title: Understanding "no results found" message
-        - page: docs-content://solutions/observability/infra-and-hosts/collect-nginx-data-otel-integration-fleet-managed.md
-          title: Collect NGINX data with OpenTelemetry integrations (Fleet-managed)
-        - page: docs-content://solutions/observability/infra-and-hosts/collect-nginx-data-otel-integration-standalone.md
-          title: Collect NGINX data with OpenTelemetry integrations (standalone)
-      - group: Logs
-        page: docs-content://solutions/observability/logs.md
-        children:
-        - page: docs-content://solutions/observability/logs/get-started-with-system-logs.md
-          title: Get started with system logs
-        - page: docs-content://solutions/observability/logs/stream-any-log-file.md
-          title: Send any log file using Elastic Agent
-        - page: docs-content://solutions/observability/logs/stream-any-log-file-using-edot-collector.md
-          title: Send any log file using OTel Collector
-        - group: Send application log data
-          page: docs-content://solutions/observability/logs/stream-application-logs.md
-          children:
-          - page: docs-content://solutions/observability/logs/plaintext-application-logs.md
-            title: Plaintext application logs
-          - page: docs-content://solutions/observability/logs/ecs-formatted-application-logs.md
-            title: ECS formatted application logs
-          - page: docs-content://solutions/observability/logs/apm-agent-log-sending.md
-            title: APM agent log sending
-        - page: docs-content://solutions/observability/logs/parse-route-logs.md
-          title: Parse and route logs using ingest pipelines
-        - page: docs-content://solutions/observability/logs/filter-aggregate-logs.md
-          title: Filter and aggregate logs
-        - group: Explore logs
-          page: docs-content://solutions/observability/logs/explore-logs.md
-          children:
-          - page: docs-content://solutions/observability/logs/discover-logs.md
-            title: Explore logs in Discover
-          - page: docs-content://solutions/observability/logs/categorize-log-entries.md
-            title: Categorize log entries
-          - page: docs-content://solutions/observability/logs/inspect-log-anomalies.md
-            title: Inspect log anomalies
-        - page: docs-content://solutions/observability/logs/run-pattern-analysis-on-log-data.md
-          title: Run a pattern analysis on log data
-        - page: docs-content://solutions/observability/logs/log-data-sources.md
-          title: Configure log data sources
-        - page: docs-content://solutions/observability/logs/logs-data-retention.md
-          title: Configure log data retention
-        - page: docs-content://solutions/observability/logs/add-service-name-to-logs.md
-          title: Add a service name to logs
-        - group: Logs index template reference
-          page: docs-content://solutions/observability/logs/logs-index-template-reference.md
-          children:
-          - page: docs-content://solutions/observability/logs/logs-index-template-defaults.md
-            title: Default `logs` index template
-      - page: docs-content://solutions/observability/streams/streams.md
-        title: Streams
-      - page: docs-content://solutions/observability/streams/management/retention.md
-        title: Manage data retention
-      - group: Process documents
-        page: docs-content://solutions/observability/streams/management/extract.md
-        children:
-        - page: docs-content://solutions/observability/streams/management/extract/drop.md
-          title: Drop document processor
-        - page: docs-content://solutions/observability/streams/management/extract/remove.md
-          title: Remove processor
-        - page: docs-content://solutions/observability/streams/management/extract/date.md
-          title: Date processor
-        - page: docs-content://solutions/observability/streams/management/extract/convert.md
-          title: Convert processor
-        - page: docs-content://solutions/observability/streams/management/extract/replace.md
-          title: Replace processor
-        - page: docs-content://solutions/observability/streams/management/extract/dissect.md
-          title: Dissect processor
-        - page: docs-content://solutions/observability/streams/management/extract/grok.md
-          title: Grok processor
-        - page: docs-content://solutions/observability/streams/management/extract/set.md
-          title: Set processor
-        - page: docs-content://solutions/observability/streams/management/extract/math.md
-          title: Math processor
-        - page: docs-content://solutions/observability/streams/management/extract/rename.md
-          title: Rename processor
-        - page: docs-content://solutions/observability/streams/management/extract/append.md
-          title: Append processor
-        - page: docs-content://solutions/observability/streams/management/extract/manual-pipeline-configuration.md
-          title: Manual pipeline configuration
-      - page: docs-content://solutions/observability/streams/management/partitioning.md
-        title: Partition data into child streams
-      - page: docs-content://solutions/observability/streams/management/schema.md
-        title: Map fields
-      - page: docs-content://solutions/observability/streams/management/data-quality.md
-        title: Manage data quality
-      - page: docs-content://solutions/observability/streams/management/advanced.md
-        title: Configure advanced settings
-      - page: docs-content://solutions/observability/streams/wired-streams.md
-        title: Wired streams
-      - group: Incident management
-        page: docs-content://solutions/observability/incident-management.md
-        children:
-        - group: Alerting
-          page: docs-content://solutions/observability/incident-management/alerting.md
-          children:
-          - group: Create and manage rules
-            page: docs-content://solutions/observability/incident-management/create-manage-rules.md
+              - page: docs-content://solutions/observability/incident-management/create-an-error-count-threshold-rule.md
+                title: Error count threshold
+              - page: docs-content://solutions/observability/incident-management/create-failed-transaction-rate-threshold-rule.md
+                title: Failed transaction rate threshold
+              - page: docs-content://solutions/observability/incident-management/create-a-failed-docs-rule.md
+                title: Failed docs
+              - page: docs-content://solutions/observability/incident-management/create-an-inventory-rule.md
+                title: Inventory
+              - page: docs-content://solutions/observability/incident-management/create-latency-threshold-rule.md
+                title: Latency threshold
+              - page: docs-content://solutions/observability/incident-management/create-log-threshold-rule.md
+                title: Log threshold
+              - page: docs-content://solutions/observability/incident-management/create-metric-threshold-rule.md
+                title: Metric threshold
+              - page: docs-content://solutions/observability/incident-management/create-monitor-status-rule.md
+                title: Monitor Status
+              - page: docs-content://solutions/observability/incident-management/create-tls-certificate-rule.md
+                title: TLS certificate
+              - page: docs-content://solutions/observability/incident-management/create-an-uptime-duration-anomaly-rule.md
+                title: Uptime duration anomaly
+              - page: docs-content://solutions/observability/incident-management/create-an-slo-burn-rate-rule.md
+                title: SLO burn rate
+            - group: Aggregation options
+              page: docs-content://solutions/observability/incident-management/aggregation-options.md
+              children:
+              - page: docs-content://solutions/observability/incident-management/rate-aggregation.md
+                title: Rate aggregation
+            - group: View and manage alerts
+              page: docs-content://solutions/observability/incident-management/view-alerts.md
+              children:
+              - page: docs-content://solutions/observability/incident-management/triage-slo-burn-rate-breaches.md
+                title: SLO burn rate breaches
+              - page: docs-content://solutions/observability/incident-management/triage-threshold-breaches.md
+                title: Threshold breaches
+          - page: docs-content://solutions/observability/incident-management/observability-cases.md
+            title: Cases
+          - group: Service-level objectives (SLOs)
+            page: docs-content://solutions/observability/incident-management/service-level-objectives-slos.md
             children:
-            - page: docs-content://solutions/observability/incident-management/create-an-anomaly-detection-rule.md
-              title: Anomaly detection
-            - page: docs-content://solutions/observability/incident-management/create-an-apm-anomaly-rule.md
-              title: APM anomaly
-            - page: docs-content://solutions/observability/incident-management/create-custom-threshold-rule.md
-              title: Custom threshold
-            - page: docs-content://solutions/observability/incident-management/create-a-degraded-docs-rule.md
-              title: Degraded docs
-            - page: docs-content://solutions/observability/incident-management/create-an-elasticsearch-query-rule.md
-              title: Elasticsearch query
-            - page: docs-content://solutions/observability/incident-management/create-an-error-count-threshold-rule.md
-              title: Error count threshold
-            - page: docs-content://solutions/observability/incident-management/create-failed-transaction-rate-threshold-rule.md
-              title: Failed transaction rate threshold
-            - page: docs-content://solutions/observability/incident-management/create-a-failed-docs-rule.md
-              title: Failed docs
-            - page: docs-content://solutions/observability/incident-management/create-an-inventory-rule.md
-              title: Inventory
-            - page: docs-content://solutions/observability/incident-management/create-latency-threshold-rule.md
-              title: Latency threshold
-            - page: docs-content://solutions/observability/incident-management/create-log-threshold-rule.md
-              title: Log threshold
-            - page: docs-content://solutions/observability/incident-management/create-metric-threshold-rule.md
-              title: Metric threshold
-            - page: docs-content://solutions/observability/incident-management/create-monitor-status-rule.md
-              title: Monitor Status
-            - page: docs-content://solutions/observability/incident-management/create-tls-certificate-rule.md
-              title: TLS certificate
-            - page: docs-content://solutions/observability/incident-management/create-an-uptime-duration-anomaly-rule.md
-              title: Uptime duration anomaly
-            - page: docs-content://solutions/observability/incident-management/create-an-slo-burn-rate-rule.md
-              title: SLO burn rate
-          - group: Aggregation options
-            page: docs-content://solutions/observability/incident-management/aggregation-options.md
-            children:
-            - page: docs-content://solutions/observability/incident-management/rate-aggregation.md
-              title: Rate aggregation
-          - group: View and manage alerts
-            page: docs-content://solutions/observability/incident-management/view-alerts.md
-            children:
-            - page: docs-content://solutions/observability/incident-management/triage-slo-burn-rate-breaches.md
-              title: SLO burn rate breaches
-            - page: docs-content://solutions/observability/incident-management/triage-threshold-breaches.md
-              title: Threshold breaches
-        - page: docs-content://solutions/observability/incident-management/observability-cases.md
-          title: Cases
-        - group: Service-level objectives (SLOs)
-          page: docs-content://solutions/observability/incident-management/service-level-objectives-slos.md
+            - page: docs-content://solutions/observability/incident-management/configure-service-level-objective-slo-access.md
+              title: Configure SLO access
+            - page: docs-content://solutions/observability/incident-management/create-an-slo.md
+              title: Create an SLO
+            - page: docs-content://solutions/observability/incident-management/slo-management.md
+              title: View and manage SLOs
+            - page: docs-content://solutions/observability/incident-management/configure-slo-settings.md
+              title: Configure SLOs settings
+        - page: docs-content://solutions/observability/data-set-quality-monitoring.md
+          title: Data set quality
+        - group: AI for Observability
+          page: docs-content://solutions/observability/ai/observability-ai.md
           children:
-          - page: docs-content://solutions/observability/incident-management/configure-service-level-objective-slo-access.md
-            title: Configure SLO access
-          - page: docs-content://solutions/observability/incident-management/create-an-slo.md
-            title: Create an SLO
-          - page: docs-content://solutions/observability/incident-management/slo-management.md
-            title: View and manage SLOs
-          - page: docs-content://solutions/observability/incident-management/configure-slo-settings.md
-            title: Configure SLOs settings
-      - page: docs-content://solutions/observability/data-set-quality-monitoring.md
-        title: Data set quality
-      - group: AI for Observability
-        page: docs-content://solutions/observability/ai/observability-ai.md
-        children:
-        - page: docs-content://solutions/observability/ai/observability-ai-assistant.md
-          title: AI Assistant
-        - page: docs-content://solutions/observability/ai/agent-builder-observability.md
-          title: Agent Builder for Observability
-        - page: docs-content://solutions/observability/ai/llm-performance-matrix.md
-          title: Large language model performance matrix
-      - page: docs-content://solutions/observability/observability-serverless-feature-tiers.md
-        title: Serverless feature tiers
-      - page: docs-content://solutions/observability/apis.md
-        title: APIs
-    - group: Security solution
-      page: docs-content://solutions/security.md
-      children:
-      - group: Get started
-        page: docs-content://solutions/security/get-started.md
-        children:
-        - group: Elastic Security quickstarts
-          page: docs-content://solutions/security/get-started/quickstarts.md
-          children:
-          - page: docs-content://solutions/security/get-started/get-started-detect-with-siem.md
-            title: Detect and respond to threats with SIEM
-          - page: docs-content://solutions/security/get-started/get-started-endpoint-security.md
-            title: Protect your hosts with endpoint security
-          - page: docs-content://solutions/security/get-started/get-started-cloud-security.md
-            title: Secure your cloud assets with cloud security posture management
-        - page: docs-content://solutions/security/get-started/elastic-security-requirements.md
-          title: Elastic Security requirements
-        - page: docs-content://solutions/security/get-started/elastic-security-ui.md
-          title: Elastic Security UI
-        - group: Ingest data to Elastic Security
-          page: docs-content://solutions/security/get-started/ingest-data-to-elastic-security.md
-          children:
-          - page: docs-content://solutions/security/get-started/enable-threat-intelligence-integrations.md
-            title: Enable threat intelligence integrations
-          - page: docs-content://solutions/security/get-started/automatic-migration.md
-            title: Automatic migration
-          - page: docs-content://solutions/security/get-started/automatic-import.md
-            title: Automatic import
-          - page: docs-content://solutions/security/get-started/content-connectors.md
-            title: Content connectors
-        - group: Spaces and Elastic Security
-          page: docs-content://solutions/security/get-started/spaces-elastic-security.md
-          children:
-          - page: docs-content://solutions/security/get-started/spaces-defend-faq.md
-            title: "Spaces and Elastic Defend FAQ"
-        - page: docs-content://solutions/security/get-started/data-views-elastic-security.md
-          title: "Data views and Elastic Security"
-        - page: docs-content://solutions/security/get-started/create-runtime-fields-in-elastic-security.md
-          title: Create runtime fields in Elastic Security
-        - page: docs-content://solutions/security/get-started/configure-advanced-settings.md
-          title: Configure advanced settings
-      - group: "ES|QL for security"
-        page: docs-content://solutions/security/esql-for-security.md
+          - page: docs-content://solutions/observability/ai/observability-ai-assistant.md
+            title: AI Assistant
+          - page: docs-content://solutions/observability/ai/agent-builder-observability.md
+            title: Agent Builder for Observability
+          - page: docs-content://solutions/observability/ai/llm-performance-matrix.md
+            title: Large language model performance matrix
+        - page: docs-content://solutions/observability/observability-serverless-feature-tiers.md
+          title: Serverless feature tiers
+        - page: docs-content://solutions/observability/apis.md
+          title: APIs
+      - group: Security solution
+        page: docs-content://solutions/security.md
         children:
-        - page: docs-content://solutions/security/esql-for-security/esql-threat-hunting-tutorial.md
-          title: "Tutorial: Threat hunting with ES|QL"
-      - group: AI for security
-        page: docs-content://solutions/security/ai.md
-        children:
-        - group: Elastic AI SOC Engine
-          page: docs-content://solutions/security/ai/ease/ease-intro.md
-          children:
-          - page: docs-content://solutions/security/ai/ease/ease-alerts.md
-            title: Triage alerts
-          - page: docs-content://solutions/security/ai/ease/ease-upgrade.md
-            title: Upgrade from EASE to Elastic Security
-        - group: AI Assistant for Security
-          page: docs-content://solutions/security/ai/ai-assistant.md
+        - group: Get started
+          page: docs-content://solutions/security/get-started.md
           children:
-          - page: docs-content://solutions/security/ai/ai-assistant-knowledge-base.md
-            title: AI Assistant Knowledge Base
-          - page: docs-content://solutions/security/ai/usecase-knowledge-base-walkthrough.md
-            title: Use AI Assistant's Knowledge Base to improve response quality
-        - page: docs-content://solutions/security/ai/agent-builder/agent-builder.md
-          title: Agent Builder for Elastic Security
-        - page: docs-content://solutions/security/ai/attack-discovery.md
-          title: Attack Discovery
-        - page: docs-content://solutions/security/ai/large-language-model-performance-matrix.md
-          title: Large language model performance matrix
-        - group: AI use cases
-          page: docs-content://solutions/security/ai/use-cases.md
-          children:
-          - page: docs-content://solutions/security/ai/triage-alerts.md
-            title: Triage alerts
-          - page: docs-content://solutions/security/ai/identify-investigate-document-threats.md
-            title: Identify, investigate, and document threats
-          - page: docs-content://solutions/security/ai/generate-customize-learn-about-esorql-queries.md
-            title: "Generate, customize, and learn about ES|QL queries"
-        - page: docs-content://solutions/security/ai/ease/ease-value-report.md
-          title: Value report
-      - group: Detections and alerts
-        page: docs-content://solutions/security/detect-and-alert.md
-        children:
-        - group: Before you begin
-          page: docs-content://solutions/security/detect-and-alert/before-you-begin.md
+          - group: Elastic Security quickstarts
+            page: docs-content://solutions/security/get-started/quickstarts.md
+            children:
+            - page: docs-content://solutions/security/get-started/get-started-detect-with-siem.md
+              title: Detect and respond to threats with SIEM
+            - page: docs-content://solutions/security/get-started/get-started-endpoint-security.md
+              title: Protect your hosts with endpoint security
+            - page: docs-content://solutions/security/get-started/get-started-cloud-security.md
+              title: Secure your cloud assets with cloud security posture management
+          - page: docs-content://solutions/security/get-started/elastic-security-requirements.md
+            title: Elastic Security requirements
+          - page: docs-content://solutions/security/get-started/elastic-security-ui.md
+            title: Elastic Security UI
+          - group: Ingest data to Elastic Security
+            page: docs-content://solutions/security/get-started/ingest-data-to-elastic-security.md
+            children:
+            - page: docs-content://solutions/security/get-started/enable-threat-intelligence-integrations.md
+              title: Enable threat intelligence integrations
+            - page: docs-content://solutions/security/get-started/automatic-migration.md
+              title: Automatic migration
+            - page: docs-content://solutions/security/get-started/automatic-import.md
+              title: Automatic import
+            - page: docs-content://solutions/security/get-started/content-connectors.md
+              title: Content connectors
+          - group: Spaces and Elastic Security
+            page: docs-content://solutions/security/get-started/spaces-elastic-security.md
+            children:
+            - page: docs-content://solutions/security/get-started/spaces-defend-faq.md
+              title: "Spaces and Elastic Defend FAQ"
+          - page: docs-content://solutions/security/get-started/data-views-elastic-security.md
+            title: "Data views and Elastic Security"
+          - page: docs-content://solutions/security/get-started/create-runtime-fields-in-elastic-security.md
+            title: Create runtime fields in Elastic Security
+          - page: docs-content://solutions/security/get-started/configure-advanced-settings.md
+            title: Configure advanced settings
+        - group: "ES|QL for security"
+          page: docs-content://solutions/security/esql-for-security.md
           children:
-          - page: docs-content://solutions/security/detect-and-alert/turn-on-detections.md
-            title: Turn on detections
-          - page: docs-content://solutions/security/detect-and-alert/detections-privileges.md
-            title: Detections privileges
-          - page: docs-content://solutions/security/detect-and-alert/detection-rule-concepts.md
-            title: Detection rule concepts
-          - group: Advanced data source configuration
-            page: docs-content://solutions/security/detect-and-alert/advanced-data-source-configuration.md
-            children:
-            - page: docs-content://solutions/security/detect-and-alert/cross-cluster-search-detection-rules.md
-              title: Cross-cluster search and detection rules
-            - page: docs-content://solutions/security/detect-and-alert/using-logsdb-index-mode-with-elastic-security.md
-              title: Using logsdb index mode with Elastic Security
-        - page: docs-content://solutions/security/detect-and-alert/mitre-attack-coverage.md
-          title: "MITRE ATT&CK coverage"
-        - group: Prebuilt rules
-          page: docs-content://solutions/security/detect-and-alert/prebuilt-rules.md
+          - page: docs-content://solutions/security/esql-for-security/esql-threat-hunting-tutorial.md
+            title: "Tutorial: Threat hunting with ES|QL"
+        - group: AI for security
+          page: docs-content://solutions/security/ai.md
           children:
-          - page: docs-content://solutions/security/detect-and-alert/prebuilt-rule-components.md
-            title: Prebuilt rule components
-          - page: docs-content://solutions/security/detect-and-alert/install-prebuilt-rules.md
-            title: Install prebuilt rules
-          - page: docs-content://solutions/security/detect-and-alert/update-prebuilt-rules.md
-            title: Update prebuilt rules
-          - page: docs-content://solutions/security/detect-and-alert/prebuilt-rules-airgapped.md
-            title: Prebuilt rules in air-gapped environments
-          - page: docs-content://solutions/security/detect-and-alert/customize-prebuilt-rules.md
-            title: Customize prebuilt rules
-        - group: Author rules
-          page: docs-content://solutions/security/detect-and-alert/author-rules.md
+          - group: Elastic AI SOC Engine
+            page: docs-content://solutions/security/ai/ease/ease-intro.md
+            children:
+            - page: docs-content://solutions/security/ai/ease/ease-alerts.md
+              title: Triage alerts
+            - page: docs-content://solutions/security/ai/ease/ease-upgrade.md
+              title: Upgrade from EASE to Elastic Security
+          - group: AI Assistant for Security
+            page: docs-content://solutions/security/ai/ai-assistant.md
+            children:
+            - page: docs-content://solutions/security/ai/ai-assistant-knowledge-base.md
+              title: AI Assistant Knowledge Base
+            - page: docs-content://solutions/security/ai/usecase-knowledge-base-walkthrough.md
+              title: Use AI Assistant's Knowledge Base to improve response quality
+          - page: docs-content://solutions/security/ai/agent-builder/agent-builder.md
+            title: Agent Builder for Elastic Security
+          - page: docs-content://solutions/security/ai/attack-discovery.md
+            title: Attack Discovery
+          - page: docs-content://solutions/security/ai/large-language-model-performance-matrix.md
+            title: Large language model performance matrix
+          - group: AI use cases
+            page: docs-content://solutions/security/ai/use-cases.md
+            children:
+            - page: docs-content://solutions/security/ai/triage-alerts.md
+              title: Triage alerts
+            - page: docs-content://solutions/security/ai/identify-investigate-document-threats.md
+              title: Identify, investigate, and document threats
+            - page: docs-content://solutions/security/ai/generate-customize-learn-about-esorql-queries.md
+              title: "Generate, customize, and learn about ES|QL queries"
+          - page: docs-content://solutions/security/ai/ease/ease-value-report.md
+            title: Value report
+        - group: Detections and alerts
+          page: docs-content://solutions/security/detect-and-alert.md
           children:
-          - group: Choose the right rule type
-            page: docs-content://solutions/security/detect-and-alert/choose-the-right-rule-type.md
-            children:
-            - page: docs-content://solutions/security/detect-and-alert/about-building-block-rules.md
-              title: About building block rules
-          - group: Rule type guides
-            page: docs-content://solutions/security/detect-and-alert/rule-types.md
-            children:
-            - page: docs-content://solutions/security/detect-and-alert/esql.md
-              title: "ES|QL rules"
-            - page: docs-content://solutions/security/detect-and-alert/custom-query.md
-              title: Custom query rules
-            - page: docs-content://solutions/security/detect-and-alert/eql.md
-              title: Event correlation (EQL) rules
-            - page: docs-content://solutions/security/detect-and-alert/indicator-match.md
-              title: Indicator match rules
-            - page: docs-content://solutions/security/detect-and-alert/threshold.md
-              title: Threshold rules
-            - page: docs-content://solutions/security/detect-and-alert/machine-learning.md
-              title: "Machine learning rules"
-            - page: docs-content://solutions/security/detect-and-alert/new-terms.md
-              title: New terms rules
-          - page: docs-content://solutions/security/detect-and-alert/using-the-rule-ui.md
-            title: Using the UI
-          - page: docs-content://solutions/security/detect-and-alert/using-the-api.md
-            title: Using the API
-          - page: docs-content://solutions/security/detect-and-alert/common-rule-settings.md
-            title: Common rule settings
-          - page: docs-content://solutions/security/detect-and-alert/set-rule-data-sources.md
-            title: Set rule data sources
-          - page: docs-content://solutions/security/detect-and-alert/write-investigation-guides.md
-            title: Write investigation guides
-          - page: docs-content://solutions/security/detect-and-alert/validate-and-test-rules.md
-            title: Validate and test rules
-        - page: docs-content://solutions/security/detect-and-alert/manage-detection-rules.md
-          title: Manage detection rules
-        - group: Monitor rule executions
-          page: docs-content://solutions/security/detect-and-alert/monitor-rule-executions.md
+          - group: Before you begin
+            page: docs-content://solutions/security/detect-and-alert/before-you-begin.md
+            children:
+            - page: docs-content://solutions/security/detect-and-alert/turn-on-detections.md
+              title: Turn on detections
+            - page: docs-content://solutions/security/detect-and-alert/detections-privileges.md
+              title: Detections privileges
+            - page: docs-content://solutions/security/detect-and-alert/detection-rule-concepts.md
+              title: Detection rule concepts
+            - group: Advanced data source configuration
+              page: docs-content://solutions/security/detect-and-alert/advanced-data-source-configuration.md
+              children:
+              - page: docs-content://solutions/security/detect-and-alert/cross-cluster-search-detection-rules.md
+                title: Cross-cluster search and detection rules
+              - page: docs-content://solutions/security/detect-and-alert/using-logsdb-index-mode-with-elastic-security.md
+                title: Using logsdb index mode with Elastic Security
+          - page: docs-content://solutions/security/detect-and-alert/mitre-attack-coverage.md
+            title: "MITRE ATT&CK coverage"
+          - group: Prebuilt rules
+            page: docs-content://solutions/security/detect-and-alert/prebuilt-rules.md
+            children:
+            - page: docs-content://solutions/security/detect-and-alert/prebuilt-rule-components.md
+              title: Prebuilt rule components
+            - page: docs-content://solutions/security/detect-and-alert/install-prebuilt-rules.md
+              title: Install prebuilt rules
+            - page: docs-content://solutions/security/detect-and-alert/update-prebuilt-rules.md
+              title: Update prebuilt rules
+            - page: docs-content://solutions/security/detect-and-alert/prebuilt-rules-airgapped.md
+              title: Prebuilt rules in air-gapped environments
+            - page: docs-content://solutions/security/detect-and-alert/customize-prebuilt-rules.md
+              title: Customize prebuilt rules
+          - group: Author rules
+            page: docs-content://solutions/security/detect-and-alert/author-rules.md
+            children:
+            - group: Choose the right rule type
+              page: docs-content://solutions/security/detect-and-alert/choose-the-right-rule-type.md
+              children:
+              - page: docs-content://solutions/security/detect-and-alert/about-building-block-rules.md
+                title: About building block rules
+            - group: Rule type guides
+              page: docs-content://solutions/security/detect-and-alert/rule-types.md
+              children:
+              - page: docs-content://solutions/security/detect-and-alert/esql.md
+                title: "ES|QL rules"
+              - page: docs-content://solutions/security/detect-and-alert/custom-query.md
+                title: Custom query rules
+              - page: docs-content://solutions/security/detect-and-alert/eql.md
+                title: Event correlation (EQL) rules
+              - page: docs-content://solutions/security/detect-and-alert/indicator-match.md
+                title: Indicator match rules
+              - page: docs-content://solutions/security/detect-and-alert/threshold.md
+                title: Threshold rules
+              - page: docs-content://solutions/security/detect-and-alert/machine-learning.md
+                title: "Machine learning rules"
+              - page: docs-content://solutions/security/detect-and-alert/new-terms.md
+                title: New terms rules
+            - page: docs-content://solutions/security/detect-and-alert/using-the-rule-ui.md
+              title: Using the UI
+            - page: docs-content://solutions/security/detect-and-alert/using-the-api.md
+              title: Using the API
+            - page: docs-content://solutions/security/detect-and-alert/common-rule-settings.md
+              title: Common rule settings
+            - page: docs-content://solutions/security/detect-and-alert/set-rule-data-sources.md
+              title: Set rule data sources
+            - page: docs-content://solutions/security/detect-and-alert/write-investigation-guides.md
+              title: Write investigation guides
+            - page: docs-content://solutions/security/detect-and-alert/validate-and-test-rules.md
+              title: Validate and test rules
+          - page: docs-content://solutions/security/detect-and-alert/manage-detection-rules.md
+            title: Manage detection rules
+          - group: Monitor rule executions
+            page: docs-content://solutions/security/detect-and-alert/monitor-rule-executions.md
+            children:
+            - page: docs-content://solutions/security/detect-and-alert/fill-rule-gaps.md
+              title: Fill rule execution gaps
+          - group: Reduce noise and false positives
+            page: docs-content://solutions/security/detect-and-alert/reduce-noise-and-false-positives.md
+            children:
+            - page: docs-content://solutions/security/detect-and-alert/tune-detection-rules.md
+              title: Tune detection rules
+            - group: Rule exceptions
+              page: docs-content://solutions/security/detect-and-alert/rule-exceptions.md
+              children:
+              - page: docs-content://solutions/security/detect-and-alert/create-manage-value-lists.md
+                title: Create and manage value lists
+              - page: docs-content://solutions/security/detect-and-alert/add-manage-exceptions.md
+                title: Add and manage exceptions
+              - page: docs-content://solutions/security/detect-and-alert/create-manage-shared-exception-lists.md
+                title: Create and manage shared exception lists
+            - page: docs-content://solutions/security/detect-and-alert/alert-suppression.md
+              title: Suppress detection alerts
+          - group: Manage detection alerts
+            page: docs-content://solutions/security/detect-and-alert/manage-detection-alerts.md
+            children:
+            - page: docs-content://solutions/security/detect-and-alert/visualize-detection-alerts.md
+              title: Visualize detection alerts
+            - page: docs-content://solutions/security/detect-and-alert/view-detection-alert-details.md
+              title: View detection alert details
+            - page: docs-content://solutions/security/detect-and-alert/query-alert-indices.md
+              title: Query alert indices
+        - group: "Configure endpoint protection with Elastic Defend"
+          page: docs-content://solutions/security/configure-elastic-defend.md
           children:
-          - page: docs-content://solutions/security/detect-and-alert/fill-rule-gaps.md
-            title: Fill rule execution gaps
-        - group: Reduce noise and false positives
-          page: docs-content://solutions/security/detect-and-alert/reduce-noise-and-false-positives.md
+          - page: docs-content://solutions/security/configure-elastic-defend/elastic-defend-requirements.md
+            title: "Elastic Defend requirements"
+          - group: "Install Elastic Defend"
+            page: docs-content://solutions/security/configure-elastic-defend/install-elastic-defend.md
+            children:
+            - page: docs-content://solutions/security/configure-elastic-defend/enable-access-for-macos.md
+              title: Enable access on macOS
+            - page: docs-content://solutions/security/configure-elastic-defend/deploy-on-macos-with-mdm.md
+              title: Deploy on macOS with MDM
+            - page: docs-content://solutions/security/configure-elastic-defend/prevent-elastic-agent-uninstallation.md
+              title: Prevent Elastic Agent uninstallation
+          - page: docs-content://solutions/security/configure-elastic-defend/elastic-defend-feature-privileges.md
+            title: "Elastic Defend feature privileges"
+          - group: "Configure an integration policy for Elastic Defend"
+            page: docs-content://solutions/security/configure-elastic-defend/configure-an-integration-policy-for-elastic-defend.md
+            children:
+            - page: docs-content://solutions/security/configure-elastic-defend/configure-updates-for-protection-artifacts.md
+              title: Configure updates for protection artifacts
+            - page: docs-content://solutions/security/configure-elastic-defend/turn-off-diagnostic-data-for-elastic-defend.md
+              title: "Turn off diagnostic data for Elastic Defend"
+            - page: docs-content://solutions/security/configure-elastic-defend/configure-self-healing-rollback-for-windows-endpoints.md
+              title: Configure self-healing rollback for Windows endpoints
+            - page: docs-content://solutions/security/configure-elastic-defend/configure-linux-file-system-monitoring.md
+              title: Configure Linux file system monitoring
+            - page: docs-content://solutions/security/configure-elastic-defend/configure-data-volume-for-elastic-endpoint.md
+              title: Configure data volume
+            - page: docs-content://solutions/security/configure-elastic-defend/create-an-elastic-defend-policy-using-api.md
+              title: Create an Elastic Defend policy using API
+          - page: docs-content://solutions/security/configure-elastic-defend/configure-offline-endpoints-air-gapped-environments.md
+            title: Configure offline endpoints and air-gapped environments
+          - page: docs-content://solutions/security/configure-elastic-defend/uninstall-elastic-agent.md
+            title: Uninstall Elastic Agent
+        - group: "Manage Elastic Defend"
+          page: docs-content://solutions/security/manage-elastic-defend.md
           children:
-          - page: docs-content://solutions/security/detect-and-alert/tune-detection-rules.md
-            title: Tune detection rules
-          - group: Rule exceptions
-            page: docs-content://solutions/security/detect-and-alert/rule-exceptions.md
-            children:
-            - page: docs-content://solutions/security/detect-and-alert/create-manage-value-lists.md
-              title: Create and manage value lists
-            - page: docs-content://solutions/security/detect-and-alert/add-manage-exceptions.md
-              title: Add and manage exceptions
-            - page: docs-content://solutions/security/detect-and-alert/create-manage-shared-exception-lists.md
-              title: Create and manage shared exception lists
-          - page: docs-content://solutions/security/detect-and-alert/alert-suppression.md
-            title: Suppress detection alerts
-        - group: Manage detection alerts
-          page: docs-content://solutions/security/detect-and-alert/manage-detection-alerts.md
+          - page: docs-content://solutions/security/manage-elastic-defend/endpoints.md
+            title: Endpoints
+          - page: docs-content://solutions/security/manage-elastic-defend/policies.md
+            title: Policies
+          - page: docs-content://solutions/security/manage-elastic-defend/trusted-applications.md
+            title: Trusted applications
+          - page: docs-content://solutions/security/manage-elastic-defend/trusted-devices.md
+            title: Trusted devices
+          - page: docs-content://solutions/security/manage-elastic-defend/event-filters.md
+            title: Event filters
+          - page: docs-content://solutions/security/manage-elastic-defend/host-isolation-exceptions.md
+            title: Host isolation exceptions
+          - page: docs-content://solutions/security/manage-elastic-defend/blocklist.md
+            title: Blocklist
+          - page: docs-content://solutions/security/manage-elastic-defend/optimize-elastic-defend.md
+            title: "Optimize Elastic Defend"
+          - page: docs-content://solutions/security/manage-elastic-defend/event-capture-elastic-defend.md
+            title: "Event capture and Elastic Defend"
+          - page: docs-content://solutions/security/manage-elastic-defend/endpoint-protection-rules.md
+            title: Endpoint protection rules
+          - page: docs-content://solutions/security/manage-elastic-defend/automatic-troubleshooting.md
+            title: Automatic troubleshooting
+          - page: docs-content://solutions/security/manage-elastic-defend/allowlist-elastic-endpoint-in-third-party-antivirus-apps.md
+            title: "Allowlist Elastic Endpoint in third-party antivirus apps"
+          - page: docs-content://solutions/security/manage-elastic-defend/elastic-endpoint-self-protection-features.md
+            title: "Elastic Endpoint self-protection features"
+        - group: Endpoint response actions
+          page: docs-content://solutions/security/endpoint-response-actions.md
           children:
-          - page: docs-content://solutions/security/detect-and-alert/visualize-detection-alerts.md
-            title: Visualize detection alerts
-          - page: docs-content://solutions/security/detect-and-alert/view-detection-alert-details.md
-            title: View detection alert details
-          - page: docs-content://solutions/security/detect-and-alert/query-alert-indices.md
-            title: Query alert indices
-      - group: "Configure endpoint protection with Elastic Defend"
-        page: docs-content://solutions/security/configure-elastic-defend.md
-        children:
-        - page: docs-content://solutions/security/configure-elastic-defend/elastic-defend-requirements.md
-          title: "Elastic Defend requirements"
-        - group: "Install Elastic Defend"
-          page: docs-content://solutions/security/configure-elastic-defend/install-elastic-defend.md
+          - page: docs-content://solutions/security/endpoint-response-actions/automated-response-actions.md
+            title: Automated response actions
+          - page: docs-content://solutions/security/endpoint-response-actions/isolate-host.md
+            title: Isolate a host
+          - page: docs-content://solutions/security/endpoint-response-actions/response-actions-history.md
+            title: Response actions history
+          - page: docs-content://solutions/security/endpoint-response-actions/third-party-response-actions.md
+            title: Third-party response actions
+          - page: docs-content://solutions/security/endpoint-response-actions/configure-third-party-response-actions.md
+            title: Configure third-party response actions
+        - group: Cloud Security
+          page: docs-content://solutions/security/cloud.md
           children:
-          - page: docs-content://solutions/security/configure-elastic-defend/enable-access-for-macos.md
-            title: Enable access on macOS
-          - page: docs-content://solutions/security/configure-elastic-defend/deploy-on-macos-with-mdm.md
-            title: Deploy on macOS with MDM
-          - page: docs-content://solutions/security/configure-elastic-defend/prevent-elastic-agent-uninstallation.md
-            title: Prevent Elastic Agent uninstallation
-        - page: docs-content://solutions/security/configure-elastic-defend/elastic-defend-feature-privileges.md
-          title: "Elastic Defend feature privileges"
-        - group: "Configure an integration policy for Elastic Defend"
-          page: docs-content://solutions/security/configure-elastic-defend/configure-an-integration-policy-for-elastic-defend.md
+          - page: docs-content://solutions/security/cloud/security-posture-management-overview.md
+            title: Security posture management overview
+          - page: docs-content://solutions/security/cloud/enable-cloud-security-features.md
+            title: "Enable cloud security features in Serverless"
+          - group: Cloud security posture management
+            page: docs-content://solutions/security/cloud/cloud-security-posture-management.md
+            children:
+            - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-aws.md
+              title: Get started with CSPM for AWS
+            - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-gcp.md
+              title: Get started with CSPM for GCP
+            - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-azure.md
+              title: Get started with CSPM for Azure
+            - page: docs-content://solutions/security/cloud/cspm-privilege-requirements.md
+              title: CSPM privilege requirements
+            - page: docs-content://solutions/security/cloud/findings-page.md
+              title: CSPM Findings
+            - page: docs-content://solutions/security/cloud/benchmarks.md
+              title: CSPM benchmarks
+            - page: docs-content://solutions/security/cloud/cspm-dashboard.md
+              title: Cloud Security Posture dashboard
+            - page: docs-content://solutions/security/cloud/cspm-frequently-asked-questions-faq.md
+              title: Frequently asked questions (FAQ)
+          - group: Kubernetes security posture management
+            page: docs-content://solutions/security/cloud/kubernetes-security-posture-management.md
+            children:
+            - page: docs-content://solutions/security/cloud/get-started-with-kspm.md
+              title: Get started with KSPM
+            - page: docs-content://solutions/security/cloud/findings-page-2.md
+              title: KSPM Findings
+            - page: docs-content://solutions/security/cloud/kspm-benchmarks.md
+              title: KSPM benchmarks
+            - page: docs-content://solutions/security/cloud/kspm-dashboard.md
+              title: Cloud Security Posture dashboard
+            - page: docs-content://solutions/security/cloud/kspm-frequently-asked-questions.md
+              title: Frequently asked questions (FAQ)
+          - group: Cloud Asset Discovery
+            page: docs-content://solutions/security/cloud/asset-disc.md
+            children:
+            - page: docs-content://solutions/security/cloud/asset-disc-aws.md
+              title: Set up Cloud Asset Discovery for AWS
+            - page: docs-content://solutions/security/cloud/asset-disc-gcp.md
+              title: Set up Cloud Asset Discovery for GCP
+            - page: docs-content://solutions/security/cloud/asset-disc-azure.md
+              title: Set up Cloud Asset Discovery for Azure
+          - group: Cloud native vulnerability management
+            page: docs-content://solutions/security/cloud/cloud-native-vulnerability-management.md
+            children:
+            - page: docs-content://solutions/security/cloud/get-started-with-cnvm.md
+              title: Get started with CNVM
+            - page: docs-content://solutions/security/cloud/cnvm-privilege-requirements.md
+              title: CNVM privilege requirements
+            - page: docs-content://solutions/security/cloud/findings-page-3.md
+              title: CNVM Findings
+            - page: docs-content://solutions/security/cloud/cnvm-dashboard.md
+              title: CNVM dashboard
+            - page: docs-content://solutions/security/cloud/cnvm-frequently-asked-questions-faq.md
+              title: Frequently asked questions (FAQ)
+          - group: Cloud workload protection for VMs
+            page: docs-content://solutions/security/cloud/cloud-workload-protection-for-vms.md
+            children:
+            - page: docs-content://solutions/security/cloud/capture-environment-variables.md
+              title: Capture environment variables
+          - group: Cloud workload protection for Kubernetes
+            page: docs-content://solutions/security/cloud/d4c/d4c-overview.md
+            children:
+            - page: docs-content://solutions/security/cloud/d4c/get-started-with-d4c.md
+              title: Get started with Defend for Containers for Kubernetes
+            - page: docs-content://solutions/security/cloud/d4c/d4c-policies.md
+              title: Container workload protection policies
+            - page: docs-content://solutions/security/cloud/d4c/kubernetes-dashboard.md
+              title: Kubernetes dashboard
+        - group: Ingest third-party security data
+          page: docs-content://solutions/security/integrations/ingest-third-party-security-data.md
           children:
-          - page: docs-content://solutions/security/configure-elastic-defend/configure-updates-for-protection-artifacts.md
-            title: Configure updates for protection artifacts
-          - page: docs-content://solutions/security/configure-elastic-defend/turn-off-diagnostic-data-for-elastic-defend.md
-            title: "Turn off diagnostic data for Elastic Defend"
-          - page: docs-content://solutions/security/configure-elastic-defend/configure-self-healing-rollback-for-windows-endpoints.md
-            title: Configure self-healing rollback for Windows endpoints
-          - page: docs-content://solutions/security/configure-elastic-defend/configure-linux-file-system-monitoring.md
-            title: Configure Linux file system monitoring
-          - page: docs-content://solutions/security/configure-elastic-defend/configure-data-volume-for-elastic-endpoint.md
-            title: Configure data volume
-          - page: docs-content://solutions/security/configure-elastic-defend/create-an-elastic-defend-policy-using-api.md
-            title: Create an Elastic Defend policy using API
-        - page: docs-content://solutions/security/configure-elastic-defend/configure-offline-endpoints-air-gapped-environments.md
-          title: Configure offline endpoints and air-gapped environments
-        - page: docs-content://solutions/security/configure-elastic-defend/uninstall-elastic-agent.md
-          title: Uninstall Elastic Agent
-      - group: "Manage Elastic Defend"
-        page: docs-content://solutions/security/manage-elastic-defend.md
-        children:
-        - page: docs-content://solutions/security/manage-elastic-defend/endpoints.md
-          title: Endpoints
-        - page: docs-content://solutions/security/manage-elastic-defend/policies.md
-          title: Policies
-        - page: docs-content://solutions/security/manage-elastic-defend/trusted-applications.md
-          title: Trusted applications
-        - page: docs-content://solutions/security/manage-elastic-defend/trusted-devices.md
-          title: Trusted devices
-        - page: docs-content://solutions/security/manage-elastic-defend/event-filters.md
-          title: Event filters
-        - page: docs-content://solutions/security/manage-elastic-defend/host-isolation-exceptions.md
-          title: Host isolation exceptions
-        - page: docs-content://solutions/security/manage-elastic-defend/blocklist.md
-          title: Blocklist
-        - page: docs-content://solutions/security/manage-elastic-defend/optimize-elastic-defend.md
-          title: "Optimize Elastic Defend"
-        - page: docs-content://solutions/security/manage-elastic-defend/event-capture-elastic-defend.md
-          title: "Event capture and Elastic Defend"
-        - page: docs-content://solutions/security/manage-elastic-defend/endpoint-protection-rules.md
-          title: Endpoint protection rules
-        - page: docs-content://solutions/security/manage-elastic-defend/automatic-troubleshooting.md
-          title: Automatic troubleshooting
-        - page: docs-content://solutions/security/manage-elastic-defend/allowlist-elastic-endpoint-in-third-party-antivirus-apps.md
-          title: "Allowlist Elastic Endpoint in third-party antivirus apps"
-        - page: docs-content://solutions/security/manage-elastic-defend/elastic-endpoint-self-protection-features.md
-          title: "Elastic Endpoint self-protection features"
-      - group: Endpoint response actions
-        page: docs-content://solutions/security/endpoint-response-actions.md
-        children:
-        - page: docs-content://solutions/security/endpoint-response-actions/automated-response-actions.md
-          title: Automated response actions
-        - page: docs-content://solutions/security/endpoint-response-actions/isolate-host.md
-          title: Isolate a host
-        - page: docs-content://solutions/security/endpoint-response-actions/response-actions-history.md
-          title: Response actions history
-        - page: docs-content://solutions/security/endpoint-response-actions/third-party-response-actions.md
-          title: Third-party response actions
-        - page: docs-content://solutions/security/endpoint-response-actions/configure-third-party-response-actions.md
-          title: Configure third-party response actions
-      - group: Cloud Security
-        page: docs-content://solutions/security/cloud.md
-        children:
-        - page: docs-content://solutions/security/cloud/security-posture-management-overview.md
-          title: Security posture management overview
-        - page: docs-content://solutions/security/cloud/enable-cloud-security-features.md
-          title: "Enable cloud security features in Serverless"
-        - group: Cloud security posture management
-          page: docs-content://solutions/security/cloud/cloud-security-posture-management.md
+          - page: docs-content://solutions/security/integrations/aws-config.md
+            title: AWS Config
+          - page: docs-content://solutions/security/integrations/aws-inspector.md
+            title: AWS Inspector
+          - page: docs-content://solutions/security/integrations/aws-sec-hub.md
+            title: AWS Security Hub
+          - page: docs-content://solutions/security/integrations/aws-security-hub-cspm.md
+            title: AWS Security Hub CSPM
+          - page: docs-content://solutions/security/integrations/cncf-falco.md
+            title: CNCF Falco
+          - page: docs-content://solutions/security/integrations/google-security-command-center.md
+            title: Google Security Command Center
+          - page: docs-content://solutions/security/integrations/microsoft-defender-for-cloud.md
+            title: Microsoft Defender for Cloud
+          - page: docs-content://solutions/security/integrations/microsoft-defender-for-endpoint.md
+            title: Microsoft Defender for Endpoint
+          - page: docs-content://solutions/security/integrations/microsoft-defender-xdr.md
+            title: Microsoft Defender XDR
+          - page: docs-content://solutions/security/integrations/prisma-cloud.md
+            title: Prisma Cloud
+          - page: docs-content://solutions/security/integrations/qualys.md
+            title: Qualys VMDR
+          - page: docs-content://solutions/security/integrations/rapid7.md
+            title: Rapid7 InsightVM
+          - page: docs-content://solutions/security/integrations/tenablevm.md
+            title: Tenable VM
+          - page: docs-content://solutions/security/integrations/wiz.md
+            title: Wiz
+        - group: Investigation tools
+          page: docs-content://solutions/security/investigate.md
           children:
-          - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-aws.md
-            title: Get started with CSPM for AWS
-          - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-gcp.md
-            title: Get started with CSPM for GCP
-          - page: docs-content://solutions/security/cloud/get-started-with-cspm-for-azure.md
-            title: Get started with CSPM for Azure
-          - page: docs-content://solutions/security/cloud/cspm-privilege-requirements.md
-            title: CSPM privilege requirements
-          - page: docs-content://solutions/security/cloud/findings-page.md
-            title: CSPM Findings
-          - page: docs-content://solutions/security/cloud/benchmarks.md
-            title: CSPM benchmarks
-          - page: docs-content://solutions/security/cloud/cspm-dashboard.md
-            title: Cloud Security Posture dashboard
-          - page: docs-content://solutions/security/cloud/cspm-frequently-asked-questions-faq.md
-            title: Frequently asked questions (FAQ)
-        - group: Kubernetes security posture management
-          page: docs-content://solutions/security/cloud/kubernetes-security-posture-management.md
+          - group: Timeline
+            page: docs-content://solutions/security/investigate/timeline.md
+            children:
+            - page: docs-content://solutions/security/investigate/timeline-templates.md
+              title: Timeline templates
+          - page: docs-content://solutions/security/investigate/visual-event-analyzer.md
+            title: Visual event analyzer
+          - page: docs-content://solutions/security/investigate/session-view.md
+            title: Session View
+          - group: Osquery
+            page: docs-content://solutions/security/investigate/osquery.md
+            children:
+            - page: docs-content://solutions/security/investigate/manage-integration.md
+              title: Osquery manager integration
+            - page: docs-content://solutions/security/investigate/osquery-faq.md
+              title: Osquery FAQ
+            - page: docs-content://solutions/security/investigate/add-osquery-response-actions.md
+              title: Add Osquery Response Actions
+            - page: docs-content://solutions/security/investigate/run-osquery-from-investigation-guides.md
+              title: Run Osquery from investigation guides
+            - page: docs-content://solutions/security/investigate/run-osquery-from-alerts.md
+              title: Run Osquery from alerts
+            - page: docs-content://solutions/security/investigate/examine-osquery-results.md
+              title: Examine Osquery results
+            - page: docs-content://solutions/security/investigate/use-placeholder-fields-in-osquery-queries.md
+              title: Use placeholder fields in Osquery queries
+          - page: docs-content://solutions/security/investigate/notes.md
+            title: Notes
+          - page: docs-content://solutions/security/investigate/indicators-of-compromise.md
+            title: Indicators of compromise
+          - page: docs-content://solutions/security/investigate/security-cases.md
+            title: Cases
+        - group: Dashboards
+          page: docs-content://solutions/security/dashboards.md
           children:
-          - page: docs-content://solutions/security/cloud/get-started-with-kspm.md
-            title: Get started with KSPM
-          - page: docs-content://solutions/security/cloud/findings-page-2.md
-            title: KSPM Findings
-          - page: docs-content://solutions/security/cloud/kspm-benchmarks.md
-            title: KSPM benchmarks
-          - page: docs-content://solutions/security/cloud/kspm-dashboard.md
+          - page: docs-content://solutions/security/dashboards/overview-dashboard.md
+            title: Overview dashboard
+          - page: docs-content://solutions/security/dashboards/detection-response-dashboard.md
+            title: "Detection & Response dashboard"
+          - page: docs-content://solutions/security/dashboards/cloud-security-posture-dashboard.md
             title: Cloud Security Posture dashboard
-          - page: docs-content://solutions/security/cloud/kspm-frequently-asked-questions.md
-            title: Frequently asked questions (FAQ)
-        - group: Cloud Asset Discovery
-          page: docs-content://solutions/security/cloud/asset-disc.md
-          children:
-          - page: docs-content://solutions/security/cloud/asset-disc-aws.md
-            title: Set up Cloud Asset Discovery for AWS
-          - page: docs-content://solutions/security/cloud/asset-disc-gcp.md
-            title: Set up Cloud Asset Discovery for GCP
-          - page: docs-content://solutions/security/cloud/asset-disc-azure.md
-            title: Set up Cloud Asset Discovery for Azure
-        - group: Cloud native vulnerability management
-          page: docs-content://solutions/security/cloud/cloud-native-vulnerability-management.md
-          children:
-          - page: docs-content://solutions/security/cloud/get-started-with-cnvm.md
-            title: Get started with CNVM
-          - page: docs-content://solutions/security/cloud/cnvm-privilege-requirements.md
-            title: CNVM privilege requirements
-          - page: docs-content://solutions/security/cloud/findings-page-3.md
-            title: CNVM Findings
-          - page: docs-content://solutions/security/cloud/cnvm-dashboard.md
-            title: CNVM dashboard
-          - page: docs-content://solutions/security/cloud/cnvm-frequently-asked-questions-faq.md
-            title: Frequently asked questions (FAQ)
-        - group: Cloud workload protection for VMs
-          page: docs-content://solutions/security/cloud/cloud-workload-protection-for-vms.md
-          children:
-          - page: docs-content://solutions/security/cloud/capture-environment-variables.md
-            title: Capture environment variables
-        - group: Cloud workload protection for Kubernetes
-          page: docs-content://solutions/security/cloud/d4c/d4c-overview.md
-          children:
-          - page: docs-content://solutions/security/cloud/d4c/get-started-with-d4c.md
-            title: Get started with Defend for Containers for Kubernetes
-          - page: docs-content://solutions/security/cloud/d4c/d4c-policies.md
-            title: Container workload protection policies
-          - page: docs-content://solutions/security/cloud/d4c/kubernetes-dashboard.md
+          - page: docs-content://solutions/security/dashboards/kubernetes-dashboard.md
             title: Kubernetes dashboard
-      - group: Ingest third-party security data
-        page: docs-content://solutions/security/integrations/ingest-third-party-security-data.md
-        children:
-        - page: docs-content://solutions/security/integrations/aws-config.md
-          title: AWS Config
-        - page: docs-content://solutions/security/integrations/aws-inspector.md
-          title: AWS Inspector
-        - page: docs-content://solutions/security/integrations/aws-sec-hub.md
-          title: AWS Security Hub
-        - page: docs-content://solutions/security/integrations/aws-security-hub-cspm.md
-          title: AWS Security Hub CSPM
-        - page: docs-content://solutions/security/integrations/cncf-falco.md
-          title: CNCF Falco
-        - page: docs-content://solutions/security/integrations/google-security-command-center.md
-          title: Google Security Command Center
-        - page: docs-content://solutions/security/integrations/microsoft-defender-for-cloud.md
-          title: Microsoft Defender for Cloud
-        - page: docs-content://solutions/security/integrations/microsoft-defender-for-endpoint.md
-          title: Microsoft Defender for Endpoint
-        - page: docs-content://solutions/security/integrations/microsoft-defender-xdr.md
-          title: Microsoft Defender XDR
-        - page: docs-content://solutions/security/integrations/prisma-cloud.md
-          title: Prisma Cloud
-        - page: docs-content://solutions/security/integrations/qualys.md
-          title: Qualys VMDR
-        - page: docs-content://solutions/security/integrations/rapid7.md
-          title: Rapid7 InsightVM
-        - page: docs-content://solutions/security/integrations/tenablevm.md
-          title: Tenable VM
-        - page: docs-content://solutions/security/integrations/wiz.md
-          title: Wiz
-      - group: Investigation tools
-        page: docs-content://solutions/security/investigate.md
-        children:
-        - group: Timeline
-          page: docs-content://solutions/security/investigate/timeline.md
-          children:
-          - page: docs-content://solutions/security/investigate/timeline-templates.md
-            title: Timeline templates
-        - page: docs-content://solutions/security/investigate/visual-event-analyzer.md
-          title: Visual event analyzer
-        - page: docs-content://solutions/security/investigate/session-view.md
-          title: Session View
-        - group: Osquery
-          page: docs-content://solutions/security/investigate/osquery.md
-          children:
-          - page: docs-content://solutions/security/investigate/manage-integration.md
-            title: Osquery manager integration
-          - page: docs-content://solutions/security/investigate/osquery-faq.md
-            title: Osquery FAQ
-          - page: docs-content://solutions/security/investigate/add-osquery-response-actions.md
-            title: Add Osquery Response Actions
-          - page: docs-content://solutions/security/investigate/run-osquery-from-investigation-guides.md
-            title: Run Osquery from investigation guides
-          - page: docs-content://solutions/security/investigate/run-osquery-from-alerts.md
-            title: Run Osquery from alerts
-          - page: docs-content://solutions/security/investigate/examine-osquery-results.md
-            title: Examine Osquery results
-          - page: docs-content://solutions/security/investigate/use-placeholder-fields-in-osquery-queries.md
-            title: Use placeholder fields in Osquery queries
-        - page: docs-content://solutions/security/investigate/notes.md
-          title: Notes
-        - page: docs-content://solutions/security/investigate/indicators-of-compromise.md
-          title: Indicators of compromise
-        - page: docs-content://solutions/security/investigate/security-cases.md
-          title: Cases
-      - group: Dashboards
-        page: docs-content://solutions/security/dashboards.md
-        children:
-        - page: docs-content://solutions/security/dashboards/overview-dashboard.md
-          title: Overview dashboard
-        - page: docs-content://solutions/security/dashboards/detection-response-dashboard.md
-          title: "Detection & Response dashboard"
-        - page: docs-content://solutions/security/dashboards/cloud-security-posture-dashboard.md
-          title: Cloud Security Posture dashboard
-        - page: docs-content://solutions/security/dashboards/kubernetes-dashboard.md
-          title: Kubernetes dashboard
-        - page: docs-content://solutions/security/dashboards/entity-analytics-dashboard.md
-          title: Entity Analytics dashboard
-        - page: docs-content://solutions/security/dashboards/data-quality-dashboard.md
-          title: Data Quality dashboard
-        - page: docs-content://solutions/security/dashboards/cloud-native-vulnerability-management-dashboard.md
-          title: Cloud Native Vulnerability Management Dashboard
-        - page: docs-content://solutions/security/dashboards/detection-rule-monitoring-dashboard.md
-          title: Detection rule monitoring dashboard
-        - page: docs-content://solutions/security/dashboards/endpoint-detection-response-dashboard.md
-          title: Endpoint Detection and Response dashboard
-      - group: Entity analytics
-        page: docs-content://solutions/security/advanced-entity-analytics.md
-        children:
-        - page: docs-content://solutions/security/advanced-entity-analytics/overview.md
-          title: Entity analytics overview
-        - group: Entity risk scoring
-          page: docs-content://solutions/security/advanced-entity-analytics/entity-risk-scoring.md
-          children:
-          - page: docs-content://solutions/security/advanced-entity-analytics/entity-risk-scoring-requirements.md
-            title: Entity risk scoring requirements
-          - page: docs-content://solutions/security/advanced-entity-analytics/turn-on-risk-scoring-engine.md
-            title: Turn on the risk scoring engine
-          - page: docs-content://solutions/security/advanced-entity-analytics/view-entity-details.md
-            title: View entity details
-          - page: docs-content://solutions/security/advanced-entity-analytics/asset-criticality.md
-            title: Asset criticality
-          - page: docs-content://solutions/security/advanced-entity-analytics/entity-store.md
-            title: Entity store
-          - page: docs-content://solutions/security/advanced-entity-analytics/view-analyze-risk-score-data.md
-            title: View and analyze risk score data
-        - group: Advanced behavioral detections
-          page: docs-content://solutions/security/advanced-entity-analytics/advanced-behavioral-detections.md
+          - page: docs-content://solutions/security/dashboards/entity-analytics-dashboard.md
+            title: Entity Analytics dashboard
+          - page: docs-content://solutions/security/dashboards/data-quality-dashboard.md
+            title: Data Quality dashboard
+          - page: docs-content://solutions/security/dashboards/cloud-native-vulnerability-management-dashboard.md
+            title: Cloud Native Vulnerability Management Dashboard
+          - page: docs-content://solutions/security/dashboards/detection-rule-monitoring-dashboard.md
+            title: Detection rule monitoring dashboard
+          - page: docs-content://solutions/security/dashboards/endpoint-detection-response-dashboard.md
+            title: Endpoint Detection and Response dashboard
+        - group: Entity analytics
+          page: docs-content://solutions/security/advanced-entity-analytics.md
           children:
-          - page: docs-content://solutions/security/advanced-entity-analytics/machine-learning-job-rule-requirements.md
-            title: Machine learning job and rule requirements
-          - page: docs-content://solutions/security/advanced-entity-analytics/anomaly-detection.md
-            title: Anomaly detection
-          - page: docs-content://solutions/security/advanced-entity-analytics/optimizing-anomaly-results.md
-            title: Optimizing anomaly results
-          - page: docs-content://solutions/security/advanced-entity-analytics/behavioral-detection-use-cases.md
-            title: Behavioral detection use cases
-        - group: Privileged user monitoring
-          page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring.md
-          children:
-          - page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring-requirements.md
-            title: Privileged user monitoring requirements
-          - page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring-setup.md
-            title: Set up privileged user monitoring
-          - page: docs-content://solutions/security/advanced-entity-analytics/monitor-privileged-user-activitites.md
-            title: Monitor privileged user activities
-        - group: Explore
-          page: docs-content://solutions/security/advanced-entity-analytics/explore.md
-          children:
-          - page: docs-content://solutions/security/advanced-entity-analytics/hosts-page.md
-            title: Hosts page
-          - group: Network page
-            page: docs-content://solutions/security/advanced-entity-analytics/network-page.md
-            children:
-            - page: docs-content://solutions/security/advanced-entity-analytics/configure-network-map-data.md
-              title: Configure network map data
-            - page: docs-content://solutions/security/advanced-entity-analytics/configure-dns-histogram.md
-              title: Configure the DNS histogram
-          - page: docs-content://solutions/security/advanced-entity-analytics/users-page.md
-            title: Users page
-      - page: docs-content://solutions/security/security-serverless-feature-tiers.md
-        title: Serverless feature tiers
-      - page: docs-content://solutions/security/apis.md
-        title: APIs
-  - label: Reference
+          - page: docs-content://solutions/security/advanced-entity-analytics/overview.md
+            title: Entity analytics overview
+          - group: Entity risk scoring
+            page: docs-content://solutions/security/advanced-entity-analytics/entity-risk-scoring.md
+            children:
+            - page: docs-content://solutions/security/advanced-entity-analytics/entity-risk-scoring-requirements.md
+              title: Entity risk scoring requirements
+            - page: docs-content://solutions/security/advanced-entity-analytics/turn-on-risk-scoring-engine.md
+              title: Turn on the risk scoring engine
+            - page: docs-content://solutions/security/advanced-entity-analytics/view-entity-details.md
+              title: View entity details
+            - page: docs-content://solutions/security/advanced-entity-analytics/asset-criticality.md
+              title: Asset criticality
+            - page: docs-content://solutions/security/advanced-entity-analytics/entity-store.md
+              title: Entity store
+            - page: docs-content://solutions/security/advanced-entity-analytics/view-analyze-risk-score-data.md
+              title: View and analyze risk score data
+          - group: Advanced behavioral detections
+            page: docs-content://solutions/security/advanced-entity-analytics/advanced-behavioral-detections.md
+            children:
+            - page: docs-content://solutions/security/advanced-entity-analytics/machine-learning-job-rule-requirements.md
+              title: Machine learning job and rule requirements
+            - page: docs-content://solutions/security/advanced-entity-analytics/anomaly-detection.md
+              title: Anomaly detection
+            - page: docs-content://solutions/security/advanced-entity-analytics/optimizing-anomaly-results.md
+              title: Optimizing anomaly results
+            - page: docs-content://solutions/security/advanced-entity-analytics/behavioral-detection-use-cases.md
+              title: Behavioral detection use cases
+          - group: Privileged user monitoring
+            page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring.md
+            children:
+            - page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring-requirements.md
+              title: Privileged user monitoring requirements
+            - page: docs-content://solutions/security/advanced-entity-analytics/privileged-user-monitoring-setup.md
+              title: Set up privileged user monitoring
+            - page: docs-content://solutions/security/advanced-entity-analytics/monitor-privileged-user-activitites.md
+              title: Monitor privileged user activities
+          - group: Explore
+            page: docs-content://solutions/security/advanced-entity-analytics/explore.md
+            children:
+            - page: docs-content://solutions/security/advanced-entity-analytics/hosts-page.md
+              title: Hosts page
+            - group: Network page
+              page: docs-content://solutions/security/advanced-entity-analytics/network-page.md
+              children:
+              - page: docs-content://solutions/security/advanced-entity-analytics/configure-network-map-data.md
+                title: Configure network map data
+              - page: docs-content://solutions/security/advanced-entity-analytics/configure-dns-histogram.md
+                title: Configure the DNS histogram
+            - page: docs-content://solutions/security/advanced-entity-analytics/users-page.md
+              title: Users page
+        - page: docs-content://solutions/security/security-serverless-feature-tiers.md
+          title: Serverless feature tiers
+        - page: docs-content://solutions/security/apis.md
+          title: APIs
+
+  - section: APIs
+    url: https://www.elastic.co/docs/api
+
+  - section: Reference
+    url: /reference/
     children:
     - toc: docs-content://reference
     - toc: elasticsearch://reference/elasticsearch
@@ -3963,7 +4370,13 @@ nav:
     - page: docs-content://explore-analyze/numeral-formatting.md
       title: Numeral formatting
     - toc: elasticsearch://reference/text-analysis
-  - label: Release notes
+    - island: Logstash plugins
+      toc: logstash-docs-md://lsr
+    - island: Logstash versioned plugins
+      toc: logstash-docs-md://vpr
+
+  - section: Release notes
+    url: /release-notes/
     children:
     - toc: docs-content://release-notes/intro
       children:
@@ -4030,6 +4443,28 @@ nav:
         # ECCTL
         - toc: ecctl://release-notes
 
-  - label: Troubleshoot
+  - section: Troubleshoot
+    url: /troubleshoot/
     children:
     - toc: docs-content://troubleshoot
+
+  - section: Extension points
+    url: /extend/
+    isolated: true
+    children:
+    - toc: docs-content://extend
+      children:
+      - toc: kibana://extend
+      - toc: logstash://extend
+      - toc: beats://extend
+      - toc: elasticsearch://extend
+      - toc: integrations://extend
+
+  # Disabled pending a decision on whether to keep the contribute-docs
+  # content in the public site. Re-enable to resurface ~35 pages.
+  # - section: Contribute
+  #   url: /contribute-docs/
+  #   isolated: true
+  #   children:
+  #   - toc: docs-content://contribute-docs
+

From 500e5e624f65a39fef80c79a59db87d6012f2740 Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Tue, 12 May 2026 14:47:38 +0200
Subject: [PATCH 174/226] Fix isolated preview header visibility with fixed
 chrome + flow spacer

Sticky preview chrome could sit under Nav V2 layout/stacking on serve.
Use fixed top bar with z-[60] and an in-flow h-12 spacer so content clears
the preview header reliably.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Documentation.Site/Assets/isolated.css           | 3 +--
 src/Elastic.Documentation.Site/Layout/_IsolatedHeader.cshtml | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/isolated.css b/src/Elastic.Documentation.Site/Assets/isolated.css
index 6dd8e90079..b2e32ccf12 100644
--- a/src/Elastic.Documentation.Site/Assets/isolated.css
+++ b/src/Elastic.Documentation.Site/Assets/isolated.css
@@ -6,8 +6,7 @@
 }
 
 /*
- * Preview chrome must stack above the pages sidebar (z-40 on small screens) and the
- * mobile drawer overlay (z-30). The host uses z-50 in _IsolatedHeader.cshtml.
+ * Preview chrome: fixed bar uses z-[60] in _IsolatedHeader.cshtml (above sidebar z-40 / overlay z-30).
  * Until the custom element upgrades, keep a visible bar so the strip is not mistaken for “missing”.
  */
 elastic-docs-header:not(:defined) {
diff --git a/src/Elastic.Documentation.Site/Layout/_IsolatedHeader.cshtml b/src/Elastic.Documentation.Site/Layout/_IsolatedHeader.cshtml
index 2774f5eb1c..24b2706bb1 100644
--- a/src/Elastic.Documentation.Site/Layout/_IsolatedHeader.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_IsolatedHeader.cshtml
@@ -1,5 +1,6 @@
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
-<div class="relative isolate sticky top-0 z-50 h-12 border-b border-grey-20">
+@* Fixed chrome + in-flow spacer: sticky was losing the strip under Nav V2 / grid stacking on isolated serve. *@
+<div class="fixed inset-x-0 top-0 z-[60] flex h-12 shrink-0 border-b border-grey-20 bg-ink-navy">
 	<elastic-docs-header title="@(Model.HeaderTitle ?? Model.DocSetName)"
 	                     logo-href="@(Model.Link("/"))"
 	                     github-repository="@(Model.GitRepository)"
@@ -12,3 +13,4 @@
 	                     icon-src="@(Model.BrandingIconStaticPath)">
 	</elastic-docs-header>
 </div>
+<div class="h-12 w-full shrink-0 pointer-events-none" aria-hidden="true"></div>

From db5f8ee20c95a98656c13d4c2b175188a0dbed1b Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 12 May 2026 14:49:26 +0200
Subject: [PATCH 175/226] Remove landing sidebar gutter

Keep the docs landing background flush with the Guide sidebar so the home page reads as part of the section shell.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Markdown/_Layout.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Elastic.Markdown/_Layout.cshtml b/src/Elastic.Markdown/_Layout.cshtml
index 1c5aa95411..aafed15025 100644
--- a/src/Elastic.Markdown/_Layout.cshtml
+++ b/src/Elastic.Markdown/_Layout.cshtml
@@ -74,7 +74,7 @@
 	{
 		<div class="relative">
 			<div class="min-h-screen w-full max-w-(--max-layout-width) mx-auto md:px-4">
-				<div class="min-h-screen grid grid-cols-1 md:grid-cols-[var(--max-sidebar-width)_1fr] gap-4">
+				<div class="min-h-screen grid grid-cols-1 md:grid-cols-[var(--max-sidebar-width)_1fr] gap-0">
 					@await RenderPartialAsync(_PagesNav.Create<GlobalLayoutViewModel>(Model))
 					<main id="content-container" class="min-w-0">
 						<input type="checkbox" class="hidden" id="pages-nav-hamburger">

From 2b43d6a96641f4bd06f0a078b7ac0a14e3c9c5ef Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 12 May 2026 14:59:12 +0200
Subject: [PATCH 176/226] Render nav search shell without preview API

Keep the sidebar jump-to-page field visible in remote previews even when the docs API is unavailable, while disabling interaction instead of unmounting the component.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../NavigationSearch/NavigationSearch.tsx     | 24 ++++++++++++++-----
 .../NavigationSearchComponent.tsx             | 12 +++++++---
 .../NavigationSearch/SearchInput.tsx          | 13 ++++++++++
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearch.tsx b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearch.tsx
index ad7c966abf..90a7c8b7d4 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearch.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearch.tsx
@@ -27,11 +27,13 @@ import { useRef, useState, useEffect } from 'react'
 interface Props {
     placeholder?: string
     size?: 's' | 'm' | 'l'
+    disabled?: boolean
 }
 
 export const NavigationSearch = ({
     placeholder = 'Jump to page',
     size = 'm',
+    disabled = false,
 }: Props) => {
     const { euiTheme } = useEuiTheme()
     const isMobile = useIsWithinMaxBreakpoint('s')
@@ -114,6 +116,9 @@ export const NavigationSearch = ({
     }
 
     useGlobalKeyboardShortcut('k', () => {
+        if (disabled) {
+            return
+        }
         trackOpened('keyboard_shortcut')
         inputRef.current?.focus()
         inputRef.current?.select()
@@ -154,9 +159,13 @@ export const NavigationSearch = ({
             panelProps={{
                 css: css`
                     border-radius: ${euiTheme.size.s};
-                    visibility: ${isPopoverOpen ? 'visible' : 'hidden'};
-                    opacity: ${isPopoverOpen ? 1 : 0};
-                    pointer-events: ${isPopoverOpen ? 'auto' : 'none'};
+                    visibility: ${isPopoverOpen && !disabled
+                        ? 'visible'
+                        : 'hidden'};
+                    opacity: ${isPopoverOpen && !disabled ? 1 : 0};
+                    pointer-events: ${isPopoverOpen && !disabled
+                        ? 'auto'
+                        : 'none'};
                 `,
                 onMouseDown: (e: React.MouseEvent) => {
                     // Prevent input blur when clicking anywhere inside the popover panel
@@ -172,6 +181,9 @@ export const NavigationSearch = ({
                         value={searchTerm}
                         onChange={handleChange}
                         onFocus={() => {
+                            if (disabled) {
+                                return
+                            }
                             trackOpened('focus')
                             if (hasContent) {
                                 setIsPopoverOpen(true)
@@ -179,13 +191,13 @@ export const NavigationSearch = ({
                         }}
                         onBlur={handleBlur}
                         onKeyDown={handleKeyDown}
-                        disabled={isSearchCooldownActive}
-                        isLoading={isSearching}
+                        disabled={disabled || isSearchCooldownActive}
+                        isLoading={!disabled && isSearching}
                     />
                 </>
             }
         >
-            {hasContent && (
+            {hasContent && !disabled && (
                 <div ref={popoverContentRef}>
                     <SearchDropdownContent
                         isKeyboardNavigating={isKeyboardNavigating}
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
index 351bf07e66..e5f796a823 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
@@ -13,6 +13,7 @@ interface NavigationSearchProps {
 }
 
 const NavigationSearchInner = ({ placeholder }: NavigationSearchProps) => {
+    const shouldCheckApi = config.buildType !== 'codex' && !config.airGapped
     const { data: isApiAvailable } = useQuery({
         queryKey: ['api-health'],
         queryFn: async () => {
@@ -23,13 +24,15 @@ const NavigationSearchInner = ({ placeholder }: NavigationSearchProps) => {
         },
         staleTime: 60 * 60 * 1000, // 60 minutes
         retry: false,
-        enabled: config.buildType !== 'codex' && !config.airGapped,
+        enabled: shouldCheckApi,
     })
 
-    if (config.airGapped || (!isApiAvailable && config.buildType !== 'codex')) {
+    if (config.airGapped) {
         return null
     }
 
+    const isSearchUnavailable = shouldCheckApi && isApiAvailable === false
+
     return (
         <div
             className="sticky top-0"
@@ -40,7 +43,10 @@ const NavigationSearchInner = ({ placeholder }: NavigationSearchProps) => {
                 padding-left: 0;
             `}
         >
-            <NavigationSearch placeholder={placeholder} />
+            <NavigationSearch
+                placeholder={placeholder}
+                disabled={isSearchUnavailable}
+            />
         </div>
     )
 }
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchInput.tsx b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchInput.tsx
index f2ceedb077..cc52ad6b46 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchInput.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/SearchInput.tsx
@@ -140,6 +140,19 @@ export const SearchInput = ({
                         outline: none;
                         box-shadow: none;
                     }
+
+                    &:disabled {
+                        cursor: not-allowed;
+                        opacity: 1;
+                        color: ${euiTheme.colors.textSubdued};
+                        -webkit-text-fill-color: ${euiTheme.colors.textSubdued};
+                        background: #ffffff;
+                    }
+
+                    &:disabled::placeholder {
+                        color: ${navSearchMuted};
+                        opacity: 1;
+                    }
                 `}
             />
 

From 13ed1dd2493d9eecaa52074235e263e10d46a534 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 12 May 2026 15:06:28 +0200
Subject: [PATCH 177/226] fix(nav-v2): resolve islands via parent chain for
 nested-toc islands
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Island lookup keyed off currentRootNavigation.Id, which always returns
the outermost toc root. Islands that wrap a nested toc (where the page's
NavigationRoot is the enclosing toc, not the wrapped toc) never matched
and were rendered as part of their parent section instead — missing the
focused sidebar and back arrow.

For example, navigation.yml nests logstash-docs-md://lsr inside
docs-content://reference, so /reference/logstash/plugins pages have
currentRootNavigation.Id = the Reference root. The lsr-keyed entry in
_tocRootToIsland was never found, and the page rendered as a Reference
section page with no back arrow.

Replace GetIslandForTocRoot with GetIslandForNavigationItem, which walks
up the page's Parent chain and returns the first ancestor whose Id is
registered as an island. Update GlobalNavigationHtmlWriter to use the
current page item instead of its outermost root.

Verified with assembler build --environment dev:
- /docs/reference/logstash/plugins/ → back arrow + island sidebar
- /docs/reference/logstash/plugins/plugins-codecs-rubydebug/ → back arrow
- /docs/reference/logstash/versioned-plugins/ → back arrow + island sidebar
- /docs/extend/ → isolated section sidebar, no back arrow (unchanged)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../V2/SiteNavigationV2.cs                    | 19 +++++++++++++++----
 .../Navigation/GlobalNavigationHtmlWriter.cs  |  7 +++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 1f6057df51..3c904287c3 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -59,11 +59,22 @@ public SiteNavigationV2(
 	public IReadOnlyList<NavigationIsland> Islands { get; }
 
 	/// <summary>
-	/// Resolves which island a page belongs to by its toc root.
-	/// Uses the nav ownership model — the toc root that owns the page determines the island.
+	/// Resolves which island a page belongs to by walking up its parent chain.
+	/// Returns the innermost registered toc root, so islands that wrap nested tocs
+	/// (whose pages have an outer toc as their NavigationRoot) still resolve correctly.
 	/// </summary>
-	public NavigationIsland? GetIslandForTocRoot(IRootNavigationItem<INavigationModel, INavigationItem> tocRoot) =>
-		_tocRootToIsland.GetValueOrDefault(tocRoot.Id);
+	public NavigationIsland? GetIslandForNavigationItem(INavigationItem item)
+	{
+		var current = item;
+		while (current is not null)
+		{
+			if (current is INodeNavigationItem<INavigationModel, INavigationItem> node
+				&& _tocRootToIsland.TryGetValue(node.Id, out var island))
+				return island;
+			current = current.Parent;
+		}
+		return null;
+	}
 
 	/// <summary>
 	/// Resolves which section a page belongs to by its URL.
diff --git a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
index 1f93a310ff..11737f4cec 100644
--- a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -29,7 +29,7 @@ public async Task<NavigationRenderResult> RenderNavigation(
 	{
 		// V2 nav: render per-section sidebar based on current page
 		if (globalNavigation is SiteNavigationV2 navV2)
-			return await RenderSectionNavigation(navV2, currentRootNavigation, currentNavigationItem, ctx);
+			return await RenderSectionNavigation(navV2, currentNavigationItem, ctx);
 
 		if (currentRootNavigation is SiteNavigation)
 			return NavigationRenderResult.Empty;
@@ -69,13 +69,12 @@ public async Task<NavigationRenderResult> RenderNavigation(
 
 	private async Task<NavigationRenderResult> RenderSectionNavigation(
 		SiteNavigationV2 navV2,
-		IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation,
 		INavigationItem currentNavigationItem,
 		Cancel ctx
 	)
 	{
-		// Islands take priority: if the current toc root is an island, render the island sidebar
-		var island = navV2.GetIslandForTocRoot(currentRootNavigation);
+		// Islands take priority: if any ancestor toc root of the current page is an island, render the island sidebar
+		var island = navV2.GetIslandForNavigationItem(currentNavigationItem);
 		if (island is not null)
 			return await RenderIslandNavigation(island, navV2, ctx);
 

From c732b16e4ed5c401cbdeab8bca1c13c35bead61b Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 12 May 2026 15:06:28 +0200
Subject: [PATCH 178/226] fix(nav-v2): resolve islands via parent chain for
 nested-toc islands
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Island lookup keyed off currentRootNavigation.Id, which always returns
the outermost toc root. Islands that wrap a nested toc (where the page's
NavigationRoot is the enclosing toc, not the wrapped toc) never matched
and were rendered as part of their parent section instead — missing the
focused sidebar and back arrow.

For example, navigation.yml nests logstash-docs-md://lsr inside
docs-content://reference, so /reference/logstash/plugins pages have
currentRootNavigation.Id = the Reference root. The lsr-keyed entry in
_tocRootToIsland was never found, and the page rendered as a Reference
section page with no back arrow.

Replace GetIslandForTocRoot with GetIslandForNavigationItem, which walks
up the page's Parent chain and returns the first ancestor whose Id is
registered as an island. Update GlobalNavigationHtmlWriter to use the
current page item instead of its outermost root.

Verified with assembler build --environment dev:
- /docs/reference/logstash/plugins/ → back arrow + island sidebar
- /docs/reference/logstash/plugins/plugins-codecs-rubydebug/ → back arrow
- /docs/reference/logstash/versioned-plugins/ → back arrow + island sidebar
- /docs/extend/ → isolated section sidebar, no back arrow (unchanged)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../V2/SiteNavigationV2.cs                    | 19 +++++++++++++++----
 .../Navigation/GlobalNavigationHtmlWriter.cs  |  7 +++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 9c2310e9c3..c33dbed9a3 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -63,11 +63,22 @@ public SiteNavigationV2(
 	public IReadOnlyList<NavigationIsland> Islands { get; }
 
 	/// <summary>
-	/// Resolves which island a page belongs to by its toc root.
-	/// Uses the nav ownership model — the toc root that owns the page determines the island.
+	/// Resolves which island a page belongs to by walking up its parent chain.
+	/// Returns the innermost registered toc root, so islands that wrap nested tocs
+	/// (whose pages have an outer toc as their NavigationRoot) still resolve correctly.
 	/// </summary>
-	public NavigationIsland? GetIslandForTocRoot(IRootNavigationItem<INavigationModel, INavigationItem> tocRoot) =>
-		_tocRootToIsland.GetValueOrDefault(tocRoot.Id);
+	public NavigationIsland? GetIslandForNavigationItem(INavigationItem item)
+	{
+		var current = item;
+		while (current is not null)
+		{
+			if (current is INodeNavigationItem<INavigationModel, INavigationItem> node
+				&& _tocRootToIsland.TryGetValue(node.Id, out var island))
+				return island;
+			current = current.Parent;
+		}
+		return null;
+	}
 
 	INavigationItem? INavigationTraversable.GetPrevious(IDocumentationFile current)
 	{
diff --git a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
index caef5c711d..5c15386d0d 100644
--- a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -29,7 +29,7 @@ public async Task<NavigationRenderResult> RenderNavigation(
 	{
 		// V2 nav: render per-section sidebar based on current page
 		if (globalNavigation is SiteNavigationV2 navV2)
-			return await RenderSectionNavigation(navV2, currentRootNavigation, currentNavigationItem, ctx);
+			return await RenderSectionNavigation(navV2, currentNavigationItem, ctx);
 
 		if (currentRootNavigation is SiteNavigation)
 			return NavigationRenderResult.Empty;
@@ -69,13 +69,12 @@ public async Task<NavigationRenderResult> RenderNavigation(
 
 	private async Task<NavigationRenderResult> RenderSectionNavigation(
 		SiteNavigationV2 navV2,
-		IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation,
 		INavigationItem currentNavigationItem,
 		Cancel ctx
 	)
 	{
-		// Islands take priority: if the current toc root is an island, render the island sidebar
-		var island = navV2.GetIslandForTocRoot(currentRootNavigation);
+		// Islands take priority: if any ancestor toc root of the current page is an island, render the island sidebar
+		var island = navV2.GetIslandForNavigationItem(currentNavigationItem);
 		if (island is not null)
 			return await RenderIslandNavigation(island, navV2, ctx);
 

From dba171799e3af3ccfb505bd62002a3fe09b006e3 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 12 May 2026 15:37:52 +0200
Subject: [PATCH 179/226] feat(nav-v2): wire Account and preferences as island
 under Deployment tools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cloud-account is a top-level toc in docs-content (9 pages on user
account/preferences settings, project: "Cloud account") and is wired
in V1 navigation.yml as a top-level toc, but had no entry in V2 —
pages rendered with the default Guides sidebar and no entry point.

Add it as an island under the existing "Deployment and administration
tools" group inside the "Install, deploy, and administer" label,
following the prior design intent from 1e4da5a3e. Users get a focused
sidebar and back arrow when in account pages, and the entry point is
visible in the main Guides sidebar.

Verified with assembler build --environment dev:
- Build logs "Rendering V2 island navigation: Account and preferences"
- /docs/cloud-account/ now shows back-arrow SVG + island sidebar

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 5eb90e98f7..730206c69c 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -1641,6 +1641,8 @@ nav:
           - toc: ecctl://reference
           - page: elasticsearch://reference/elasticsearch/command-line-tools/index.md
             title: Command-line tools
+          - island: Account and preferences
+            toc: docs-content://cloud-account
     - label: The Elasticsearch platform
       children:
       - label: Ingest and manage data

From e7dde7290c7a0e4487f8fc107936adbb1e99f47d Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 12 May 2026 15:37:52 +0200
Subject: [PATCH 180/226] feat(nav-v2): wire Account and preferences as island
 under Deployment tools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cloud-account is a top-level toc in docs-content (9 pages on user
account/preferences settings, project: "Cloud account") and is wired
in V1 navigation.yml as a top-level toc, but had no entry in V2 —
pages rendered with the default Guides sidebar and no entry point.

Add it as an island under the existing "Deployment and administration
tools" group inside the "Install, deploy, and administer" label,
following the prior design intent from 1e4da5a3e. Users get a focused
sidebar and back arrow when in account pages, and the entry point is
visible in the main Guides sidebar.

Verified with assembler build --environment dev:
- Build logs "Rendering V2 island navigation: Account and preferences"
- /docs/cloud-account/ now shows back-arrow SVG + island sidebar

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 config/navigation-v2.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index b0c86962ed..df68cea89d 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -1641,6 +1641,8 @@ nav:
           - toc: ecctl://reference
           - page: elasticsearch://reference/elasticsearch/command-line-tools/index.md
             title: Command-line tools
+          - island: Account and preferences
+            toc: docs-content://cloud-account
     - label: The Elasticsearch platform
       children:
       - label: Ingest and manage data

From a3464963b344a4a3977b6f6ae43e0e170ca89a3f Mon Sep 17 00:00:00 2001
From: Alex Cerezo <hello.alexcerezo@gmail.com>
Date: Tue, 12 May 2026 15:56:21 +0200
Subject: [PATCH 181/226] Guard deployment header links when githubRepository
 is unset

r2wc can pass undefined for optional attrs; getDeploymentLinks must not
call .includes on undefined or the header React tree crashes on serve.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../web-components/Header/DeploymentInfo.tsx  | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx b/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx
index e2f83a464b..a54259d898 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx
@@ -270,23 +270,29 @@ function getDeploymentSubtitle(githubRef?: string): string {
 const GITHUB_BASE = 'https://github.com'
 
 function getDeploymentLinks(
-    githubRepository: string,
-    gitBranch: string,
-    gitCommit: string,
+    githubRepository: string | undefined,
+    gitBranch: string | undefined,
+    gitCommit: string | undefined,
     githubRef?: string
 ): { ref?: string; branch: string; commit: string; repository: string } {
-    // Backend passes full org/repo; fallback only fires for bare names (shouldn't occur)
-    const repo = githubRepository.includes('/')
-        ? githubRepository
-        : `elastic/${githubRepository}`
+    // Web component attrs can be missing at runtime; avoid throwing on .includes().
+    const raw = (githubRepository ?? '').trim()
+    const repo = raw.includes('/')
+        ? raw
+        : raw.length > 0
+            ? `elastic/${raw}`
+            : 'elastic/docs-builder'
     const base = `${GITHUB_BASE}/${repo}`
+    const branchName = (gitBranch ?? '').trim() || 'main'
+    const commitSha = (gitCommit ?? '').trim()
     const pull = githubRef != null ? parseGitHubRef(githubRef) : undefined
     const pullUrl =
         pull?.kind === 'pull' ? `${base}/pull/${pull.number}` : undefined
     return {
         ref: pullUrl,
-        branch: `${base}/tree/${gitBranch}`,
-        commit: `${base}/commit/${gitCommit}`,
+        branch: `${base}/tree/${encodeURIComponent(branchName)}`,
+        commit:
+            commitSha.length > 0 ? `${base}/commit/${commitSha}` : `${base}/commits`,
         repository: base,
     }
 }

From cbeb5e86581ce4034d14fb471c5e247c6b602efd Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 12 May 2026 16:10:34 +0200
Subject: [PATCH 182/226] fix(nav-v2): swap full chrome when entering an island
 from parent sidebar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The body has hx-boost="true", so clicking an island entry-point from
its parent section's sidebar gets intercepted by HTMX. Island links
used the default nav swap (#content-container,#toc-nav), which updates
the page content + right-hand TOC but leaves the left-hand sidebar on
the parent section's tree.

Result: clicking "Account and preferences" from the Guides sidebar
took users to /cloud-account/ with the Guides sidebar still showing —
the island appeared "not to open" even though a hard refresh would
render the island view correctly.

Add an IslandNavigationNode branch in _TocTreeNavV2.cshtml that uses
hx-select-oob=#main-container,#secondary-nav (the same swap as section
tabs and the island's own back arrow), and propagate an IsIslandSubtree
flag down so the island's descendants rendered inline in the parent
sidebar also use the full-chrome swap.

Once inside the island view, sibling navigation uses the regular
content+TOC swap (IsIslandSubtree is false in the island's own
NavigationTreeItem), so the island sidebar persists across page-to-page
navigation within the island — that part already worked.

Verified locally:
- Guides sidebar → "Account and preferences" link: full-chrome swap
- Reference sidebar → "Logstash plugins" (island entry): full-chrome
- Inside /cloud-account/, sibling page links: regular nav swap

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../Navigation/NavigationTreeItem.cs          |  5 ++
 .../Navigation/_TocTreeNavV2.cshtml           | 86 +++++++++++++++++--
 2 files changed, 83 insertions(+), 8 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs b/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs
index 85c15e23d5..dfc09e2e40 100644
--- a/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs
+++ b/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs
@@ -16,4 +16,9 @@ public class NavigationTreeItem
 	public required bool IsGlobalAssemblyBuild { get; init; }
 	public required string RootNavigationId { get; set; }
 	public required IHtmxAttributeProvider Htmx { get; init; }
+
+	/// <summary>True when this subtree renders inside an island (entry-point + descendants).
+	/// Links here must swap the full page chrome so clicking from a parent section's sidebar
+	/// switches into the island's focused sidebar.</summary>
+	public bool IsIslandSubtree { get; init; }
 }
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index 63f263298a..fbd0b9ccc0 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -6,6 +6,11 @@
 @inherits RazorSlice<NavigationTreeItem>
 @{
 	var isTopLevel = Model.Level == 0 && Model.SubTree is not LabelNavigationNode;
+	// Inside an island subtree, every link must swap the full page chrome so the sidebar
+	// switches from the parent section's tree to the island's focused tree.
+	var navHxAttrs = Model.IsIslandSubtree
+		? Model.Htmx.GetHxAttributes(hxSwapOob: "#main-container,#secondary-nav", preload: null)
+		: Model.Htmx.GetNavHxAttributes(true, null);
 }
 @foreach (var item in Model.SubTree.NavigationItems)
 {
@@ -44,7 +49,8 @@
 						Level = Model.Level,
 						SubTree = label,
 						RootNavigationId = Model.RootNavigationId,
-						Htmx = Model.Htmx
+						Htmx = Model.Htmx,
+						IsIslandSubtree = Model.IsIslandSubtree
 					}))
 				</ul>
 			}
@@ -55,7 +61,7 @@
 		<li class="flex group/li">
 			<a
 				href="@placeholder.Url"
-				@Model.Htmx.GetNavHxAttributes(true, null)
+				@navHxAttrs
 				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 				style="--nav-level:@Model.Level">
 				<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
@@ -79,7 +85,7 @@
 				}
 				<a
 					href="@placeholderGroup.Url"
-					@Model.Htmx.GetNavHxAttributes(true, null)
+					@navHxAttrs
 					class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 					style="--nav-level:@Model.Level">
 					@if (!allHidden)
@@ -115,7 +121,70 @@
 								Level = Model.Level + 1,
 								SubTree = placeholderGroup,
 								RootNavigationId = Model.RootNavigationId,
-								Htmx = Model.Htmx
+								Htmx = Model.Htmx,
+								IsIslandSubtree = Model.IsIslandSubtree
+							}))
+						</ul>
+					</div>
+				</div>
+			}
+		</li>
+	}
+	else if (item is IslandNavigationNode island)
+	{
+		var islandHxAttrs = Model.Htmx.GetHxAttributes(hxSwapOob: "#main-container,#secondary-nav", preload: null);
+		var islandAllHidden = island.NavigationItems.All(n => n.Hidden);
+		<li class="flex flex-wrap group-navigation relative">
+			<div class="peer nav-folder-peer grid w-full grid-cols-1">
+				@if (!islandAllHidden)
+				{
+					<input
+						id="@island.Id"
+						type="checkbox"
+						class="sr-only pointer-events-none"
+						tabindex="-1"
+						aria-hidden="true">
+				}
+				<a
+					href="@island.Url"
+					@islandHxAttrs
+					class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
+					style="--nav-level:@Model.Level">
+					@if (!islandAllHidden)
+					{
+						<span class="nav-folder-chevron shrink-0" aria-hidden="true">
+							<svg
+								xmlns="http://www.w3.org/2000/svg"
+								fill="none"
+								viewBox="0 0 24 24"
+								stroke-width="1.5"
+								stroke="currentColor"
+								>
+								<path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/>
+							</svg>
+						</span>
+					}
+					else
+					{
+						<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
+					}
+					<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@island.NavigationTitle</span>
+				</a>
+			</div>
+			@if (island.NavigationItems.Count > 0)
+			{
+				<div class="docs-sidebar-nav-v2__folder-clip w-full">
+					<div class="docs-sidebar-nav-v2__folder-clip-inner">
+						<ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+							@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
+							{
+								IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
+								IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
+								Level = Model.Level + 1,
+								SubTree = island,
+								RootNavigationId = Model.RootNavigationId,
+								Htmx = Model.Htmx,
+								IsIslandSubtree = true
 							}))
 						</ul>
 					</div>
@@ -128,7 +197,7 @@
 		<li class="flex group/li">
 			<a
 				href="@group.Url"
-				@Model.Htmx.GetNavHxAttributes(true, null)
+				@navHxAttrs
 				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 				style="--nav-level:@Model.Level"
 			>
@@ -153,7 +222,7 @@
 				}
 				<a
 					href="@(folder.Url)"
-					@Model.Htmx.GetNavHxAttributes(true, null)
+					@navHxAttrs
 					class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 					style="--nav-level:@Model.Level">
 					@if (!allHidden)
@@ -189,7 +258,8 @@
 								Level = Model.Level + 1,
 								SubTree = folder,
 								RootNavigationId = Model.RootNavigationId,
-								Htmx = Model.Htmx
+								Htmx = Model.Htmx,
+								IsIslandSubtree = Model.IsIslandSubtree
 							}))
 						</ul>
 					</div>
@@ -202,7 +272,7 @@
 		<li class="flex group/li">
 			<a
 				href="@leaf.Url"
-				@Model.Htmx.GetNavHxAttributes(true, null)
+				@navHxAttrs
 				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 				style="--nav-level:@Model.Level"
 			>

From 76e274034ca6a5912ee313294c0568d95ae5343d Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 12 May 2026 16:10:34 +0200
Subject: [PATCH 183/226] fix(nav-v2): swap full chrome when entering an island
 from parent sidebar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The body has hx-boost="true", so clicking an island entry-point from
its parent section's sidebar gets intercepted by HTMX. Island links
used the default nav swap (#content-container,#toc-nav), which updates
the page content + right-hand TOC but leaves the left-hand sidebar on
the parent section's tree.

Result: clicking "Account and preferences" from the Guides sidebar
took users to /cloud-account/ with the Guides sidebar still showing —
the island appeared "not to open" even though a hard refresh would
render the island view correctly.

Add an IslandNavigationNode branch in _TocTreeNavV2.cshtml that uses
hx-select-oob=#main-container,#secondary-nav (the same swap as section
tabs and the island's own back arrow), and propagate an IsIslandSubtree
flag down so the island's descendants rendered inline in the parent
sidebar also use the full-chrome swap.

Once inside the island view, sibling navigation uses the regular
content+TOC swap (IsIslandSubtree is false in the island's own
NavigationTreeItem), so the island sidebar persists across page-to-page
navigation within the island — that part already worked.

Verified locally:
- Guides sidebar → "Account and preferences" link: full-chrome swap
- Reference sidebar → "Logstash plugins" (island entry): full-chrome
- Inside /cloud-account/, sibling page links: regular nav swap

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../Navigation/NavigationTreeItem.cs          |  5 ++
 .../Navigation/_TocTreeNavV2.cshtml           | 86 +++++++++++++++++--
 2 files changed, 83 insertions(+), 8 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs b/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs
index 85c15e23d5..dfc09e2e40 100644
--- a/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs
+++ b/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs
@@ -16,4 +16,9 @@ public class NavigationTreeItem
 	public required bool IsGlobalAssemblyBuild { get; init; }
 	public required string RootNavigationId { get; set; }
 	public required IHtmxAttributeProvider Htmx { get; init; }
+
+	/// <summary>True when this subtree renders inside an island (entry-point + descendants).
+	/// Links here must swap the full page chrome so clicking from a parent section's sidebar
+	/// switches into the island's focused sidebar.</summary>
+	public bool IsIslandSubtree { get; init; }
 }
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index 63f263298a..fbd0b9ccc0 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -6,6 +6,11 @@
 @inherits RazorSlice<NavigationTreeItem>
 @{
 	var isTopLevel = Model.Level == 0 && Model.SubTree is not LabelNavigationNode;
+	// Inside an island subtree, every link must swap the full page chrome so the sidebar
+	// switches from the parent section's tree to the island's focused tree.
+	var navHxAttrs = Model.IsIslandSubtree
+		? Model.Htmx.GetHxAttributes(hxSwapOob: "#main-container,#secondary-nav", preload: null)
+		: Model.Htmx.GetNavHxAttributes(true, null);
 }
 @foreach (var item in Model.SubTree.NavigationItems)
 {
@@ -44,7 +49,8 @@
 						Level = Model.Level,
 						SubTree = label,
 						RootNavigationId = Model.RootNavigationId,
-						Htmx = Model.Htmx
+						Htmx = Model.Htmx,
+						IsIslandSubtree = Model.IsIslandSubtree
 					}))
 				</ul>
 			}
@@ -55,7 +61,7 @@
 		<li class="flex group/li">
 			<a
 				href="@placeholder.Url"
-				@Model.Htmx.GetNavHxAttributes(true, null)
+				@navHxAttrs
 				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 				style="--nav-level:@Model.Level">
 				<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
@@ -79,7 +85,7 @@
 				}
 				<a
 					href="@placeholderGroup.Url"
-					@Model.Htmx.GetNavHxAttributes(true, null)
+					@navHxAttrs
 					class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 					style="--nav-level:@Model.Level">
 					@if (!allHidden)
@@ -115,7 +121,70 @@
 								Level = Model.Level + 1,
 								SubTree = placeholderGroup,
 								RootNavigationId = Model.RootNavigationId,
-								Htmx = Model.Htmx
+								Htmx = Model.Htmx,
+								IsIslandSubtree = Model.IsIslandSubtree
+							}))
+						</ul>
+					</div>
+				</div>
+			}
+		</li>
+	}
+	else if (item is IslandNavigationNode island)
+	{
+		var islandHxAttrs = Model.Htmx.GetHxAttributes(hxSwapOob: "#main-container,#secondary-nav", preload: null);
+		var islandAllHidden = island.NavigationItems.All(n => n.Hidden);
+		<li class="flex flex-wrap group-navigation relative">
+			<div class="peer nav-folder-peer grid w-full grid-cols-1">
+				@if (!islandAllHidden)
+				{
+					<input
+						id="@island.Id"
+						type="checkbox"
+						class="sr-only pointer-events-none"
+						tabindex="-1"
+						aria-hidden="true">
+				}
+				<a
+					href="@island.Url"
+					@islandHxAttrs
+					class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
+					style="--nav-level:@Model.Level">
+					@if (!islandAllHidden)
+					{
+						<span class="nav-folder-chevron shrink-0" aria-hidden="true">
+							<svg
+								xmlns="http://www.w3.org/2000/svg"
+								fill="none"
+								viewBox="0 0 24 24"
+								stroke-width="1.5"
+								stroke="currentColor"
+								>
+								<path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/>
+							</svg>
+						</span>
+					}
+					else
+					{
+						<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
+					}
+					<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@island.NavigationTitle</span>
+				</a>
+			</div>
+			@if (island.NavigationItems.Count > 0)
+			{
+				<div class="docs-sidebar-nav-v2__folder-clip w-full">
+					<div class="docs-sidebar-nav-v2__folder-clip-inner">
+						<ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+							@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
+							{
+								IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
+								IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
+								Level = Model.Level + 1,
+								SubTree = island,
+								RootNavigationId = Model.RootNavigationId,
+								Htmx = Model.Htmx,
+								IsIslandSubtree = true
 							}))
 						</ul>
 					</div>
@@ -128,7 +197,7 @@
 		<li class="flex group/li">
 			<a
 				href="@group.Url"
-				@Model.Htmx.GetNavHxAttributes(true, null)
+				@navHxAttrs
 				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 				style="--nav-level:@Model.Level"
 			>
@@ -153,7 +222,7 @@
 				}
 				<a
 					href="@(folder.Url)"
-					@Model.Htmx.GetNavHxAttributes(true, null)
+					@navHxAttrs
 					class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 					style="--nav-level:@Model.Level">
 					@if (!allHidden)
@@ -189,7 +258,8 @@
 								Level = Model.Level + 1,
 								SubTree = folder,
 								RootNavigationId = Model.RootNavigationId,
-								Htmx = Model.Htmx
+								Htmx = Model.Htmx,
+								IsIslandSubtree = Model.IsIslandSubtree
 							}))
 						</ul>
 					</div>
@@ -202,7 +272,7 @@
 		<li class="flex group/li">
 			<a
 				href="@leaf.Url"
-				@Model.Htmx.GetNavHxAttributes(true, null)
+				@navHxAttrs
 				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 				style="--nav-level:@Model.Level"
 			>

From ffda3ab3ffd0a4fe2a7475dff398281cb70fb85b Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 13 May 2026 16:28:46 +0200
Subject: [PATCH 184/226] fix(nav-v2): address CodeRabbit nav-v2 contract +
 assembler comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tighten the nullable-parent contract across V2 navigation node types
and fix two nav-v2 assembler issues flagged by CodeRabbit on PR #3256:

V2 navigation nodes — make constructor parent non-nullable so the
NavigationRoot property (which is typed non-nullable) is never silently
populated with null via parent?.NavigationRoot!. All call sites already
pass a non-null parent.

  - IslandNavigationNode
  - LabelNavigationNode
  - PageCrossLinkLeaf
  - PageFolderNavigationNode
  - PlaceholderNavigationLeaf
  - PlaceholderNavigationNode
  - SectionNavigationNode

AssemblerBuildService — fail fast when nav-v2 is enabled but
config/navigation-v2.yml is missing instead of silently falling back
to V1 navigation. Flagged builds should never produce the wrong
navigation model.

GlobalNavigationHtmlWriter — prefix TitleUrl with the site path
through CombineWithSitePrefix (it was previously raw section.Url),
so the sidebar title link works under non-root prefixes like
/docs/3256/.

CodeRabbit threads addressed: 3200139602, 3200139625, 3200139627,
3200139630, 3200139633, 3200139677, 3200139683.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../V2/IslandNavigationNode.cs                             | 4 ++--
 .../V2/LabelNavigationNode.cs                              | 4 ++--
 .../V2/PageCrossLinkLeaf.cs                                | 4 ++--
 .../V2/PageFolderNavigationNode.cs                         | 4 ++--
 .../V2/PlaceholderNavigationLeaf.cs                        | 4 ++--
 .../V2/PlaceholderNavigationNode.cs                        | 4 ++--
 .../V2/SectionNavigationNode.cs                            | 4 ++--
 .../Building/AssemblerBuildService.cs                      | 7 ++++++-
 .../Navigation/GlobalNavigationHtmlWriter.cs               | 2 +-
 9 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs
index 619aceac7f..2770d5cf7c 100644
--- a/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs
+++ b/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs
@@ -14,7 +14,7 @@ namespace Elastic.Documentation.Navigation.V2;
 public class IslandNavigationNode(
 	string label,
 	IRootNavigationItem<IDocumentationFile, INavigationItem> source,
-	INodeNavigationItem<INavigationModel, INavigationItem>? parent
+	INodeNavigationItem<INavigationModel, INavigationItem> parent
 ) : INodeNavigationItem<INavigationModel, INavigationItem>
 {
 	/// <summary>The Id of the wrapped toc root, used for island lookup by nav ownership.</summary>
@@ -30,7 +30,7 @@ public class IslandNavigationNode(
 	public string NavigationTitle { get; } = label;
 
 	/// <inheritdoc />
-	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; } = parent?.NavigationRoot!;
+	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; } = parent.NavigationRoot;
 
 	/// <inheritdoc />
 	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; } = parent;
diff --git a/src/Elastic.Documentation.Navigation/V2/LabelNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/LabelNavigationNode.cs
index 5588fd3206..0461d0a9b3 100644
--- a/src/Elastic.Documentation.Navigation/V2/LabelNavigationNode.cs
+++ b/src/Elastic.Documentation.Navigation/V2/LabelNavigationNode.cs
@@ -18,7 +18,7 @@ public LabelNavigationNode(
 		string label,
 		bool expandedByDefault,
 		IReadOnlyCollection<INavigationItem> children,
-		INodeNavigationItem<INavigationModel, INavigationItem>? parent
+		INodeNavigationItem<INavigationModel, INavigationItem> parent
 	)
 	{
 		Id = ShortId.Create("label", label);
@@ -26,7 +26,7 @@ public LabelNavigationNode(
 		ExpandedByDefault = expandedByDefault;
 		NavigationItems = children;
 		Parent = parent;
-		NavigationRoot = parent?.NavigationRoot!;
+		NavigationRoot = parent.NavigationRoot;
 		_index = new LabelIndexLeaf(this);
 	}
 
diff --git a/src/Elastic.Documentation.Navigation/V2/PageCrossLinkLeaf.cs b/src/Elastic.Documentation.Navigation/V2/PageCrossLinkLeaf.cs
index 51927aaf14..e0cfb99835 100644
--- a/src/Elastic.Documentation.Navigation/V2/PageCrossLinkLeaf.cs
+++ b/src/Elastic.Documentation.Navigation/V2/PageCrossLinkLeaf.cs
@@ -12,7 +12,7 @@ public class PageCrossLinkLeaf(
 	Uri page,
 	string title,
 	string sitePrefix,
-	INodeNavigationItem<INavigationModel, INavigationItem>? parent
+	INodeNavigationItem<INavigationModel, INavigationItem> parent
 ) : ILeafNavigationItem<INavigationModel>, INavigationModel
 {
 	public Uri Page { get; } = page;
@@ -27,7 +27,7 @@ public class PageCrossLinkLeaf(
 	public string NavigationTitle { get; } = title;
 
 	/// <inheritdoc />
-	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; } = parent?.NavigationRoot!;
+	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; } = parent.NavigationRoot;
 
 	/// <inheritdoc />
 	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; } = parent;
diff --git a/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs
index b19b2994b4..df80c88f5f 100644
--- a/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs
+++ b/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs
@@ -20,7 +20,7 @@ public PageFolderNavigationNode(
 		Uri page,
 		string sitePrefix,
 		IReadOnlyCollection<INavigationItem> children,
-		INodeNavigationItem<INavigationModel, INavigationItem>? parent
+		INodeNavigationItem<INavigationModel, INavigationItem> parent
 	)
 	{
 		Id = ShortId.Create("page-folder", title);
@@ -29,7 +29,7 @@ public PageFolderNavigationNode(
 		Url = ResolveUrl(page, sitePrefix);
 		NavigationItems = children;
 		Parent = parent;
-		NavigationRoot = parent?.NavigationRoot!;
+		NavigationRoot = parent.NavigationRoot;
 		_index = new PageFolderIndexLeaf(this);
 	}
 
diff --git a/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationLeaf.cs b/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationLeaf.cs
index e1213a7316..14fa23d387 100644
--- a/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationLeaf.cs
+++ b/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationLeaf.cs
@@ -14,7 +14,7 @@ namespace Elastic.Documentation.Navigation.V2;
 public class PlaceholderNavigationLeaf(
 	string title,
 	string sitePrefix,
-	INodeNavigationItem<INavigationModel, INavigationItem>? parent
+	INodeNavigationItem<INavigationModel, INavigationItem> parent
 ) : ILeafNavigationItem<INavigationModel>, INavigationModel
 {
 	/// <inheritdoc />
@@ -27,7 +27,7 @@ public class PlaceholderNavigationLeaf(
 	public string NavigationTitle { get; } = title;
 
 	/// <inheritdoc />
-	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; } = parent?.NavigationRoot!;
+	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; } = parent.NavigationRoot;
 
 	/// <inheritdoc />
 	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; } = parent;
diff --git a/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs
index 5835f191ae..d0ef003345 100644
--- a/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs
+++ b/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs
@@ -19,7 +19,7 @@ public PlaceholderNavigationNode(
 		string title,
 		string sitePrefix,
 		IReadOnlyCollection<INavigationItem> children,
-		INodeNavigationItem<INavigationModel, INavigationItem>? parent
+		INodeNavigationItem<INavigationModel, INavigationItem> parent
 	)
 	{
 		Id = ShortId.Create("placeholder-group", title);
@@ -27,7 +27,7 @@ public PlaceholderNavigationNode(
 		Url = ComputeUrl(title, sitePrefix);
 		NavigationItems = children;
 		Parent = parent;
-		NavigationRoot = parent?.NavigationRoot!;
+		NavigationRoot = parent.NavigationRoot;
 		_index = new PlaceholderIndexLeaf(this);
 	}
 
diff --git a/src/Elastic.Documentation.Navigation/V2/SectionNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/SectionNavigationNode.cs
index eb6f37ec2d..90cac5c047 100644
--- a/src/Elastic.Documentation.Navigation/V2/SectionNavigationNode.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SectionNavigationNode.cs
@@ -21,7 +21,7 @@ public SectionNavigationNode(
 		bool isolated,
 		bool dropdown,
 		IReadOnlyCollection<INavigationItem> children,
-		INodeNavigationItem<INavigationModel, INavigationItem>? parent
+		INodeNavigationItem<INavigationModel, INavigationItem> parent
 	)
 	{
 		Id = ShortId.Create("section", label);
@@ -31,7 +31,7 @@ public SectionNavigationNode(
 		Dropdown = dropdown;
 		NavigationItems = children;
 		Parent = parent;
-		NavigationRoot = parent?.NavigationRoot!;
+		NavigationRoot = parent.NavigationRoot;
 		_index = new SectionIndexLeaf(this);
 	}
 
diff --git a/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs b/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
index 3dcb4ed477..4a78fc900d 100644
--- a/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
+++ b/src/services/Elastic.Documentation.Assembler/Building/AssemblerBuildService.cs
@@ -118,8 +118,13 @@ Cancel ctx
 
 		var navV2FileInfo = configurationContext.ConfigurationFileProvider.NavigationV2File;
 		SiteNavigation navigation;
-		if (featureFlags.NavV2Enabled && navV2FileInfo is not null)
+		if (featureFlags.NavV2Enabled)
 		{
+			if (navV2FileInfo is null)
+			{
+				assembleContext.Collector.EmitGlobalError("nav-v2 feature flag is enabled but config/navigation-v2.yml is missing — refusing to fall back to navigation.yml because that would silently produce the wrong sidebar.");
+				return false;
+			}
 			_logger.LogInformation("nav-v2 feature flag enabled — loading navigation-v2.yml");
 			var v2File = NavigationV2File.Deserialize(await readFs.File.ReadAllTextAsync(navV2FileInfo.FullName, ctx));
 			navigation = new SiteNavigationV2(v2File, siteNavigationFile, assembleContext, documentationSets, assembleContext.Environment.PathPrefix);
diff --git a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
index 5c15386d0d..00f389fc1a 100644
--- a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -98,7 +98,7 @@ Cancel ctx
 			var model = new NavigationViewModel
 			{
 				Title = section.Label,
-				TitleUrl = section.Url,
+				TitleUrl = CombineWithSitePrefix(navV2, section.Url),
 				Tree = wrapper,
 				IsPrimaryNavEnabled = true,
 				IsUsingNavigationDropdown = false,

From 307847b02f3e19f9f1f14b77911a644a70c77a6a Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 13 May 2026 16:31:34 +0200
Subject: [PATCH 185/226] fix: address CodeRabbit comments on tests, links,
 search, and rules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Four small CodeRabbit fixes that span tests + main-scope code:

Test method names — follow the Method_Scenario_Expected convention:
  - SiteNavigationV2PageEntriesResolveFilesFromUnseenChildTocs
    → SiteNavigationV2_PageEntriesForUnseenChildTocs_ResolvesFiles
  - SiteNavigationV2PageEntriesUseV2OrderForPrevNext
    → SiteNavigationV2_PageEntriesWithV2Navigation_UseCorrectPrevNextOrder
  - SiteNavigationResolvesFilesFromUnseenChildTocs
    → SiteNavigation_FilesFromUnseenChildTocs_ResolvesCorrectly

_TableOfContents.cshtml — add rel="noopener noreferrer" to all four
target="_blank" anchors (View as Markdown, Report a docs issue, Edit
this page, Learn how to contribute) for opener isolation.

DetectionRuleFile.cs — stop surfacing raw exception messages in
ForUnparsableSource. The thrown messages include absolute checkout
paths and internal parser state which then render into the page. Use
a sanitized generic note instead.

NavigationSearchComponent.tsx — treat useQuery isError as
"API unavailable" too. A network/timeout failure leaves data
undefined, so the previous isApiAvailable === false check did not
disable the search input on errors.

CodeRabbit threads addressed: 3225182517, 3225182526, 3225182531,
3225182507, 3200139649, 3227146673.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../NavigationSearch/NavigationSearchComponent.tsx        | 6 ++++--
 .../Extensions/DetectionRules/DetectionRuleFile.cs        | 7 +++++--
 src/Elastic.Markdown/Layout/_TableOfContents.cshtml       | 8 ++++----
 tests/Navigation.Tests/Assembler/SiteNavigationTests.cs   | 6 +++---
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
index e5f796a823..25889d8755 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
@@ -14,7 +14,7 @@ interface NavigationSearchProps {
 
 const NavigationSearchInner = ({ placeholder }: NavigationSearchProps) => {
     const shouldCheckApi = config.buildType !== 'codex' && !config.airGapped
-    const { data: isApiAvailable } = useQuery({
+    const { data: isApiAvailable, isError } = useQuery({
         queryKey: ['api-health'],
         queryFn: async () => {
             const response = await fetch(`${config.apiBasePath}/v1/`, {
@@ -31,7 +31,9 @@ const NavigationSearchInner = ({ placeholder }: NavigationSearchProps) => {
         return null
     }
 
-    const isSearchUnavailable = shouldCheckApi && isApiAvailable === false
+    // Treat network/timeout failures (isError) the same as a non-ok response —
+    // either way the search API is not reachable and the input should be disabled.
+    const isSearchUnavailable = shouldCheckApi && (isApiAvailable === false || isError)
 
     return (
         <div
diff --git a/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRuleFile.cs b/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRuleFile.cs
index 3c28f0f8aa..478ae98a12 100644
--- a/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRuleFile.cs
+++ b/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRuleFile.cs
@@ -101,9 +101,12 @@ BuildContext build
 		{
 			Rule = DetectionRule.From(sourceFile);
 		}
-		catch (Exception ex)
+		catch (Exception)
 		{
-			Rule = DetectionRule.ForUnparsableSource(sourceFile, ex.InnerException?.Message ?? ex.Message);
+			// Avoid surfacing raw exception messages — they can leak absolute checkout paths
+			// and internal parser state into the rendered markdown. A generic note is enough;
+			// the build's diagnostic collector reports the underlying error separately.
+			Rule = DetectionRule.ForUnparsableSource(sourceFile, "Could not parse detection rule TOML during the documentation build.");
 		}
 	}
 
diff --git a/src/Elastic.Markdown/Layout/_TableOfContents.cshtml b/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
index e4f07622eb..6d7c14e9a6 100644
--- a/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
+++ b/src/Elastic.Markdown/Layout/_TableOfContents.cshtml
@@ -30,7 +30,7 @@
 		
 		<ul class="mt-4 hidden md:flex items-center lg:block gap-4">
 			<li class="view-as-markdown hidden lg:block lg:not-first:mt-1">
-				<a href="@Model.MarkdownUrl" class="link text-sm font-body font-normal" target="_blank">
+				<a href="@Model.MarkdownUrl" class="link text-sm font-body font-normal" target="_blank" rel="noopener noreferrer">
 					<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 -1 24 24">
 						<path fill="currentColor" d="M22.131725 19.247H1.9386225C1.0239525 19.247 0.25 18.47305 0.25 17.558375v-11.11675c0 -0.914675 0.7739525 -1.688625 1.6886225 -1.688625H22.061375c0.914675 0 1.688625 0.77395 1.688625 1.688625v11.11675c0 0.914675 -0.7036 1.688625 -1.618275 1.688625ZM1.9386225 5.87875c-0.2814375 0 -0.562875 0.281425 -0.562875 0.562875v11.11675c0 0.3518 0.2814375 0.562875 0.562875 0.562875H22.061375c0.3518 0 0.562875 -0.281425 0.562875 -0.562875v-11.11675c0 -0.3518 -0.281425 -0.562875 -0.562875 -0.562875l-20.1227525 0ZM3.62725 15.86975V8.130225h2.2515l2.2515 2.814375 2.251475 -2.814375h2.2515V15.86975h-2.2515V11.437125L8.13025 14.2515l-2.2515 -2.814375V15.86975h-2.2515Zm14.1422 0L14.392225 12.140725h2.251475v-4.0105h2.2515v3.940125h2.2515L17.76945 15.86975Z" stroke-width="0.25"></path>
 					</svg>
@@ -40,7 +40,7 @@
 			@if (Model.Features.PrimaryNavEnabled && Model.BuildType != BuildType.Codex && Model.Branding is null)
 			{
 				<li class="report-an-issue lg:not-first:mt-1">
-					<a href="@Model.ReportIssueUrl" class="link text-sm font-body font-normal" target="_blank">
+					<a href="@Model.ReportIssueUrl" class="link text-sm font-body font-normal" target="_blank" rel="noopener noreferrer">
 						<svg class="link-icon" viewBox="0 0 98 96" xmlns="http://www.w3.org/2000/svg">
 							<path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="currentColor"/>
 						</svg>
@@ -51,7 +51,7 @@
 			@if (!string.IsNullOrEmpty(Model.GithubEditUrl))
 			{
 				<li class="edit-this-page lg:not-first:mt-1 @(Model.HideEditThisPage ? "hidden" : string.Empty)">
-					<a href="@Model.GithubEditUrl" class="link text-sm font-body font-normal" target="_blank">
+					<a href="@Model.GithubEditUrl" class="link text-sm font-body font-normal" target="_blank" rel="noopener noreferrer">
 						<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
 							<path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125"/>
 						</svg>
@@ -62,7 +62,7 @@
 			@if (Model.Features.PrimaryNavEnabled && Model.BuildType != BuildType.Codex && Model.Branding is null)
 			{
 				<li class="learn-how-to-contribute hidden lg:block lg:not-first:mt-1">
-					<a href="https://www.elastic.co/docs/contribute-docs/" class="link text-sm font-body font-normal" target="_blank">
+					<a href="https://www.elastic.co/docs/contribute-docs/" class="link text-sm font-body font-normal" target="_blank" rel="noopener noreferrer">
 						<svg class="link-icon" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
 							<path fill="currentColor" d="M8.8,0 C9.074,0 9.337,0.113 9.526,0.312 L12.726,3.74 C12.902,3.926 13,4.173 13,4.429 L13,13 C13,13.552 12.552,14 12,14 L2,14 C1.448,14 1,13.552 1,13 L1,1 C1,0.448 1.448,0 2,0 L8.8,0 Z M12,5 L8.5,5 C8.224,5 8,4.776 8,4.5 L8,1 L2,1 L2,13 L12,13 L12,5 Z M4.5,11 C4.22385763,11 4,10.7761424 4,10.5 C4,10.2238576 4.22385763,10 4.5,10 L9.5,10 C9.7761424,10 10,10.2238576 10,10.5 C10,10.7761424 9.7761424,11 9.5,11 L4.5,11 Z M4.5,8 C4.22385763,8 4,7.77614237 4,7.5 C4,7.22385763 4.22385763,7 4.5,7 L9.5,7 C9.7761424,7 10,7.22385763 10,7.5 C10,7.77614237 9.7761424,8 9.5,8 L4.5,8 Z M5.5,16 C5.22385763,16 5,15.7761424 5,15.5 C5,15.2238576 5.22385763,15 5.5,15 L14,15 L14,6.5 C14,6.22385763 14.2238576,6 14.5,6 C14.7761424,6 15,6.22385763 15,6.5 L15,15 C15,15.5522847 14.5522847,16 14,16 L5.5,16 Z"/>
 						</svg>
diff --git a/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs b/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs
index 33fd14d392..c1321b911e 100644
--- a/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs
+++ b/tests/Navigation.Tests/Assembler/SiteNavigationTests.cs
@@ -308,7 +308,7 @@ public void SitePrefixAppliedToMultipleNavigationItems(string? sitePrefix, strin
 	}
 
 	[Fact]
-	public void SiteNavigationV2PageEntriesResolveFilesFromUnseenChildTocs()
+	public void SiteNavigationV2_PageEntriesForUnseenChildTocs_ResolvesFiles()
 	{
 		var fileSystem = new MockFileSystem();
 		var docsContentDir = "/checkouts/current/docs-content";
@@ -383,7 +383,7 @@ public void SiteNavigationV2PageEntriesResolveFilesFromUnseenChildTocs()
 	}
 
 	[Fact]
-	public void SiteNavigationV2PageEntriesUseV2OrderForPrevNext()
+	public void SiteNavigationV2_PageEntriesWithV2Navigation_UseCorrectPrevNextOrder()
 	{
 		var fileSystem = new MockFileSystem();
 		var docsContentDir = "/checkouts/current/docs-content";
@@ -459,7 +459,7 @@ public void SiteNavigationV2PageEntriesUseV2OrderForPrevNext()
 	}
 
 	[Fact]
-	public void SiteNavigationResolvesFilesFromUnseenChildTocs()
+	public void SiteNavigation_FilesFromUnseenChildTocs_ResolvesCorrectly()
 	{
 		var fileSystem = new MockFileSystem();
 		var docsContentDir = "/checkouts/current/docs-content";

From 846fedd4022b3dadb2b9809bf65d87cfe9805057 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 13 May 2026 16:36:53 +0200
Subject: [PATCH 186/226] fix(hub-pages): address CodeRabbit comments on hub
 directives + chrome
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Seven CodeRabbit fixes on the hub-pages stack:

config/whats-new.yml — give each product entry a unique anchor id
(whats-new-kibana, whats-new-elasticsearch). Both were sharing
id: whats-new, which produced duplicate DOM IDs whenever both
{whats-new} sections rendered on the same page.

metadata-box.css — replace display: none on .applicable-info > *
with a visually-hidden technique (clip + 1px). display: none strips
children from the accessibility tree, leaving only the decorative `?`
from ::before with no accessible name on the tooltip trigger.

WhatsNewBlock.cs — key the central-config cache by
ConfigurationFileProvider identity via ConditionalWeakTable instead
of the temp file path. Each build allocates a fresh GUID-named temp
file, so a path-keyed static cache would never hit across builds yet
would accumulate entries forever in a long-running serve.

MetadataBox.cshtml — narrow the layout guard from "any non-null
Layout" to specifically MarkdownPageLayout.Hub. The previous guard
hid the "applies to" metadata on any non-hub page that defined a
frontmatter layout (landing-page, archive, etc.).

_SecondaryNav.cshtml — make the section landing reachable from a
dropdown tab. The summary only renders label + chevron (no
navTab.Url), and the foreach skipped the hidden section-index leaf
on the assumption that the summary already linked there. Render the
hidden index leaf as the first dropdown entry.

HubUrl.cs — avoid producing "//foo" URLs when sitePathPrefix is "/".
Trimming "/" yields "", and "/" + clean produces a double-slash that
browsers treat as a protocol-relative URL and breaks navigation.

HubLinkValidator.cs — probe the redirect lookup with the same
candidate set as the existence check (rel, rel + ".md",
rel + "/index.md"). redirects.yml keys are stored with the .md
suffix, so extensionless authored paths were missing redirects and
falling through to the hard error.

CodeRabbit threads addressed: 3200139598, 3200139639, 3200139664,
3200139671, 3225182499, 3226168181, 3226549036.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 config/whats-new.yml                          |  4 ++--
 .../Assets/markdown/metadata-box.css          | 13 +++++++++-
 .../Layout/_SecondaryNav.cshtml               | 12 +++++++++-
 .../Myst/Directives/Hub/HubLinkValidator.cs   | 24 ++++++++++++-------
 .../Myst/Directives/Hub/HubUrl.cs             |  8 ++++++-
 .../Myst/Directives/Hub/WhatsNewBlock.cs      | 20 +++++++++++-----
 src/Elastic.Markdown/Page/MetadataBox.cshtml  |  7 ++++--
 7 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/config/whats-new.yml b/config/whats-new.yml
index 2cfb4f0105..e86680aeb8 100644
--- a/config/whats-new.yml
+++ b/config/whats-new.yml
@@ -19,7 +19,7 @@ products:
 
   kibana:
     title: What's new in Kibana
-    id: whats-new
+    id: whats-new-kibana
     badge: New
     release-links:
       - label: '9.4'
@@ -46,7 +46,7 @@ products:
 
   elasticsearch:
     title: What's new in Elasticsearch
-    id: whats-new
+    id: whats-new-elasticsearch
     badge: New
     release-links:
       - label: '9.4'
diff --git a/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css b/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css
index 7d90dca7fc..f760c2ef26 100644
--- a/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css
+++ b/src/Elastic.Documentation.Site/Assets/markdown/metadata-box.css
@@ -150,8 +150,19 @@
 	.metadata-values .applicable-info::before {
 		content: '?';
 	}
+	/* Visually hide children but keep them in the accessibility tree so the trigger
+	   has an accessible name. `display: none` would strip the label entirely and
+	   leave only the decorative `?` from ::before. */
 	.metadata-values .applicable-info > * {
-		display: none;
+		position: absolute;
+		width: 1px;
+		height: 1px;
+		padding: 0;
+		margin: -1px;
+		overflow: hidden;
+		clip: rect(0, 0, 0, 0);
+		white-space: nowrap;
+		border: 0;
 	}
 	.metadata-values .applicable-info:hover {
 		background: var(--color-grey-30);
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index 596898c90c..aac4e70c20 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -37,9 +37,19 @@
 										var childItems = child is INodeNavigationItem<INavigationModel, INavigationItem> nn ? nn.NavigationItems : null;
 										var isHidden = child is ILeafNavigationItem<INavigationModel> hl && hl.Hidden;
 
+										// Render the hidden section-index leaf as the first dropdown entry
+										// so the section landing is reachable. The previous code skipped
+										// it on the assumption that the summary already linked to the
+										// section, but the summary only toggles the dropdown.
 										if (isHidden)
 										{
-											// Section index leaf is already linked from the summary; skip.
+											if (string.IsNullOrEmpty(childUrl))
+												continue;
+											<a class="secondary-nav-dropdown-link"
+												href="@childUrl"
+												@Model.Htmx.GetHxAttributes(hxSwapOob: "#main-container,#secondary-nav")>
+												@childTitle
+											</a>
 											continue;
 										}
 										if (childItems is { Count: > 0 })
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HubLinkValidator.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HubLinkValidator.cs
index 843c8d9f2b..0a9dc9e126 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HubLinkValidator.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HubLinkValidator.cs
@@ -116,15 +116,23 @@ private static void ValidateInternal(string url, DirectiveBlock block, ParserCon
 		}
 
 		// Honour configured redirects so old paths emit a hint, not an error.
-		if (context.Configuration.Redirects is not null
-			&& context.Configuration.Redirects.TryGetValue(rel, out var redirect))
+		// Probe the same candidates as the existence check above: redirects.yml
+		// keys are stored with the `.md` suffix, so an extensionless authored
+		// path (e.g. `/explore-analyze/discover`) would otherwise miss a redirect
+		// keyed `explore-analyze/discover.md` and fall through to the hard error.
+		if (context.Configuration.Redirects is not null)
 		{
-			var to = redirect.To
-				?? (redirect.Many is not null
-					? string.Join(", ", redirect.Many.Select(m => m.To))
-					: "unknown");
-			block.EmitWarning($"Hub directive link `{url}` has a redirect; update to: {to}");
-			return;
+			foreach (var candidate in candidates)
+			{
+				if (!context.Configuration.Redirects.TryGetValue(candidate, out var redirect))
+					continue;
+				var to = redirect.To
+					?? (redirect.Many is not null
+						? string.Join(", ", redirect.Many.Select(m => m.To))
+						: "unknown");
+				block.EmitWarning($"Hub directive link `{url}` has a redirect; update to: {to}");
+				return;
+			}
 		}
 
 		block.EmitError($"Hub directive link `{url}` does not exist. If it was recently removed add a redirect.");
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs b/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs
index 4afa0cdfda..bcdd290c89 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/HubUrl.cs
@@ -46,7 +46,13 @@ internal static class HubUrl
 
 		if (string.IsNullOrEmpty(sitePathPrefix))
 			return clean + anchor;
-		var prefix = "/" + sitePathPrefix.Trim('/');
+		// Trim slashes; if the prefix is effectively root ("/" or ""), there is no
+		// path component to prepend. Building "/" + clean would produce "//foo",
+		// which the browser treats as a protocol-relative URL and breaks navigation.
+		var trimmed = sitePathPrefix.Trim('/');
+		if (string.IsNullOrEmpty(trimmed))
+			return clean + anchor;
+		var prefix = "/" + trimmed;
 		if (clean == prefix || clean.StartsWith(prefix + "/", StringComparison.OrdinalIgnoreCase))
 			return clean + anchor;
 		if (!clean.StartsWith('/'))
diff --git a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
index cf271a5ba8..12ca148cf6 100644
--- a/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Hub/WhatsNewBlock.cs
@@ -2,7 +2,8 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Collections.Concurrent;
+using System.Runtime.CompilerServices;
+using Elastic.Documentation.Configuration;
 using Elastic.Markdown.Diagnostics;
 using YamlDotNet.Core;
 using YamlDotNet.Serialization;
@@ -30,7 +31,12 @@ namespace Elastic.Markdown.Myst.Directives.Hub;
 public class WhatsNewBlock(DirectiveBlockParser parser, ParserContext context)
 	: DirectiveBlock(parser, context)
 {
-	private static readonly ConcurrentDictionary<string, WhatsNewConfig?> CentralConfigCache = new();
+	// Key the cache by ConfigurationFileProvider identity rather than the temp file path.
+	// Each build gets a fresh provider with a fresh GUID-named temp file, so a path-keyed
+	// cache would never hit across builds yet would accumulate entries forever in a
+	// long-running process. ConditionalWeakTable scopes the cache to the provider's
+	// lifetime — entries are reclaimed automatically when the provider is GC'd.
+	private static readonly ConditionalWeakTable<ConfigurationFileProvider, Lazy<WhatsNewConfig?>> CentralConfigCache = [];
 
 	public override string Directive => "whats-new";
 
@@ -83,22 +89,24 @@ private void ValidateLinks(ParserContext context)
 
 	private WhatsNewData? LoadFromCentralConfig(string productKey)
 	{
-		var configFile = Build.ConfigurationFileProvider.WhatsNewFile;
+		var provider = Build.ConfigurationFileProvider;
+		var configFile = provider.WhatsNewFile;
 		if (configFile is null || !configFile.Exists)
 			return null;
 
-		var config = CentralConfigCache.GetOrAdd(configFile.FullName, path =>
+		var lazy = CentralConfigCache.GetValue(provider, _ => new Lazy<WhatsNewConfig?>(() =>
 		{
 			try
 			{
-				var yaml = Build.ReadFileSystem.File.ReadAllText(path);
+				var yaml = Build.ReadFileSystem.File.ReadAllText(configFile.FullName);
 				return YamlSerialization.Deserialize<WhatsNewConfig>(yaml, Build.ProductsConfiguration);
 			}
 			catch
 			{
 				return null;
 			}
-		});
+		}));
+		var config = lazy.Value;
 
 		if (config?.Products is null)
 			return null;
diff --git a/src/Elastic.Markdown/Page/MetadataBox.cshtml b/src/Elastic.Markdown/Page/MetadataBox.cshtml
index 4d69e8494d..98ceaf9123 100644
--- a/src/Elastic.Markdown/Page/MetadataBox.cshtml
+++ b/src/Elastic.Markdown/Page/MetadataBox.cshtml
@@ -1,8 +1,11 @@
 @inherits RazorSlice<Elastic.Markdown.Page.IndexViewModel>
+@using Elastic.Markdown
 @using Elastic.Markdown.Myst.Components
 @{
-	var layout = Model.CurrentDocument.YamlFrontMatter?.Layout;
-	if (layout is not null)
+	// Suppress the "applies to" metadata only on hub pages (they have their own layout).
+	// The previous "any layout != null" check accidentally suppressed it on landing pages,
+	// archive pages, etc., which still want the metadata.
+	if (Model.CurrentDocument.YamlFrontMatter?.Layout == MarkdownPageLayout.Hub)
 		return;
 
 	var prefix = Model.UrlPathPrefix?.TrimEnd('/') ?? string.Empty;

From 7c4507e5c1a9b98ccd31b1f079d55d1476c20540 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 13 May 2026 16:55:11 +0200
Subject: [PATCH 187/226] chore(editorconfig): downgrade IDE0028 to suggestion

.NET SDK 10.0.300 (now installed by setup-dotnet@v5 via rollForward:
latestFeature) promoted IDE0028 to a build-breaking error and started
flagging Dictionary initializations like

  new(StringComparer.OrdinalIgnoreCase)

The analyzer suggests collection-expression simplification, but `[]`
does not support custom IEqualityComparer arguments, so there is no
actionable fix on existing comparer-aware dictionaries.

Downgrade IDE0028 to suggestion so the rule still surfaces in IDEs
without breaking CI. Unblocks PR #3256 CI which started failing the
moment the runner pulled the new SDK.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .editorconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index e1c21399f9..857ca57c01 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -257,6 +257,13 @@ dotnet_diagnostic.CA1727.severity = none
 
 dotnet_diagnostic.IDE0305.severity = none
 
+# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0028
+# In .NET SDK 10.0.300+ this rule began flagging `new(comparer)` Dictionary
+# initializations with no actionable fix — collection expressions `[]` do not
+# support custom comparers, so the suggested simplification is not possible.
+# Downgrade to suggestion to avoid spurious build breaks.
+dotnet_diagnostic.IDE0028.severity = suggestion
+
 # https://github.com/dotnet/roslyn/issues/60784
 # CS8509 already warns
 dotnet_diagnostic.IDE0072.severity = none

From 2f932a15724accd959bdf586c5e6da0782628b28 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 13 May 2026 19:24:50 +0200
Subject: [PATCH 188/226] chore: revert IDE0028 suppression now that main
 carries the real fix

Main #3308 ("Fix new SDK Warnings") uses C# 13 collection expression
`[with(comparer)]` to rewrite Dictionary<T> initializations that take
a custom IEqualityComparer, which satisfies IDE0028 in SDK 10.0.300+.
That fix lands here via the main merge, so the editorconfig override
from 7c4507e5c is no longer needed.

Also apply prettier formatting to NavigationSearchComponent.tsx (the
useQuery isError change from 307847b02 wasn't run through prettier).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .editorconfig                                              | 7 -------
 .../NavigationSearch/NavigationSearchComponent.tsx         | 3 ++-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 857ca57c01..e1c21399f9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -257,13 +257,6 @@ dotnet_diagnostic.CA1727.severity = none
 
 dotnet_diagnostic.IDE0305.severity = none
 
-# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0028
-# In .NET SDK 10.0.300+ this rule began flagging `new(comparer)` Dictionary
-# initializations with no actionable fix — collection expressions `[]` do not
-# support custom comparers, so the suggested simplification is not possible.
-# Downgrade to suggestion to avoid spurious build breaks.
-dotnet_diagnostic.IDE0028.severity = suggestion
-
 # https://github.com/dotnet/roslyn/issues/60784
 # CS8509 already warns
 dotnet_diagnostic.IDE0072.severity = none
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
index 25889d8755..1c40f7ea06 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearchComponent.tsx
@@ -33,7 +33,8 @@ const NavigationSearchInner = ({ placeholder }: NavigationSearchProps) => {
 
     // Treat network/timeout failures (isError) the same as a non-ok response —
     // either way the search API is not reachable and the input should be disabled.
-    const isSearchUnavailable = shouldCheckApi && (isApiAvailable === false || isError)
+    const isSearchUnavailable =
+        shouldCheckApi && (isApiAvailable === false || isError)
 
     return (
         <div

From d4ea2bc2f908d1435a05ecfa0cd1375bc5eedd48 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 13 May 2026 19:27:30 +0200
Subject: [PATCH 189/226] fix: embed navigation-v2.yml so integration tests
 find it
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After commit ffda3ab3f tightened the nav-v2 path to fail fast when
the YAML is missing (CodeRabbit thread 3200139677), the integration
test fixture started failing because:

  nav-v2 feature flag is enabled but config/navigation-v2.yml is missing —
  refusing to fall back to navigation.yml because that would silently
  produce the wrong sidebar.

The `dev` environment in config/assembler.yml sets NAV_V2: true, and
the integration test fixture builds via the assembler. When the
ConfigurationFileProvider falls back to embedded mode, the resource
lookup misses because navigation-v2.yml wasn't listed alongside the
other embedded config files.

Add navigation-v2.yml to the EmbeddedResource list so embedded-mode
builds (including integration tests) have access to it. Local-mode
builds were never affected since they read the file from disk
directly.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../Elastic.Documentation.Configuration.csproj                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj b/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj
index 946b24e1fe..2835522284 100644
--- a/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj
+++ b/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj
@@ -32,6 +32,7 @@
     <EmbeddedResource Include="$(SolutionRoot)\config\products.yml" />
     <EmbeddedResource Include="$(SolutionRoot)\config\assembler.yml" />
     <EmbeddedResource Include="$(SolutionRoot)\config\navigation.yml" />
+    <EmbeddedResource Include="$(SolutionRoot)\config\navigation-v2.yml" />
     <EmbeddedResource Include="$(SolutionRoot)\config\legacy-url-mappings.yml" />
     <EmbeddedResource Include="$(SolutionRoot)\config\search.yml" />
     <EmbeddedResource Include="$(SolutionRoot)\config\whats-new.yml" />

From 36fb3a0bb3537d643d45dfd46a31a12e00f88908 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 13 May 2026 19:32:16 +0200
Subject: [PATCH 190/226] fix(nav-v2): apply [with(comparer)] to
 SiteNavigationV2 dictionaries

Two more dictionary fields with custom comparers were tripping IDE0028
under SDK 10.0.300 in the same way the dictionaries fixed in main #3308
did. Apply the same `[with(comparer)]` collection-expression rewrite.

CI was failing on these two lines across build, integration, and the
build (elastic/*) matrix.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index c33dbed9a3..4c8c7a0609 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -21,8 +21,8 @@ namespace Elastic.Documentation.Navigation.V2;
 /// </summary>
 public class SiteNavigationV2 : SiteNavigation, INavigationTraversable
 {
-	private readonly Dictionary<string, NavigationSection> _urlToSection = new(StringComparer.OrdinalIgnoreCase);
-	private readonly Dictionary<string, NavigationIsland> _tocRootToIsland = new(StringComparer.Ordinal);
+	private readonly Dictionary<string, NavigationSection> _urlToSection = [with(StringComparer.OrdinalIgnoreCase)];
+	private readonly Dictionary<string, NavigationIsland> _tocRootToIsland = [with(StringComparer.Ordinal)];
 	private readonly Dictionary<int, INavigationItem> _v2NavigationIndexedByOrder;
 	private readonly Dictionary<INavigationItem, int> _v2NavigationIndexByItem;
 

From 77f323c0b307846ac11c684ec323afa910ea09fc Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 13 May 2026 19:51:50 +0200
Subject: [PATCH 191/226] fix(landing): replace hero <navigation-search> with
 click-through proxy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On landing-page/prototype, the JS bundle did not register the
navigation-search custom element, so the hero rendered as a clean
search prompt — just the icon and an empty box. On demo/findability
the bundle now defines navigation-search (pulled in via the nav-v2
stack), so the hero mounted the same "Jump to page" EUI widget as the
sidebar. The two search fields looked identical and the page lost the
prominent hero treatment.

Replace the in-hero <navigation-search> with a button styled like the
hero search box. Clicking it focuses the sidebar's navigation-search
input so the actual search experience is preserved without duplicating
the widget visually. The ⌘K shortcut still focuses the sidebar input
directly, mirroring the kbd hint we now render in the hero.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../Layout/_LandingPage.cshtml                | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/Elastic.Markdown/Layout/_LandingPage.cshtml b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
index bd36f16d75..0f913cab37 100644
--- a/src/Elastic.Markdown/Layout/_LandingPage.cshtml
+++ b/src/Elastic.Markdown/Layout/_LandingPage.cshtml
@@ -74,12 +74,32 @@
     padding: 14px 20px;
     margin-bottom: 24px;
     max-width: 640px;
-    cursor: pointer;
+    width: 100%;
+    cursor: text;
     transition: border-color 0.2s, box-shadow 0.2s;
+    color: #8C9BAB;
+    font-family: inherit;
+    font-size: 15px;
+    text-align: left;
   }
-  .hero-search-wrap:focus-within {
+  .hero-search-wrap:hover,
+  .hero-search-wrap:focus-visible {
     border-color: var(--elastic-blue);
     box-shadow: var(--shadow-sm);
+    outline: none;
+  }
+  .hero-search-label {
+    flex: 1;
+    color: #8C9BAB;
+  }
+  .hero-search-kbd {
+    border: 1px solid var(--border);
+    border-radius: 4px;
+    padding: 1px 6px;
+    font-size: 12px;
+    font-family: inherit;
+    color: #8C9BAB;
+    background: #F7F8FA;
   }
 
   /* Hero cards */
@@ -332,10 +352,15 @@
       </div>
 
       <search role="search" aria-label="Search documentation">
-        <div class="hero-search-wrap">
+        @* Hero search is a button-like proxy: clicking it focuses the sidebar's <navigation-search>
+           so the landing page reads as a clean search prompt instead of duplicating the sidebar widget. *@
+        <button type="button" class="hero-search-wrap"
+                onclick="document.querySelector('#pages-nav navigation-search input')?.focus()"
+                aria-label="Search documentation">
           <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="#8C9BAB" stroke-width="2.5" aria-hidden="true"><circle cx="11" cy="11" r="8"/><path d="M21 21l-4.35-4.35"/></svg>
-          <navigation-search></navigation-search>
-        </div>
+          <span class="hero-search-label">Search documentation</span>
+          <kbd class="hero-search-kbd">⌘K</kbd>
+        </button>
       </search>
 
       <section class="hero-cards" aria-label="Popular documentation">

From a4885aa05c402fc62e61ce4949cf5f7cd449f1e3 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 14:51:00 +0200
Subject: [PATCH 192/226] fix(nav-v2): guard deployment header links

Keep preview header links resilient when branch metadata is missing so the PR merge result formats cleanly and passes frontend checks.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../web-components/Header/DeploymentInfo.tsx  | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx b/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx
index e2f83a464b..c8cc3cb7e2 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx
@@ -270,23 +270,31 @@ function getDeploymentSubtitle(githubRef?: string): string {
 const GITHUB_BASE = 'https://github.com'
 
 function getDeploymentLinks(
-    githubRepository: string,
-    gitBranch: string,
-    gitCommit: string,
+    githubRepository: string | undefined,
+    gitBranch: string | undefined,
+    gitCommit: string | undefined,
     githubRef?: string
 ): { ref?: string; branch: string; commit: string; repository: string } {
-    // Backend passes full org/repo; fallback only fires for bare names (shouldn't occur)
-    const repo = githubRepository.includes('/')
-        ? githubRepository
-        : `elastic/${githubRepository}`
+    // Web component attrs can be missing at runtime; avoid throwing on .includes().
+    const raw = (githubRepository ?? '').trim()
+    const repo = raw.includes('/')
+        ? raw
+        : raw.length > 0
+          ? `elastic/${raw}`
+          : 'elastic/docs-builder'
     const base = `${GITHUB_BASE}/${repo}`
+    const branchName = (gitBranch ?? '').trim() || 'main'
+    const commitSha = (gitCommit ?? '').trim()
     const pull = githubRef != null ? parseGitHubRef(githubRef) : undefined
     const pullUrl =
         pull?.kind === 'pull' ? `${base}/pull/${pull.number}` : undefined
     return {
         ref: pullUrl,
-        branch: `${base}/tree/${gitBranch}`,
-        commit: `${base}/commit/${gitCommit}`,
+        branch: `${base}/tree/${encodeURIComponent(branchName)}`,
+        commit:
+            commitSha.length > 0
+                ? `${base}/commit/${commitSha}`
+                : `${base}/commits`,
         repository: base,
     }
 }

From 9fd823ff231d791606af172dab2bd00c6facdb89 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 14:52:50 +0200
Subject: [PATCH 193/226] fix(nav-v2): format deployment header guard

Keep the preview header guard from breaking the frontend Prettier check on the PR merge result.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/web-components/Header/DeploymentInfo.tsx       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx b/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx
index a54259d898..c8cc3cb7e2 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx
@@ -280,8 +280,8 @@ function getDeploymentLinks(
     const repo = raw.includes('/')
         ? raw
         : raw.length > 0
-            ? `elastic/${raw}`
-            : 'elastic/docs-builder'
+          ? `elastic/${raw}`
+          : 'elastic/docs-builder'
     const base = `${GITHUB_BASE}/${repo}`
     const branchName = (gitBranch ?? '').trim() || 'main'
     const commitSha = (gitCommit ?? '').trim()
@@ -292,7 +292,9 @@ function getDeploymentLinks(
         ref: pullUrl,
         branch: `${base}/tree/${encodeURIComponent(branchName)}`,
         commit:
-            commitSha.length > 0 ? `${base}/commit/${commitSha}` : `${base}/commits`,
+            commitSha.length > 0
+                ? `${base}/commit/${commitSha}`
+                : `${base}/commits`,
         repository: base,
     }
 }

From a373e12fecb795732eae3e7cee826cb920d03e5c Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 14:51:00 +0200
Subject: [PATCH 194/226] fix(nav-v2): guard deployment header links

Keep preview header links resilient when branch metadata is missing so the PR merge result formats cleanly and passes frontend checks.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../web-components/Header/DeploymentInfo.tsx  | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx b/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx
index e2f83a464b..c8cc3cb7e2 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/Header/DeploymentInfo.tsx
@@ -270,23 +270,31 @@ function getDeploymentSubtitle(githubRef?: string): string {
 const GITHUB_BASE = 'https://github.com'
 
 function getDeploymentLinks(
-    githubRepository: string,
-    gitBranch: string,
-    gitCommit: string,
+    githubRepository: string | undefined,
+    gitBranch: string | undefined,
+    gitCommit: string | undefined,
     githubRef?: string
 ): { ref?: string; branch: string; commit: string; repository: string } {
-    // Backend passes full org/repo; fallback only fires for bare names (shouldn't occur)
-    const repo = githubRepository.includes('/')
-        ? githubRepository
-        : `elastic/${githubRepository}`
+    // Web component attrs can be missing at runtime; avoid throwing on .includes().
+    const raw = (githubRepository ?? '').trim()
+    const repo = raw.includes('/')
+        ? raw
+        : raw.length > 0
+          ? `elastic/${raw}`
+          : 'elastic/docs-builder'
     const base = `${GITHUB_BASE}/${repo}`
+    const branchName = (gitBranch ?? '').trim() || 'main'
+    const commitSha = (gitCommit ?? '').trim()
     const pull = githubRef != null ? parseGitHubRef(githubRef) : undefined
     const pullUrl =
         pull?.kind === 'pull' ? `${base}/pull/${pull.number}` : undefined
     return {
         ref: pullUrl,
-        branch: `${base}/tree/${gitBranch}`,
-        commit: `${base}/commit/${gitCommit}`,
+        branch: `${base}/tree/${encodeURIComponent(branchName)}`,
+        commit:
+            commitSha.length > 0
+                ? `${base}/commit/${commitSha}`
+                : `${base}/commits`,
         repository: base,
     }
 }

From 3e34befdd8f737535a1c5f156a5e5a20dd4d4190 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 15:01:13 +0200
Subject: [PATCH 195/226] fix(nav-v2): satisfy collection initialization
 analyzers

After merging main, IDE0028 is enforced across the merged branch, so use the repo's collection expression syntax where the analyzer now requires it.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Schema/SchemaHelpers.cs                   | 21 +++++++++++--------
 .../Builder/ConfigurationFile.cs              |  6 +++---
 .../Builder/FeatureFlags.cs                   |  2 +-
 .../V2/SiteNavigationV2.cs                    |  4 ++--
 .../Elasticsearch/ContentDateEnrichment.cs    |  2 +-
 src/Elastic.Markdown/IO/MarkdownFile.cs       |  4 ++--
 .../Directives/Changelog/ChangelogBlock.cs    |  4 ++--
 .../ChangelogConfigurationLoader.cs           |  6 +++---
 .../MockEnvironmentVariables.cs               |  2 +-
 9 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/Elastic.ApiExplorer/Schema/SchemaHelpers.cs b/src/Elastic.ApiExplorer/Schema/SchemaHelpers.cs
index b4c0652fd1..3b403c11dd 100644
--- a/src/Elastic.ApiExplorer/Schema/SchemaHelpers.cs
+++ b/src/Elastic.ApiExplorer/Schema/SchemaHelpers.cs
@@ -19,8 +19,9 @@ public static class SchemaHelpers
 	/// <summary>
 	/// Types that are known to be value types (resolve to primitives like string).
 	/// </summary>
-	public static readonly HashSet<string> KnownValueTypes = new(StringComparer.OrdinalIgnoreCase)
-	{
+	public static readonly HashSet<string> KnownValueTypes =
+	[
+		with(StringComparer.OrdinalIgnoreCase),
 		"Field", "Fields", "Id", "Ids", "IndexName", "Indices", "Name", "Names",
 		"Routing", "VersionNumber", "SequenceNumber", "PropertyName", "RelationName",
 		"TaskId", "ScrollId", "SuggestionName", "Duration", "DateMath", "Fuzziness",
@@ -28,26 +29,28 @@ public static class SchemaHelpers
 		"ByteSize", "Percentage", "Stringifiedboolean", "ExpandWildcards", "float", "Stringifiedinteger",
 		// Numeric value types
 		"uint", "ulong", "long", "int", "short", "ushort", "byte", "sbyte", "double", "decimal"
-	};
+	];
 
 	/// <summary>
 	/// Types that have dedicated pages we can link to.
 	/// Only container types get their own pages - individual queries/aggregations are rendered inline.
 	/// </summary>
-	public static readonly HashSet<string> LinkedTypes = new(StringComparer.OrdinalIgnoreCase)
-	{
+	public static readonly HashSet<string> LinkedTypes =
+	[
+		with(StringComparer.OrdinalIgnoreCase),
 		"QueryContainer", "AggregationContainer", "Aggregate"
-	};
+	];
 
 	/// <summary>
 	/// Primitive/generic type names that are not named schema types.
 	/// These should not be considered for recursive type detection since they
 	/// represent generic types rather than specific schema references.
 	/// </summary>
-	public static readonly HashSet<string> PrimitiveTypeNames = new(StringComparer.OrdinalIgnoreCase)
-	{
+	public static readonly HashSet<string> PrimitiveTypeNames =
+	[
+		with(StringComparer.OrdinalIgnoreCase),
 		"boolean", "number", "string", "integer", "object", "null", "array"
-	};
+	];
 
 	/// <summary>
 	/// Gets the URL for a container type's dedicated page.
diff --git a/src/Elastic.Documentation.Configuration/Builder/ConfigurationFile.cs b/src/Elastic.Documentation.Configuration/Builder/ConfigurationFile.cs
index dcb83203a9..d3a0b8eec8 100644
--- a/src/Elastic.Documentation.Configuration/Builder/ConfigurationFile.cs
+++ b/src/Elastic.Documentation.Configuration/Builder/ConfigurationFile.cs
@@ -47,10 +47,10 @@ public record ConfigurationFile
 
 	public HashSet<Product> Products { get; private set; } = [];
 
-	private readonly Dictionary<string, string> _substitutions = new(StringComparer.OrdinalIgnoreCase);
+	private readonly Dictionary<string, string> _substitutions = [with(StringComparer.OrdinalIgnoreCase)];
 	public IReadOnlyDictionary<string, string> Substitutions => _substitutions;
 
-	private readonly Dictionary<string, bool> _features = new(StringComparer.OrdinalIgnoreCase);
+	private readonly Dictionary<string, bool> _features = [with(StringComparer.OrdinalIgnoreCase)];
 
 	[field: AllowNull, MaybeNull]
 	public FeatureFlags Features => field ??= new FeatureFlags(_features);
@@ -259,7 +259,7 @@ public ConfigurationFile(DocumentationSetFile docSetFile, IDocumentationSetConte
 				Branding = ValidateBranding(docSetFile.Branding, context);
 
 			// Process features
-			_features = new Dictionary<string, bool>(StringComparer.OrdinalIgnoreCase);
+			_features = [with(StringComparer.OrdinalIgnoreCase)];
 			if (docSetFile.Features.PrimaryNav.HasValue)
 				_features["primary-nav"] = docSetFile.Features.PrimaryNav.Value;
 			if (docSetFile.Features.DisableGithubEditLink.HasValue)
diff --git a/src/Elastic.Documentation.Configuration/Builder/FeatureFlags.cs b/src/Elastic.Documentation.Configuration/Builder/FeatureFlags.cs
index c1ab3cbf74..371ab0718c 100644
--- a/src/Elastic.Documentation.Configuration/Builder/FeatureFlags.cs
+++ b/src/Elastic.Documentation.Configuration/Builder/FeatureFlags.cs
@@ -6,7 +6,7 @@ namespace Elastic.Documentation.Configuration.Builder;
 
 public class FeatureFlags(Dictionary<string, bool> initFeatureFlags)
 {
-	private readonly Dictionary<string, bool> _featureFlags = new(initFeatureFlags);
+	private readonly Dictionary<string, bool> _featureFlags = [with(initFeatureFlags)];
 
 	public void Set(string key, bool value)
 	{
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 3c904287c3..3517629b78 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -21,8 +21,8 @@ namespace Elastic.Documentation.Navigation.V2;
 /// </summary>
 public class SiteNavigationV2 : SiteNavigation
 {
-	private readonly Dictionary<string, NavigationSection> _urlToSection = new(StringComparer.OrdinalIgnoreCase);
-	private readonly Dictionary<string, NavigationIsland> _tocRootToIsland = new(StringComparer.Ordinal);
+	private readonly Dictionary<string, NavigationSection> _urlToSection = [with(StringComparer.OrdinalIgnoreCase)];
+	private readonly Dictionary<string, NavigationIsland> _tocRootToIsland = [with(StringComparer.Ordinal)];
 
 	public SiteNavigationV2(
 		NavigationV2File v2File,
diff --git a/src/Elastic.Markdown/Exporters/Elasticsearch/ContentDateEnrichment.cs b/src/Elastic.Markdown/Exporters/Elasticsearch/ContentDateEnrichment.cs
index fcc0b605f8..04a1caea9c 100644
--- a/src/Elastic.Markdown/Exporters/Elasticsearch/ContentDateEnrichment.cs
+++ b/src/Elastic.Markdown/Exporters/Elasticsearch/ContentDateEnrichment.cs
@@ -192,7 +192,7 @@ private async Task SwapAliasAsync(string? oldIndex, string newIndex, Cancel ct)
 				new JsonObject { ["remove"] = new JsonObject { ["index"] = oldIndex, ["alias"] = _lookupAlias } },
 				addAction
 			)
-			: new JsonArray(addAction);
+			: [with(addAction)];
 
 		var body = new JsonObject { ["actions"] = actions };
 
diff --git a/src/Elastic.Markdown/IO/MarkdownFile.cs b/src/Elastic.Markdown/IO/MarkdownFile.cs
index 86333aba6a..6901a9a513 100644
--- a/src/Elastic.Markdown/IO/MarkdownFile.cs
+++ b/src/Elastic.Markdown/IO/MarkdownFile.cs
@@ -84,10 +84,10 @@ public virtual string NavigationTitle
 
 
 	//indexed by slug
-	private readonly Dictionary<string, PageTocItem> _pageTableOfContent = new(StringComparer.OrdinalIgnoreCase);
+	private readonly Dictionary<string, PageTocItem> _pageTableOfContent = [with(StringComparer.OrdinalIgnoreCase)];
 	public IReadOnlyDictionary<string, PageTocItem> PageTableOfContent => _pageTableOfContent;
 
-	private readonly HashSet<string> _anchors = new(StringComparer.OrdinalIgnoreCase);
+	private readonly HashSet<string> _anchors = [with(StringComparer.OrdinalIgnoreCase)];
 	public IReadOnlySet<string> Anchors => _anchors;
 
 	public string FilePath { get; }
diff --git a/src/Elastic.Markdown/Myst/Directives/Changelog/ChangelogBlock.cs b/src/Elastic.Markdown/Myst/Directives/Changelog/ChangelogBlock.cs
index c89052377d..954c932d5a 100644
--- a/src/Elastic.Markdown/Myst/Directives/Changelog/ChangelogBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Changelog/ChangelogBlock.cs
@@ -146,14 +146,14 @@ public class ChangelogBlock(DirectiveBlockParser parser, ParserContext context)
 	/// Links to these repositories will be hidden (commented out) in the rendered output.
 	/// Auto-detected from assembler configuration when available.
 	/// </summary>
-	public HashSet<string> PrivateRepositories { get; private set; } = new(StringComparer.OrdinalIgnoreCase);
+	public HashSet<string> PrivateRepositories { get; private set; } = [with(StringComparer.OrdinalIgnoreCase)];
 
 	/// <summary>
 	/// Feature IDs that should be hidden when rendering changelog entries.
 	/// Combined from all loaded bundles' hide-features fields.
 	/// Entries with matching feature-id values will be excluded from the output.
 	/// </summary>
-	public HashSet<string> HideFeatures { get; private set; } = new(StringComparer.OrdinalIgnoreCase);
+	public HashSet<string> HideFeatures { get; private set; } = [with(StringComparer.OrdinalIgnoreCase)];
 
 	/// <summary>
 	/// How to handle PR/issue links relative to private bundle repos (see :link-visibility: option).
diff --git a/src/services/Elastic.Changelog/Configuration/ChangelogConfigurationLoader.cs b/src/services/Elastic.Changelog/Configuration/ChangelogConfigurationLoader.cs
index a8c17ced35..4c866be716 100644
--- a/src/services/Elastic.Changelog/Configuration/ChangelogConfigurationLoader.cs
+++ b/src/services/Elastic.Changelog/Configuration/ChangelogConfigurationLoader.cs
@@ -749,7 +749,7 @@ private static PivotConfiguration ConvertPivot(PivotConfigurationYaml yamlPivot)
 		Dictionary<string, BundlePerProductRule>? byProduct = null;
 		if (yaml.Products is { Count: > 0 })
 		{
-			byProduct = new Dictionary<string, BundlePerProductRule>(StringComparer.OrdinalIgnoreCase);
+			byProduct = [with(StringComparer.OrdinalIgnoreCase)];
 			foreach (var (productKey, productYaml) in yaml.Products)
 			{
 				var productIds = productKey.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
@@ -947,7 +947,7 @@ private static PivotConfiguration ConvertPivot(PivotConfigurationYaml yamlPivot)
 		Dictionary<string, CreateRules>? byProduct = null;
 		if (yaml.Products is { Count: > 0 })
 		{
-			byProduct = new Dictionary<string, CreateRules>(StringComparer.OrdinalIgnoreCase);
+			byProduct = [with(StringComparer.OrdinalIgnoreCase)];
 			foreach (var (productKey, productYaml) in yaml.Products)
 			{
 				var productIds = productKey.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
@@ -1012,7 +1012,7 @@ private static PivotConfiguration ConvertPivot(PivotConfigurationYaml yamlPivot)
 		Dictionary<string, PublishBlocker>? byProduct = null;
 		if (yaml.Products is { Count: > 0 })
 		{
-			byProduct = new Dictionary<string, PublishBlocker>(StringComparer.OrdinalIgnoreCase);
+			byProduct = [with(StringComparer.OrdinalIgnoreCase)];
 			foreach (var (productKey, productYaml) in yaml.Products)
 			{
 				var productIds = productKey.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
diff --git a/tests/Elastic.Documentation.Build.Tests/MockEnvironmentVariables.cs b/tests/Elastic.Documentation.Build.Tests/MockEnvironmentVariables.cs
index 04bebb7703..45cb7deaee 100644
--- a/tests/Elastic.Documentation.Build.Tests/MockEnvironmentVariables.cs
+++ b/tests/Elastic.Documentation.Build.Tests/MockEnvironmentVariables.cs
@@ -13,7 +13,7 @@ namespace Elastic.Documentation.Build.Tests;
 /// </summary>
 public class MockEnvironmentVariables : IEnvironmentVariables
 {
-	private readonly Dictionary<string, string> _variables = new(StringComparer.OrdinalIgnoreCase);
+	private readonly Dictionary<string, string> _variables = [with(StringComparer.OrdinalIgnoreCase)];
 
 	/// <summary>
 	/// Sets an environment variable value for testing.

From 3b915f6f71f752dfd21eed814c24bceed50772ed Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 17:26:59 +0200
Subject: [PATCH 196/226] chore(nav-v2): spruce up navigation labels

Port the core navigation wording cleanup from PR #3326 so the base nav branch carries the latest IA label refinements.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 config/navigation-v2.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 4854f92056..da533cfd5e 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -9,7 +9,7 @@ nav:
     - group: Elasticsearch concepts
       children:
       - page: docs-content://manage-data/data-store.md
-        title: Elasticsearch essentials (Core document database)
+        title: Elasticsearch essentials
       - page: docs-content://manage-data/ingest.md
         title: Ingest data into Elasticsearch
       - page: docs-content://solutions/search.md
@@ -23,7 +23,7 @@ nav:
         - page: docs-content://solutions/search/site-or-app.md
           title: Add search to your site or app
         - page: docs-content://solutions/search/rag.md
-          title: RAG
+          title: Retrieval-augmented generation (RAG)
   - label: Install, deploy, and administer
     children:
       - group: Distributed architecture
@@ -78,9 +78,9 @@ nav:
           page: docs-content://deploy-manage/reference-architectures.md
           children:
           - page: docs-content://deploy-manage/reference-architectures/hotfrozen-high-availability.md
-            title: Hot/Frozen - High Availability
+            title: Hot-frozen high availability
           - page: docs-content://deploy-manage/reference-architectures/genai-search-high-availability.md
-            title: GenAI Search - High Availability
+            title: GenAI search high availability
         - group: Production guidance
           page: docs-content://deploy-manage/production-guidance.md
           children:
@@ -1443,10 +1443,10 @@ nav:
     children:
     - label: Ingest and manage data
       children:
-      - group: "Ingest or migrate: bring your data into Elasticsearch"
+      - group: Ingest or migrate data
         children:
         - page: docs-content://manage-data/ingest.md
-          title: Choose/Plan your ingest method
+          title: Choose an ingest method
         - group: Ingest architectures
           page: docs-content://manage-data/ingest/ingest-reference-architectures.md
           children:
@@ -1493,7 +1493,7 @@ nav:
             title: Ingesting data for search use cases
           - title: Ingesting data for observability
           - page: docs-content://solutions/security/get-started/ingest-data-to-elastic-security.md
-            title: Ingesting data for security (Move from Solutions)
+            title: Ingesting data for security
         - page: docs-content://manage-data/ingest/ingesting-timeseries-data.md
           title: Ingesting time series data
         - group: Ingest logs
@@ -1847,7 +1847,7 @@ nav:
           title: Index mapping and text analysis
         - page: docs-content://manage-data/ingest/transform-enrich/ingest-lag.md
           title: Calculate ingest lag metadata
-    - label: Search, visualize and analyze
+    - label: Search, visualize, and analyze
       children:
       - group: Search and query
         children:
@@ -2301,7 +2301,7 @@ nav:
           title: Workflow templates
     - label: AI and machine learning
       children:
-      - group: Machine Learning and NLP
+      - group: Machine learning and NLP
         page: docs-content://explore-analyze/machine-learning.md
         children:
         - page: docs-content://explore-analyze/machine-learning/setting-up-machine-learning.md
@@ -2652,7 +2652,7 @@ nav:
             - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/k8s.md
               title: Kubernetes
             - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/hosts_vms.md
-              title: Hosts / VMs
+              title: Hosts and VMs
             - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/docker.md
               title: Docker
           - group: Elastic Cloud Serverless

From c1f2aebfda9b8c5c0d2fa41469fe57bd1b0c2353 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 17:30:24 +0200
Subject: [PATCH 197/226] chore(nav-v2): spruce up navigation labels

Port the core navigation wording cleanup from PR #3326 while preserving the nav-v2-sections structure.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 config/navigation-v2.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 730206c69c..966c24d6e0 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -12,7 +12,7 @@ nav:
       - group: Elasticsearch concepts
         children:
         - page: docs-content://manage-data/data-store.md
-          title: Elasticsearch essentials (Core document database)
+          title: Elasticsearch essentials
         - page: docs-content://manage-data/ingest.md
           title: Ingest data into Elasticsearch
         - page: docs-content://solutions/search.md
@@ -26,7 +26,7 @@ nav:
           - page: docs-content://solutions/search/site-or-app.md
             title: Add search to your site or app
           - page: docs-content://solutions/search/rag.md
-            title: RAG
+            title: Retrieval-augmented generation (RAG)
     - label: Install, deploy, and administer
       children:
         - group: Distributed architecture
@@ -81,9 +81,9 @@ nav:
             page: docs-content://deploy-manage/reference-architectures.md
             children:
             - page: docs-content://deploy-manage/reference-architectures/hotfrozen-high-availability.md
-              title: Hot/Frozen - High Availability
+              title: Hot-frozen high availability
             - page: docs-content://deploy-manage/reference-architectures/genai-search-high-availability.md
-              title: GenAI Search - High Availability
+              title: GenAI search high availability
           - group: Production guidance
             page: docs-content://deploy-manage/production-guidance.md
             children:
@@ -1647,10 +1647,10 @@ nav:
       children:
       - label: Ingest and manage data
         children:
-        - group: "Ingest or migrate: bring your data into Elasticsearch"
+        - group: Ingest or migrate data
           children:
           - page: docs-content://manage-data/ingest.md
-            title: Choose/Plan your ingest method
+            title: Choose an ingest method
           - group: Ingest architectures
             page: docs-content://manage-data/ingest/ingest-reference-architectures.md
             children:
@@ -1697,7 +1697,7 @@ nav:
               title: Ingesting data for search use cases
             - title: Ingesting data for observability
             - page: docs-content://solutions/security/get-started/ingest-data-to-elastic-security.md
-              title: Ingesting data for security (Move from Solutions)
+              title: Ingesting data for security
           - page: docs-content://manage-data/ingest/ingesting-timeseries-data.md
             title: Ingesting time series data
           - group: Ingest logs
@@ -2051,7 +2051,7 @@ nav:
             title: Index mapping and text analysis
           - page: docs-content://manage-data/ingest/transform-enrich/ingest-lag.md
             title: Calculate ingest lag metadata
-      - label: Search, visualize and analyze
+      - label: Search, visualize, and analyze
         children:
         # =======================================================================
         # SEARCH AND QUERY
@@ -2685,7 +2685,7 @@ nav:
             title: Workflow templates
       - label: AI and machine learning
         children:
-        - group: Machine Learning and NLP
+        - group: Machine learning and NLP
           page: docs-content://explore-analyze/machine-learning.md
           children:
           - page: docs-content://explore-analyze/machine-learning/setting-up-machine-learning.md
@@ -3036,7 +3036,7 @@ nav:
               - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/k8s.md
                 title: Kubernetes
               - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/hosts_vms.md
-                title: Hosts / VMs
+                title: Hosts and VMs
               - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/docker.md
                 title: Docker
             - group: Elastic Cloud Serverless

From d4b7c521f4e66a4a261418a34c46f8abf58c77c4 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 17:32:43 +0200
Subject: [PATCH 198/226] chore(nav-v2): spruce up navigation labels

Port the core navigation wording cleanup from PR #3326 into the combined findability demo.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 config/navigation-v2.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index df68cea89d..102493dbf2 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -12,7 +12,7 @@ nav:
       - group: Elasticsearch concepts
         children:
         - page: docs-content://manage-data/data-store.md
-          title: Elasticsearch essentials (Core document database)
+          title: Elasticsearch essentials
         - page: docs-content://manage-data/ingest.md
           title: Ingest data into Elasticsearch
         - page: docs-content://solutions/search.md
@@ -26,7 +26,7 @@ nav:
           - page: docs-content://solutions/search/site-or-app.md
             title: Add search to your site or app
           - page: docs-content://solutions/search/rag.md
-            title: RAG
+            title: Retrieval-augmented generation (RAG)
     - label: Install, deploy, and administer
       children:
         - group: Distributed architecture
@@ -81,9 +81,9 @@ nav:
             page: docs-content://deploy-manage/reference-architectures.md
             children:
             - page: docs-content://deploy-manage/reference-architectures/hotfrozen-high-availability.md
-              title: Hot/Frozen - High Availability
+              title: Hot-frozen high availability
             - page: docs-content://deploy-manage/reference-architectures/genai-search-high-availability.md
-              title: GenAI Search - High Availability
+              title: GenAI search high availability
           - group: Production guidance
             page: docs-content://deploy-manage/production-guidance.md
             children:
@@ -1647,10 +1647,10 @@ nav:
       children:
       - label: Ingest and manage data
         children:
-        - group: "Ingest or migrate: bring your data into Elasticsearch"
+        - group: Ingest or migrate data
           children:
           - page: docs-content://manage-data/ingest.md
-            title: Choose/Plan your ingest method
+            title: Choose an ingest method
           - group: Ingest architectures
             page: docs-content://manage-data/ingest/ingest-reference-architectures.md
             children:
@@ -1697,7 +1697,7 @@ nav:
               title: Ingesting data for search use cases
             - title: Ingesting data for observability
             - page: docs-content://solutions/security/get-started/ingest-data-to-elastic-security.md
-              title: Ingesting data for security (Move from Solutions)
+              title: Ingesting data for security
           - page: docs-content://manage-data/ingest/ingesting-timeseries-data.md
             title: Ingesting time series data
           - group: Ingest logs
@@ -2051,7 +2051,7 @@ nav:
             title: Index mapping and text analysis
           - page: docs-content://manage-data/ingest/transform-enrich/ingest-lag.md
             title: Calculate ingest lag metadata
-      - label: Search, visualize and analyze
+      - label: Search, visualize, and analyze
         children:
         # =======================================================================
         # SEARCH AND QUERY
@@ -2685,7 +2685,7 @@ nav:
             title: Workflow templates
       - label: AI and machine learning
         children:
-        - group: Machine Learning and NLP
+        - group: Machine learning and NLP
           page: docs-content://explore-analyze/machine-learning.md
           children:
           - page: docs-content://explore-analyze/machine-learning/setting-up-machine-learning.md
@@ -3036,7 +3036,7 @@ nav:
               - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/k8s.md
                 title: Kubernetes
               - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/hosts_vms.md
-                title: Hosts / VMs
+                title: Hosts and VMs
               - page: docs-content://solutions/observability/get-started/opentelemetry/quickstart/self-managed/docker.md
                 title: Docker
             - group: Elastic Cloud Serverless

From 9ae5936cc771196dab3817ccd3321105b66ee58e Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 17:57:08 +0200
Subject: [PATCH 199/226] fix(nav-v2): stabilize content container layout

Keep the HTMX swap target class stable so section navigation does not briefly render with the landing-page content layout before settling.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Markdown/_Layout.cshtml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/Elastic.Markdown/_Layout.cshtml b/src/Elastic.Markdown/_Layout.cshtml
index aafed15025..5c50fb33a0 100644
--- a/src/Elastic.Markdown/_Layout.cshtml
+++ b/src/Elastic.Markdown/_Layout.cshtml
@@ -31,19 +31,21 @@
 			">
 				<div class="min-h-screen grid grid-cols-1 md:grid-cols-[var(--max-sidebar-width)_1fr] gap-4">
 					@await RenderPartialAsync(_PagesNav.Create<GlobalLayoutViewModel>(Model))
-					<main id="content-container" class="min-w-0 lg:grid lg:grid-cols-[minmax(0,var(--max-text-width))_minmax(0,var(--max-sidebar-width))] justify-end mx-4 gap-4">
-						@await RenderPartialAsync(_TableOfContents.Create(Model))
-						@{
-							var breadcrumbs = Model.Breadcrumbs.ToList();
-							var breadcrumbVisible = breadcrumbs.Count > 0 && (breadcrumbs.Count > 1 || Model.BuildType != BuildType.Isolated);
-						}
-						<div class="mb-9 mt-0 min-w-0 @(breadcrumbVisible ? "" : "pt-6")">
-							@await RenderPartialAsync(_Breadcrumbs.Create(Model))
-							<article id="markdown-content" class="markdown-content min-w-0">
-								<input type="checkbox" class="hidden" id="pages-nav-hamburger">
-								@await RenderBodyAsync()
-							</article>
-							@await RenderPartialAsync(_PrevNextNav.Create(Model))
+					<main id="content-container" class="min-w-0">
+						<div class="lg:grid lg:grid-cols-[minmax(0,var(--max-text-width))_minmax(0,var(--max-sidebar-width))] justify-end mx-4 gap-4">
+							@await RenderPartialAsync(_TableOfContents.Create(Model))
+							@{
+								var breadcrumbs = Model.Breadcrumbs.ToList();
+								var breadcrumbVisible = breadcrumbs.Count > 0 && (breadcrumbs.Count > 1 || Model.BuildType != BuildType.Isolated);
+							}
+							<div class="mb-9 mt-0 min-w-0 @(breadcrumbVisible ? "" : "pt-6")">
+								@await RenderPartialAsync(_Breadcrumbs.Create(Model))
+								<article id="markdown-content" class="markdown-content min-w-0">
+									<input type="checkbox" class="hidden" id="pages-nav-hamburger">
+									@await RenderBodyAsync()
+								</article>
+								@await RenderPartialAsync(_PrevNextNav.Create(Model))
+							</div>
 						</div>
 					</main>
 				</div>

From fda067fd472be5138699b37fc483365fe04bb9a4 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 17:57:08 +0200
Subject: [PATCH 200/226] fix(nav-v2): stabilize content container layout

Keep the HTMX swap target class stable so section navigation does not briefly render with the landing-page content layout before settling.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Markdown/_Layout.cshtml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/Elastic.Markdown/_Layout.cshtml b/src/Elastic.Markdown/_Layout.cshtml
index 398141bfbd..c2b53fc0cd 100644
--- a/src/Elastic.Markdown/_Layout.cshtml
+++ b/src/Elastic.Markdown/_Layout.cshtml
@@ -31,19 +31,21 @@
 			">
 				<div class="min-h-screen grid grid-cols-1 md:grid-cols-[var(--max-sidebar-width)_1fr] gap-4">
 					@await RenderPartialAsync(_PagesNav.Create<GlobalLayoutViewModel>(Model))
-					<main id="content-container" class="min-w-0 lg:grid lg:grid-cols-[minmax(0,var(--max-text-width))_minmax(0,var(--max-sidebar-width))] justify-end mx-4 gap-4">
-						@await RenderPartialAsync(_TableOfContents.Create(Model))
-						@{
-							var breadcrumbs = Model.Breadcrumbs.ToList();
-							var breadcrumbVisible = breadcrumbs.Count > 0 && (breadcrumbs.Count > 1 || Model.BuildType != BuildType.Isolated);
-						}
-						<div class="mb-9 mt-0 min-w-0 @(breadcrumbVisible ? "" : "pt-6")">
-							@await RenderPartialAsync(_Breadcrumbs.Create(Model))
-							<article id="markdown-content" class="markdown-content min-w-0">
-								<input type="checkbox" class="hidden" id="pages-nav-hamburger">
-								@await RenderBodyAsync()
-							</article>
-							@await RenderPartialAsync(_PrevNextNav.Create(Model))
+					<main id="content-container" class="min-w-0">
+						<div class="lg:grid lg:grid-cols-[minmax(0,var(--max-text-width))_minmax(0,var(--max-sidebar-width))] justify-end mx-4 gap-4">
+							@await RenderPartialAsync(_TableOfContents.Create(Model))
+							@{
+								var breadcrumbs = Model.Breadcrumbs.ToList();
+								var breadcrumbVisible = breadcrumbs.Count > 0 && (breadcrumbs.Count > 1 || Model.BuildType != BuildType.Isolated);
+							}
+							<div class="mb-9 mt-0 min-w-0 @(breadcrumbVisible ? "" : "pt-6")">
+								@await RenderPartialAsync(_Breadcrumbs.Create(Model))
+								<article id="markdown-content" class="markdown-content min-w-0">
+									<input type="checkbox" class="hidden" id="pages-nav-hamburger">
+									@await RenderBodyAsync()
+								</article>
+								@await RenderPartialAsync(_PrevNextNav.Create(Model))
+							</div>
 						</div>
 					</main>
 				</div>

From 37178e0b9f5b2d2b7ea20558782c15bc1c8fb0e2 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 17:57:08 +0200
Subject: [PATCH 201/226] fix(nav-v2): stabilize content container layout

Keep the HTMX swap target class stable so section navigation does not briefly render with the landing-page content layout before settling.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Markdown/_Layout.cshtml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/Elastic.Markdown/_Layout.cshtml b/src/Elastic.Markdown/_Layout.cshtml
index 398141bfbd..c2b53fc0cd 100644
--- a/src/Elastic.Markdown/_Layout.cshtml
+++ b/src/Elastic.Markdown/_Layout.cshtml
@@ -31,19 +31,21 @@
 			">
 				<div class="min-h-screen grid grid-cols-1 md:grid-cols-[var(--max-sidebar-width)_1fr] gap-4">
 					@await RenderPartialAsync(_PagesNav.Create<GlobalLayoutViewModel>(Model))
-					<main id="content-container" class="min-w-0 lg:grid lg:grid-cols-[minmax(0,var(--max-text-width))_minmax(0,var(--max-sidebar-width))] justify-end mx-4 gap-4">
-						@await RenderPartialAsync(_TableOfContents.Create(Model))
-						@{
-							var breadcrumbs = Model.Breadcrumbs.ToList();
-							var breadcrumbVisible = breadcrumbs.Count > 0 && (breadcrumbs.Count > 1 || Model.BuildType != BuildType.Isolated);
-						}
-						<div class="mb-9 mt-0 min-w-0 @(breadcrumbVisible ? "" : "pt-6")">
-							@await RenderPartialAsync(_Breadcrumbs.Create(Model))
-							<article id="markdown-content" class="markdown-content min-w-0">
-								<input type="checkbox" class="hidden" id="pages-nav-hamburger">
-								@await RenderBodyAsync()
-							</article>
-							@await RenderPartialAsync(_PrevNextNav.Create(Model))
+					<main id="content-container" class="min-w-0">
+						<div class="lg:grid lg:grid-cols-[minmax(0,var(--max-text-width))_minmax(0,var(--max-sidebar-width))] justify-end mx-4 gap-4">
+							@await RenderPartialAsync(_TableOfContents.Create(Model))
+							@{
+								var breadcrumbs = Model.Breadcrumbs.ToList();
+								var breadcrumbVisible = breadcrumbs.Count > 0 && (breadcrumbs.Count > 1 || Model.BuildType != BuildType.Isolated);
+							}
+							<div class="mb-9 mt-0 min-w-0 @(breadcrumbVisible ? "" : "pt-6")">
+								@await RenderPartialAsync(_Breadcrumbs.Create(Model))
+								<article id="markdown-content" class="markdown-content min-w-0">
+									<input type="checkbox" class="hidden" id="pages-nav-hamburger">
+									@await RenderBodyAsync()
+								</article>
+								@await RenderPartialAsync(_PrevNextNav.Create(Model))
+							</div>
 						</div>
 					</main>
 				</div>

From 2ff985247a8c7629fd5ed538b1f827573dd2d559 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 18:16:59 +0200
Subject: [PATCH 202/226] chore(nav-v2): expand Reference section to explicit
 children

Replace the single aggregate docs-content://reference TOC with
explicit per-subdirectory entries so each reference area loads
independently without duplicating top-level sections in the sidebar.
Logstash plugin entries remain as nav islands with back-arrow.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 config/navigation-v2.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 966c24d6e0..bc521dd2d4 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -4291,7 +4291,15 @@ nav:
   - section: Reference
     url: /reference/
     children:
-    - toc: docs-content://reference
+    - toc: docs-content://reference/security
+    - toc: docs-content://reference/observability
+    - toc: docs-content://reference/elasticsearch-clients
+    - toc: docs-content://reference/ingestion-tools
+    - toc: docs-content://reference/fleet
+    - toc: docs-content://reference/apm
+    - toc: docs-content://reference/apm-agents
+    - toc: docs-content://reference/machine-learning
+    - toc: docs-content://reference/glossary
     - toc: elasticsearch://reference/elasticsearch
     - toc: elasticsearch://reference/elasticsearch-plugins
     - toc: elasticsearch://reference/community-contributed

From a2c1013379b0abb3fc809e683f5215d23674b338 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 18:17:53 +0200
Subject: [PATCH 203/226] chore(nav-v2): expand Reference section to explicit
 children

Replace the single aggregate docs-content://reference TOC with
explicit per-subdirectory entries so each reference area loads
independently without duplicating top-level sections in the sidebar.
Logstash plugin entries added as nav islands with back-arrow.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 config/navigation-v2.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index da533cfd5e..48e96e3b73 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -3882,7 +3882,15 @@ nav:
         title: APIs
   - label: Reference
     children:
-    - toc: docs-content://reference
+    - toc: docs-content://reference/security
+    - toc: docs-content://reference/observability
+    - toc: docs-content://reference/elasticsearch-clients
+    - toc: docs-content://reference/ingestion-tools
+    - toc: docs-content://reference/fleet
+    - toc: docs-content://reference/apm
+    - toc: docs-content://reference/apm-agents
+    - toc: docs-content://reference/machine-learning
+    - toc: docs-content://reference/glossary
     - toc: elasticsearch://reference/elasticsearch
     - toc: elasticsearch://reference/elasticsearch-plugins
     - toc: elasticsearch://reference/community-contributed
@@ -3963,6 +3971,10 @@ nav:
     - page: docs-content://explore-analyze/numeral-formatting.md
       title: Numeral formatting
     - toc: elasticsearch://reference/text-analysis
+    - island: Logstash plugins
+      toc: logstash-docs-md://lsr
+    - island: Logstash versioned plugins
+      toc: logstash-docs-md://vpr
   - label: Release notes
     children:
     - toc: docs-content://release-notes/intro

From e8c89e32bafd51f62035b49392533521ae6d18fd Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 18:19:23 +0200
Subject: [PATCH 204/226] chore(nav-v2): expand Reference section to explicit
 children

Replace the single aggregate docs-content://reference TOC with
explicit per-subdirectory entries so each reference area loads
independently without duplicating top-level sections in the sidebar.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 config/navigation-v2.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index 102493dbf2..d038a2de21 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -4309,7 +4309,15 @@ nav:
   - section: Reference
     url: /reference/
     children:
-    - toc: docs-content://reference
+    - toc: docs-content://reference/security
+    - toc: docs-content://reference/observability
+    - toc: docs-content://reference/elasticsearch-clients
+    - toc: docs-content://reference/ingestion-tools
+    - toc: docs-content://reference/fleet
+    - toc: docs-content://reference/apm
+    - toc: docs-content://reference/apm-agents
+    - toc: docs-content://reference/machine-learning
+    - toc: docs-content://reference/glossary
     - toc: elasticsearch://reference/elasticsearch
     - toc: elasticsearch://reference/elasticsearch-plugins
     - toc: elasticsearch://reference/community-contributed

From 3a14490ab777c846846eee751efc6b7ec3fc5b85 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 18:27:29 +0200
Subject: [PATCH 205/226] fix(nav-v2): fix island back arrow and collapse
 children in parent nav

Back arrow: instead of always pointing at the parent *section* URL
(which is "/" for the Guides section), walk up the IslandNavigationNode
parent chain to the nearest ancestor that has a real URL. Store it as
BackUrl on NavigationIsland and use it in GlobalNavigationHtmlWriter.

Parent nav: render island entries as plain links with no expandable
subtree. The island's own sidebar (loaded via HTMX full-swap) already
shows the full tree; expanding it inline was duplicate and confusing.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../V2/IslandNavigationNode.cs                | 19 ++++++
 .../V2/NavigationSection.cs                   |  1 +
 .../V2/SiteNavigationV2.cs                    |  1 +
 .../Navigation/_TocTreeNavV2.cshtml           | 66 +++----------------
 .../Navigation/GlobalNavigationHtmlWriter.cs  |  2 +-
 5 files changed, 31 insertions(+), 58 deletions(-)

diff --git a/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs
index 619aceac7f..71d7c96dd8 100644
--- a/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs
+++ b/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs
@@ -20,6 +20,25 @@ public class IslandNavigationNode(
 	/// <summary>The Id of the wrapped toc root, used for island lookup by nav ownership.</summary>
 	public string SourceTocRootId { get; } = source.Id;
 
+	/// <summary>
+	/// The URL to use for the back arrow when this island is active.
+	/// Walks up the parent chain to find the nearest ancestor with a meaningful URL,
+	/// falling back to "/" if none is found.
+	/// </summary>
+	public string ParentUrl { get; } = ResolveParentUrl(parent);
+
+	private static string ResolveParentUrl(INodeNavigationItem<INavigationModel, INavigationItem>? parent)
+	{
+		var current = parent;
+		while (current is not null)
+		{
+			if (!string.IsNullOrEmpty(current.Url) && current.Url != "/")
+				return current.Url;
+			current = current.Parent;
+		}
+		return "/";
+	}
+
 	/// <inheritdoc />
 	public string Id { get; } = ShortId.Create("island", label);
 
diff --git a/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs b/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
index b0ee805d19..ba7d770da9 100644
--- a/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
+++ b/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
@@ -26,5 +26,6 @@ public record NavigationIsland(
 	string Url,
 	string SourceTocRootId,
 	NavigationSection ParentSection,
+	string BackUrl,
 	IReadOnlyList<INavigationItem> NavigationItems
 );
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 3517629b78..32845921f4 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -123,6 +123,7 @@ List<NavigationIsland> islands
 					islandNode.Url,
 					islandNode.SourceTocRootId,
 					parentSection,
+					islandNode.ParentUrl,
 					[.. islandNode.NavigationItems]
 				));
 			}
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index fbd0b9ccc0..8ed4867eca 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -133,63 +133,15 @@
 	else if (item is IslandNavigationNode island)
 	{
 		var islandHxAttrs = Model.Htmx.GetHxAttributes(hxSwapOob: "#main-container,#secondary-nav", preload: null);
-		var islandAllHidden = island.NavigationItems.All(n => n.Hidden);
-		<li class="flex flex-wrap group-navigation relative">
-			<div class="peer nav-folder-peer grid w-full grid-cols-1">
-				@if (!islandAllHidden)
-				{
-					<input
-						id="@island.Id"
-						type="checkbox"
-						class="sr-only pointer-events-none"
-						tabindex="-1"
-						aria-hidden="true">
-				}
-				<a
-					href="@island.Url"
-					@islandHxAttrs
-					class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
-					style="--nav-level:@Model.Level">
-					@if (!islandAllHidden)
-					{
-						<span class="nav-folder-chevron shrink-0" aria-hidden="true">
-							<svg
-								xmlns="http://www.w3.org/2000/svg"
-								fill="none"
-								viewBox="0 0 24 24"
-								stroke-width="1.5"
-								stroke="currentColor"
-								>
-								<path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/>
-							</svg>
-						</span>
-					}
-					else
-					{
-						<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
-					}
-					<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@island.NavigationTitle</span>
-				</a>
-			</div>
-			@if (island.NavigationItems.Count > 0)
-			{
-				<div class="docs-sidebar-nav-v2__folder-clip w-full">
-					<div class="docs-sidebar-nav-v2__folder-clip-inner">
-						<ul class="docs-sidebar-nav-v2__folder-children w-full relative">
-							@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
-							{
-								IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
-								IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
-								Level = Model.Level + 1,
-								SubTree = island,
-								RootNavigationId = Model.RootNavigationId,
-								Htmx = Model.Htmx,
-								IsIslandSubtree = true
-							}))
-						</ul>
-					</div>
-				</div>
-			}
+		<li class="flex group/li">
+			<a
+				href="@island.Url"
+				@islandHxAttrs
+				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
+				style="--nav-level:@Model.Level">
+				<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
+				<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@island.NavigationTitle</span>
+			</a>
 		</li>
 	}
 	else if (item is INodeNavigationItem<INavigationModel, INavigationItem> { NavigationItems.Count: 0 } group)
diff --git a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
index 11737f4cec..9d80f8243e 100644
--- a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -157,7 +157,7 @@ Cancel ctx
 				IsNavV2 = true,
 				IsIsolatedSection = true,
 				SectionUrl = null,
-				BackArrowUrl = CombineWithSitePrefix(navV2, island.ParentSection.Url)
+				BackArrowUrl = CombineWithSitePrefix(navV2, island.BackUrl)
 			};
 
 			var html = await ((INavigationHtmlWriter)this).Render(model, ctx);

From d6e269372d467659fae3f406844c6f7d4123ac28 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 18:27:29 +0200
Subject: [PATCH 206/226] fix(nav-v2): fix island back arrow and collapse
 children in parent nav

Back arrow: instead of always pointing at the parent *section* URL
(which is "/" for the Guides section), walk up the IslandNavigationNode
parent chain to the nearest ancestor that has a real URL. Store it as
BackUrl on NavigationIsland and use it in GlobalNavigationHtmlWriter.

Parent nav: render island entries as plain links with no expandable
subtree. The island's own sidebar (loaded via HTMX full-swap) already
shows the full tree; expanding it inline was duplicate and confusing.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../V2/IslandNavigationNode.cs                | 19 ++++++
 .../V2/NavigationSection.cs                   |  1 +
 .../V2/SiteNavigationV2.cs                    |  1 +
 .../Navigation/_TocTreeNavV2.cshtml           | 66 +++----------------
 .../Navigation/GlobalNavigationHtmlWriter.cs  |  2 +-
 5 files changed, 31 insertions(+), 58 deletions(-)

diff --git a/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs
index 2770d5cf7c..9265f93c8a 100644
--- a/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs
+++ b/src/Elastic.Documentation.Navigation/V2/IslandNavigationNode.cs
@@ -20,6 +20,25 @@ INodeNavigationItem<INavigationModel, INavigationItem> parent
 	/// <summary>The Id of the wrapped toc root, used for island lookup by nav ownership.</summary>
 	public string SourceTocRootId { get; } = source.Id;
 
+	/// <summary>
+	/// The URL to use for the back arrow when this island is active.
+	/// Walks up the parent chain to find the nearest ancestor with a meaningful URL,
+	/// falling back to "/" if none is found.
+	/// </summary>
+	public string ParentUrl { get; } = ResolveParentUrl(parent);
+
+	private static string ResolveParentUrl(INodeNavigationItem<INavigationModel, INavigationItem>? parent)
+	{
+		var current = parent;
+		while (current is not null)
+		{
+			if (!string.IsNullOrEmpty(current.Url) && current.Url != "/")
+				return current.Url;
+			current = current.Parent;
+		}
+		return "/";
+	}
+
 	/// <inheritdoc />
 	public string Id { get; } = ShortId.Create("island", label);
 
diff --git a/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs b/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
index 467d61db13..76645b611a 100644
--- a/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
+++ b/src/Elastic.Documentation.Navigation/V2/NavigationSection.cs
@@ -27,5 +27,6 @@ public record NavigationIsland(
 	string Url,
 	string SourceTocRootId,
 	NavigationSection ParentSection,
+	string BackUrl,
 	IReadOnlyList<INavigationItem> NavigationItems
 );
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 4c8c7a0609..8391a0edf6 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -198,6 +198,7 @@ List<NavigationIsland> islands
 					islandNode.Url,
 					islandNode.SourceTocRootId,
 					parentSection,
+					islandNode.ParentUrl,
 					[.. islandNode.NavigationItems]
 				));
 			}
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index fbd0b9ccc0..8ed4867eca 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -133,63 +133,15 @@
 	else if (item is IslandNavigationNode island)
 	{
 		var islandHxAttrs = Model.Htmx.GetHxAttributes(hxSwapOob: "#main-container,#secondary-nav", preload: null);
-		var islandAllHidden = island.NavigationItems.All(n => n.Hidden);
-		<li class="flex flex-wrap group-navigation relative">
-			<div class="peer nav-folder-peer grid w-full grid-cols-1">
-				@if (!islandAllHidden)
-				{
-					<input
-						id="@island.Id"
-						type="checkbox"
-						class="sr-only pointer-events-none"
-						tabindex="-1"
-						aria-hidden="true">
-				}
-				<a
-					href="@island.Url"
-					@islandHxAttrs
-					class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
-					style="--nav-level:@Model.Level">
-					@if (!islandAllHidden)
-					{
-						<span class="nav-folder-chevron shrink-0" aria-hidden="true">
-							<svg
-								xmlns="http://www.w3.org/2000/svg"
-								fill="none"
-								viewBox="0 0 24 24"
-								stroke-width="1.5"
-								stroke="currentColor"
-								>
-								<path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/>
-							</svg>
-						</span>
-					}
-					else
-					{
-						<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
-					}
-					<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@island.NavigationTitle</span>
-				</a>
-			</div>
-			@if (island.NavigationItems.Count > 0)
-			{
-				<div class="docs-sidebar-nav-v2__folder-clip w-full">
-					<div class="docs-sidebar-nav-v2__folder-clip-inner">
-						<ul class="docs-sidebar-nav-v2__folder-children w-full relative">
-							@await RenderPartialAsync(_TocTreeNavV2.Create(new NavigationTreeItem
-							{
-								IsPrimaryNavEnabled = Model.IsPrimaryNavEnabled,
-								IsGlobalAssemblyBuild = Model.IsGlobalAssemblyBuild,
-								Level = Model.Level + 1,
-								SubTree = island,
-								RootNavigationId = Model.RootNavigationId,
-								Htmx = Model.Htmx,
-								IsIslandSubtree = true
-							}))
-						</ul>
-					</div>
-				</div>
-			}
+		<li class="flex group/li">
+			<a
+				href="@island.Url"
+				@islandHxAttrs
+				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
+				style="--nav-level:@Model.Level">
+				<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
+				<span class="docs-sidebar-nav-v2__nav-text min-w-0 flex-1">@island.NavigationTitle</span>
+			</a>
 		</li>
 	}
 	else if (item is INodeNavigationItem<INavigationModel, INavigationItem> { NavigationItems.Count: 0 } group)
diff --git a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
index 00f389fc1a..b41fe28721 100644
--- a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -157,7 +157,7 @@ Cancel ctx
 				IsNavV2 = true,
 				IsIsolatedSection = true,
 				SectionUrl = null,
-				BackArrowUrl = CombineWithSitePrefix(navV2, island.ParentSection.Url)
+				BackArrowUrl = CombineWithSitePrefix(navV2, island.BackUrl)
 			};
 
 			var html = await ((INavigationHtmlWriter)this).Render(model, ctx);

From 4513e948d6b25dbdd0a9e7b0aa1930828d74e795 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 19:25:04 +0200
Subject: [PATCH 207/226] fix(nav-v2): fix landing and hub main/sidebar column
 placement

Landing and hub layouts rendered the sidebar with md:order-1 while
main had no md order, so main could be placed into the narrow sidebar
column. Apply the same ordering pattern as the default layout by giving
main md:order-2 and keeping nav after main in source order.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Markdown/_Layout.cshtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Elastic.Markdown/_Layout.cshtml b/src/Elastic.Markdown/_Layout.cshtml
index 881b776640..becd000a9b 100644
--- a/src/Elastic.Markdown/_Layout.cshtml
+++ b/src/Elastic.Markdown/_Layout.cshtml
@@ -58,13 +58,13 @@
 		<div class="relative hub-page">
 			<div class="min-h-screen w-full max-w-(--max-layout-width) mx-auto md:px-4">
 				<div class="min-h-screen grid grid-cols-1 md:grid-cols-[var(--max-sidebar-width)_1fr] gap-4">
-					@await RenderPartialAsync(_PagesNav.Create<GlobalLayoutViewModel>(Model))
-					<main id="content-container" class="min-w-0">
+					<main id="content-container" class="min-w-0 md:order-2">
 						<input type="checkbox" class="hidden" id="pages-nav-hamburger">
 						<article id="hub-content" class="hub-content min-w-0">
 							@await RenderBodyAsync()
 						</article>
 					</main>
+					@await RenderPartialAsync(_PagesNav.Create<GlobalLayoutViewModel>(Model))
 					@* Empty TOC slot so htmx hx-select-oob="#toc-nav" swaps don't fail when boosted from a regular page. Hub pages have their own inline {on-this-page} chip. *@
 					<aside id="toc-nav" class="hidden" aria-hidden="true"></aside>
 				</div>
@@ -77,8 +77,7 @@
 		<div class="relative">
 			<div class="min-h-screen w-full max-w-(--max-layout-width) mx-auto md:px-4">
 				<div class="min-h-screen grid grid-cols-1 md:grid-cols-[var(--max-sidebar-width)_1fr] gap-0">
-					@await RenderPartialAsync(_PagesNav.Create<GlobalLayoutViewModel>(Model))
-					<main id="content-container" class="min-w-0">
+					<main id="content-container" class="min-w-0 md:order-2">
 						<input type="checkbox" class="hidden" id="pages-nav-hamburger">
 						<div class="md:hidden sticky top-[calc(var(--offset-top)+1px)] z-20 border-b border-grey-20 bg-white/95 px-4 py-3">
 							<label role="button" class="inline-flex cursor-pointer items-center gap-2 font-sans text-sm font-semibold text-ink" for="pages-nav-hamburger">
@@ -92,6 +91,7 @@
 						</div>
 						@await RenderPartialAsync(_LandingPage.Create(Model))
 					</main>
+					@await RenderPartialAsync(_PagesNav.Create<GlobalLayoutViewModel>(Model))
 					@* Empty TOC slot so htmx hx-select-oob="#toc-nav" swaps don't fail when boosted from a regular page. *@
 					<aside id="toc-nav" class="hidden" aria-hidden="true"></aside>
 				</div>

From 2c82f8bf9b53a90f2f8e891d55d5a984d5a1e507 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 21:44:20 +0200
Subject: [PATCH 208/226] fix(nav-v2): resolve section roots and island back
 links

Register section root URLs as authoritative owners and normalize site-prefixed lookups so section landing pages keep their own sidebar. Make island back links preserve the active site prefix, including nested reference islands such as Logstash plugins.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../V2/SiteNavigationV2.cs                    | 66 +++++++++++++++----
 .../Navigation/GlobalNavigationHtmlWriter.cs  | 26 +++++++-
 2 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 8391a0edf6..58875c2200 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -98,15 +98,31 @@ public SiteNavigationV2(
 	/// </summary>
 	public NavigationSection? GetSectionForUrl(string? pageUrl)
 	{
-		if (pageUrl is not null)
+		if (pageUrl is not null && TryGetSectionForUrl(pageUrl, out var section))
+			return section;
+		return Sections.FirstOrDefault(s => !s.Isolated);
+	}
+
+	private bool TryGetSectionForUrl(string url, out NavigationSection section)
+	{
+		var normalized = url.TrimEnd('/');
+		if (_urlToSection.TryGetValue(normalized, out section!))
+			return true;
+		if (_urlToSection.TryGetValue(normalized + "/", out section!))
+			return true;
+
+		var prefix = Url.TrimEnd('/');
+		if (!string.IsNullOrEmpty(prefix) && normalized.StartsWith($"{prefix}/", StringComparison.OrdinalIgnoreCase))
 		{
-			var normalized = pageUrl.TrimEnd('/');
-			if (_urlToSection.TryGetValue(normalized, out var section))
-				return section;
-			if (_urlToSection.TryGetValue(normalized + "/", out section))
-				return section;
+			var withoutPrefix = normalized[prefix.Length..];
+			if (_urlToSection.TryGetValue(withoutPrefix, out section!))
+				return true;
+			if (_urlToSection.TryGetValue(withoutPrefix + "/", out section!))
+				return true;
 		}
-		return Sections.FirstOrDefault(s => !s.Isolated);
+
+		section = null!;
+		return false;
 	}
 
 	private INavigationItem GetNavigationForFile(IDocumentationFile file) =>
@@ -212,7 +228,10 @@ [.. islandNode.NavigationItems]
 	private void BuildUrlToSectionLookup()
 	{
 		foreach (var section in Sections)
+		{
 			CollectUrlsForSection(section.NavigationItems, section);
+			AddUrlToSection(section.Url, section, replaceExisting: true);
+		}
 	}
 
 	private void CollectUrlsForSection(IEnumerable<INavigationItem> items, NavigationSection section)
@@ -223,17 +242,40 @@ private void CollectUrlsForSection(IEnumerable<INavigationItem> items, Navigatio
 			if (item is IslandNavigationNode)
 				continue;
 
-			if (!string.IsNullOrEmpty(item.Url))
-			{
-				var normalized = item.Url.TrimEnd('/');
-				_ = _urlToSection.TryAdd(normalized, section);
-			}
+			AddUrlToSection(item.Url, section);
 
 			if (item is INodeNavigationItem<INavigationModel, INavigationItem> node)
 				CollectUrlsForSection(node.NavigationItems, section);
 		}
 	}
 
+	private void AddUrlToSection(string url, NavigationSection section, bool replaceExisting = false)
+	{
+		if (string.IsNullOrEmpty(url))
+			return;
+		AddNormalizedUrlToSection(url, section, replaceExisting);
+		if (IsExternalUrl(url))
+			return;
+		var prefix = Url.TrimEnd('/');
+		var path = url.TrimStart('/');
+		var prefixed = string.IsNullOrEmpty(path) ? prefix : $"{prefix}/{path}";
+		if (!url.Equals(prefixed, StringComparison.OrdinalIgnoreCase))
+			AddNormalizedUrlToSection(prefixed, section, replaceExisting);
+	}
+
+	private void AddNormalizedUrlToSection(string url, NavigationSection section, bool replaceExisting)
+	{
+		var normalized = url.TrimEnd('/');
+		if (replaceExisting)
+			_urlToSection[normalized] = section;
+		else
+			_ = _urlToSection.TryAdd(normalized, section);
+	}
+
+	private static bool IsExternalUrl(string url) =>
+		url.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
+		url.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
+
 	private void BuildTocRootToIslandLookup()
 	{
 		foreach (var island in Islands)
diff --git a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
index b41fe28721..783e7c1224 100644
--- a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -138,6 +138,8 @@ Cancel ctx
 				return CreateIslandResult(cachedHtml, island, navV2);
 
 			_logger.LogInformation("Rendering V2 island navigation: {IslandLabel} ({IslandId})", island.Label, island.Id);
+			var islandUrlForPrefix = island.NavigationItems.FirstOrDefault(i => !string.IsNullOrEmpty(i.Url))?.Url ?? island.Url;
+			var backArrowUrl = CombineWithSitePrefix(navV2, island.BackUrl, islandUrlForPrefix);
 
 			var wrapper = new SectionNavigationV2Wrapper(
 				new NavigationSection(island.Id, island.Label, "", false, false, island.NavigationItems),
@@ -157,7 +159,7 @@ Cancel ctx
 				IsNavV2 = true,
 				IsIsolatedSection = true,
 				SectionUrl = null,
-				BackArrowUrl = CombineWithSitePrefix(navV2, island.BackUrl)
+				BackArrowUrl = backArrowUrl
 			};
 
 			var html = await ((INavigationHtmlWriter)this).Render(model, ctx);
@@ -179,13 +181,31 @@ private static NavigationRenderResult CreateIslandResult(string html, Navigation
 			ActiveSectionId = island.ParentSection.Id
 		};
 
-	private static string CombineWithSitePrefix(SiteNavigation nav, string sectionUrl)
+	private static string CombineWithSitePrefix(SiteNavigation nav, string sectionUrl, string? currentUrl = null)
 	{
 		var prefix = nav.Url.TrimEnd('/');
 		var path = sectionUrl.TrimStart('/');
-		return string.IsNullOrEmpty(path) ? $"{prefix}/" : $"{prefix}/{path}";
+		if (string.IsNullOrEmpty(path))
+			return $"{prefix}/";
+		if (IsExternalUrl(sectionUrl))
+			return sectionUrl;
+		if (sectionUrl.Equals(prefix, StringComparison.OrdinalIgnoreCase) || sectionUrl.StartsWith($"{prefix}/", StringComparison.OrdinalIgnoreCase))
+			return sectionUrl;
+		if (!string.IsNullOrEmpty(currentUrl) && sectionUrl.Length > 0 && sectionUrl[0] == '/')
+		{
+			var normalizedCurrentUrl = currentUrl.TrimEnd('/');
+			var normalizedSectionPath = "/" + path.TrimEnd('/');
+			var sectionIndex = normalizedCurrentUrl.IndexOf(normalizedSectionPath, StringComparison.OrdinalIgnoreCase);
+			if (sectionIndex > 0)
+				return normalizedCurrentUrl[..sectionIndex] + "/" + path;
+		}
+		return $"{prefix}/{path}";
 	}
 
+	private static bool IsExternalUrl(string url) =>
+		url.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
+		url.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
+
 	private static NavigationRenderResult CreateSectionResult(string html, NavigationSection activeSection, SiteNavigationV2 navV2) =>
 		new()
 		{

From 38d9c8316736088367fafd5e61dc937503b141b4 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 21:44:20 +0200
Subject: [PATCH 209/226] fix(nav-v2): resolve section roots and island back
 links

Register section root URLs as authoritative owners and normalize site-prefixed lookups so section landing pages keep their own sidebar. Make island back links preserve the active site prefix, including nested reference islands such as Logstash plugins.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../V2/SiteNavigationV2.cs                    | 67 +++++++++++++++----
 .../Navigation/GlobalNavigationHtmlWriter.cs  | 26 ++++++-
 2 files changed, 77 insertions(+), 16 deletions(-)

diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 32845921f4..3d6359755a 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -82,17 +82,32 @@ public SiteNavigationV2(
 	/// </summary>
 	public NavigationSection? GetSectionForUrl(string? pageUrl)
 	{
-		if (pageUrl is not null)
-		{
-			var normalized = pageUrl.TrimEnd('/');
-			if (_urlToSection.TryGetValue(normalized, out var section))
-				return section;
-			if (_urlToSection.TryGetValue(normalized + "/", out section))
-				return section;
-		}
+		if (pageUrl is not null && TryGetSectionForUrl(pageUrl, out var section))
+			return section;
 		return Sections.FirstOrDefault(s => !s.Isolated);
 	}
 
+	private bool TryGetSectionForUrl(string url, out NavigationSection section)
+	{
+		var normalized = url.TrimEnd('/');
+		if (_urlToSection.TryGetValue(normalized, out section!))
+			return true;
+		if (_urlToSection.TryGetValue(normalized + "/", out section!))
+			return true;
+
+		var prefix = Url.TrimEnd('/');
+		if (!string.IsNullOrEmpty(prefix) && normalized.StartsWith($"{prefix}/", StringComparison.OrdinalIgnoreCase))
+		{
+			var withoutPrefix = normalized[prefix.Length..];
+			if (_urlToSection.TryGetValue(withoutPrefix, out section!))
+				return true;
+			if (_urlToSection.TryGetValue(withoutPrefix + "/", out section!))
+				return true;
+		}
+
+		section = null!;
+		return false;
+	}
 	private static IReadOnlyList<NavigationSection> BuildSections(IReadOnlyList<INavigationItem> items) =>
 		items
 			.OfType<SectionNavigationNode>()
@@ -137,7 +152,10 @@ [.. islandNode.NavigationItems]
 	private void BuildUrlToSectionLookup()
 	{
 		foreach (var section in Sections)
+		{
 			CollectUrlsForSection(section.NavigationItems, section);
+			AddUrlToSection(section.Url, section, replaceExisting: true);
+		}
 	}
 
 	private void CollectUrlsForSection(IEnumerable<INavigationItem> items, NavigationSection section)
@@ -148,17 +166,40 @@ private void CollectUrlsForSection(IEnumerable<INavigationItem> items, Navigatio
 			if (item is IslandNavigationNode)
 				continue;
 
-			if (!string.IsNullOrEmpty(item.Url))
-			{
-				var normalized = item.Url.TrimEnd('/');
-				_ = _urlToSection.TryAdd(normalized, section);
-			}
+			AddUrlToSection(item.Url, section);
 
 			if (item is INodeNavigationItem<INavigationModel, INavigationItem> node)
 				CollectUrlsForSection(node.NavigationItems, section);
 		}
 	}
 
+	private void AddUrlToSection(string url, NavigationSection section, bool replaceExisting = false)
+	{
+		if (string.IsNullOrEmpty(url))
+			return;
+		AddNormalizedUrlToSection(url, section, replaceExisting);
+		if (IsExternalUrl(url))
+			return;
+		var prefix = Url.TrimEnd('/');
+		var path = url.TrimStart('/');
+		var prefixed = string.IsNullOrEmpty(path) ? prefix : $"{prefix}/{path}";
+		if (!url.Equals(prefixed, StringComparison.OrdinalIgnoreCase))
+			AddNormalizedUrlToSection(prefixed, section, replaceExisting);
+	}
+
+	private void AddNormalizedUrlToSection(string url, NavigationSection section, bool replaceExisting)
+	{
+		var normalized = url.TrimEnd('/');
+		if (replaceExisting)
+			_urlToSection[normalized] = section;
+		else
+			_ = _urlToSection.TryAdd(normalized, section);
+	}
+
+	private static bool IsExternalUrl(string url) =>
+		url.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
+		url.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
+
 	private void BuildTocRootToIslandLookup()
 	{
 		foreach (var island in Islands)
diff --git a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
index 9d80f8243e..3dcd458017 100644
--- a/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
+++ b/src/services/Elastic.Documentation.Assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -138,6 +138,8 @@ Cancel ctx
 				return CreateIslandResult(cachedHtml, island, navV2);
 
 			_logger.LogInformation("Rendering V2 island navigation: {IslandLabel} ({IslandId})", island.Label, island.Id);
+			var islandUrlForPrefix = island.NavigationItems.FirstOrDefault(i => !string.IsNullOrEmpty(i.Url))?.Url ?? island.Url;
+			var backArrowUrl = CombineWithSitePrefix(navV2, island.BackUrl, islandUrlForPrefix);
 
 			var wrapper = new SectionNavigationV2Wrapper(
 				new NavigationSection(island.Id, island.Label, "", false, island.NavigationItems),
@@ -157,7 +159,7 @@ Cancel ctx
 				IsNavV2 = true,
 				IsIsolatedSection = true,
 				SectionUrl = null,
-				BackArrowUrl = CombineWithSitePrefix(navV2, island.BackUrl)
+				BackArrowUrl = backArrowUrl
 			};
 
 			var html = await ((INavigationHtmlWriter)this).Render(model, ctx);
@@ -179,13 +181,31 @@ private static NavigationRenderResult CreateIslandResult(string html, Navigation
 			ActiveSectionId = island.ParentSection.Id
 		};
 
-	private static string CombineWithSitePrefix(SiteNavigation nav, string sectionUrl)
+	private static string CombineWithSitePrefix(SiteNavigation nav, string sectionUrl, string? currentUrl = null)
 	{
 		var prefix = nav.Url.TrimEnd('/');
 		var path = sectionUrl.TrimStart('/');
-		return string.IsNullOrEmpty(path) ? $"{prefix}/" : $"{prefix}/{path}";
+		if (string.IsNullOrEmpty(path))
+			return $"{prefix}/";
+		if (IsExternalUrl(sectionUrl))
+			return sectionUrl;
+		if (sectionUrl.Equals(prefix, StringComparison.OrdinalIgnoreCase) || sectionUrl.StartsWith($"{prefix}/", StringComparison.OrdinalIgnoreCase))
+			return sectionUrl;
+		if (!string.IsNullOrEmpty(currentUrl) && sectionUrl.Length > 0 && sectionUrl[0] == '/')
+		{
+			var normalizedCurrentUrl = currentUrl.TrimEnd('/');
+			var normalizedSectionPath = "/" + path.TrimEnd('/');
+			var sectionIndex = normalizedCurrentUrl.IndexOf(normalizedSectionPath, StringComparison.OrdinalIgnoreCase);
+			if (sectionIndex > 0)
+				return normalizedCurrentUrl[..sectionIndex] + "/" + path;
+		}
+		return $"{prefix}/{path}";
 	}
 
+	private static bool IsExternalUrl(string url) =>
+		url.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
+		url.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
+
 	private static NavigationRenderResult CreateSectionResult(string html, NavigationSection activeSection, SiteNavigationV2 navV2) =>
 		new()
 		{

From 5e9360713799a282d2feaa7badf98eee66a107bf Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 21:53:45 +0200
Subject: [PATCH 210/226] Remove duplicate query languages nav group

Keep the query language reference TOC as the single sidebar entry so the narrative pages no longer duplicate the reference structure.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 config/navigation-v2.yml | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index bc521dd2d4..a34de76574 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -2191,28 +2191,6 @@ nav:
               title: ES|QL for search
             - page: docs-content://solutions/search/async-search-api.md
               title: Async search
-            # Language narrative pages — "understand and decide" layer
-            # These sit above the bulk reference toc further down.
-            - group: Query languages
-              page: docs-content://explore-analyze/query-filter/languages.md # [from E&A] comparison table landing
-              children:
-              - page: docs-content://explore-analyze/query-filter/languages/querydsl.md # [from E&A]
-                title: Query DSL
-              - page: docs-content://explore-analyze/query-filter/languages/kql.md # [from E&A]
-                title: KQL
-              - group: EQL
-                page: docs-content://explore-analyze/query-filter/languages/eql.md # [from E&A]
-                children:
-                - page: docs-content://explore-analyze/query-filter/languages/example-detect-threats-with-eql.md
-                  title: Detect threats with EQL
-              # [THIN] sql.md is a hollow intro + link list that duplicates the reference toc below.
-              # Candidate for removal — redirect to elasticsearch://reference/query-languages/sql.md
-              - page: docs-content://explore-analyze/query-filter/languages/sql.md # [from E&A]
-                title: SQL
-              # [THIN] lucene-query-syntax.md is a single paragraph pointing users to the Kibana UI toggle.
-              # Candidate for removal — redirect to elasticsearch://reference/query-languages/query-dsl/query-dsl-query-string-query.md
-              - page: docs-content://explore-analyze/query-filter/languages/lucene-query-syntax.md # [from E&A]
-                title: Lucene query syntax
             # Query language reference — bulk toc, cannot interleave with narrative pages above
             - toc: elasticsearch://reference/query-languages
             # Developer tools — for running and testing queries

From 05583d8e6f3d75486e517c3dd7239eac3c036a73 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 21:53:45 +0200
Subject: [PATCH 211/226] Remove duplicate query languages nav group

Keep the query language reference TOC as the single sidebar entry so the narrative pages no longer duplicate the reference structure.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 config/navigation-v2.yml | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index d038a2de21..89200c8d7a 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -2191,28 +2191,6 @@ nav:
               title: ES|QL for search
             - page: docs-content://solutions/search/async-search-api.md
               title: Async search
-            # Language narrative pages — "understand and decide" layer
-            # These sit above the bulk reference toc further down.
-            - group: Query languages
-              page: docs-content://explore-analyze/query-filter/languages.md # [from E&A] comparison table landing
-              children:
-              - page: docs-content://explore-analyze/query-filter/languages/querydsl.md # [from E&A]
-                title: Query DSL
-              - page: docs-content://explore-analyze/query-filter/languages/kql.md # [from E&A]
-                title: KQL
-              - group: EQL
-                page: docs-content://explore-analyze/query-filter/languages/eql.md # [from E&A]
-                children:
-                - page: docs-content://explore-analyze/query-filter/languages/example-detect-threats-with-eql.md
-                  title: Detect threats with EQL
-              # [THIN] sql.md is a hollow intro + link list that duplicates the reference toc below.
-              # Candidate for removal — redirect to elasticsearch://reference/query-languages/sql.md
-              - page: docs-content://explore-analyze/query-filter/languages/sql.md # [from E&A]
-                title: SQL
-              # [THIN] lucene-query-syntax.md is a single paragraph pointing users to the Kibana UI toggle.
-              # Candidate for removal — redirect to elasticsearch://reference/query-languages/query-dsl/query-dsl-query-string-query.md
-              - page: docs-content://explore-analyze/query-filter/languages/lucene-query-syntax.md # [from E&A]
-                title: Lucene query syntax
             # Query language reference — bulk toc, cannot interleave with narrative pages above
             - toc: elasticsearch://reference/query-languages
             # Developer tools — for running and testing queries

From a62802e674d1eb86b40481ce1f8d9c8cc18b5164 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 22:55:28 +0200
Subject: [PATCH 212/226] Limit root nav auto-expansion

Only auto-open a section root sidebar when it has a single top-level folder, avoiding the fully expanded Reference nav while preserving single-TOC sections.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 71c6fb610d..83726c4648 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -616,13 +616,12 @@ function expandToCurrentPageForPath(nav: HTMLElement, pathnameRaw: string) {
  */
 function expandToCurrentPage(nav: HTMLElement) {
     if (isOnSectionRootPage(nav)) {
-        // On the section root page, expand all top-level folders so the
-        // section content is visible even though no specific page is current.
-        nav.querySelectorAll<HTMLInputElement>(
+        const topLevelFolders = nav.querySelectorAll<HTMLInputElement>(
             '#nav-tree > li > .peer > input[type="checkbox"]'
-        ).forEach((cb) => {
-            cb.checked = true
-        })
+        )
+        if (topLevelFolders.length === 1) {
+            topLevelFolders[0].checked = true
+        }
         return
     }
     expandToCurrentPageForPath(nav, window.location.pathname)

From 2889d6681066c7cdab0a6d7a023acf358bedeaa6 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Mon, 18 May 2026 22:55:28 +0200
Subject: [PATCH 213/226] Limit root nav auto-expansion

Only auto-open a section root sidebar when it has a single top-level folder, avoiding the fully expanded Reference nav while preserving single-TOC sections.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 71c6fb610d..83726c4648 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -616,13 +616,12 @@ function expandToCurrentPageForPath(nav: HTMLElement, pathnameRaw: string) {
  */
 function expandToCurrentPage(nav: HTMLElement) {
     if (isOnSectionRootPage(nav)) {
-        // On the section root page, expand all top-level folders so the
-        // section content is visible even though no specific page is current.
-        nav.querySelectorAll<HTMLInputElement>(
+        const topLevelFolders = nav.querySelectorAll<HTMLInputElement>(
             '#nav-tree > li > .peer > input[type="checkbox"]'
-        ).forEach((cb) => {
-            cb.checked = true
-        })
+        )
+        if (topLevelFolders.length === 1) {
+            topLevelFolders[0].checked = true
+        }
         return
     }
     expandToCurrentPageForPath(nav, window.location.pathname)

From 3e8c488ec9fcdcc154b6d3cd74c277ddc738b2f9 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri-Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 19 May 2026 20:00:20 +0200
Subject: [PATCH 214/226] Keep nav-v2 focused on the active section (#3354)

* Keep nav-v2 focused on the active section

Same-section navigation could leave stale folders expanded, which made the sidebar show multiple open branches. Recomputing expansion from the active page path keeps one relevant branch open and preserves accordion behavior when folders are opened manually.

Co-Authored-By: OpenAI GPT-5.4 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>

* Auto-scroll nav-v2 to the active branch

Opening a lower section could still leave part of the active branch clipped below the sidebar viewport. Re-scrolling after the nav layout settles keeps the selected branch fully visible and locks in the behavior with a focused regression test.

Co-Authored-By: OpenAI GPT-5.4 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>

* Re-scroll nav-v2 after sidebar chrome resizes

The Jump to page web component can alter the sidebar chrome after the active branch scroll is first calculated. Observing the sidebar chrome and scroll container makes the active branch scroll correction respond to those late layout changes.

Co-Authored-By: OpenAI GPT-5.4 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>

* Format nav-v2 scroll observer

Prettier wrapped the ResizeObserver map type so the npm formatting check passes in CI.

Co-Authored-By: OpenAI GPT-5.4 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: OpenAI GPT-5.4 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/pages-nav-v2.test.ts               | 187 ++++++++++++++++
 .../Assets/pages-nav-v2.ts                    | 205 +++++++++++++++---
 2 files changed, 360 insertions(+), 32 deletions(-)
 create mode 100644 src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
new file mode 100644
index 0000000000..9a37c59014
--- /dev/null
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
@@ -0,0 +1,187 @@
+import { initNavV2 } from './pages-nav-v2'
+
+jest.mock('tippy.js', () => ({
+    __esModule: true,
+    default: jest.fn(() => ({
+        destroy: jest.fn(),
+        setContent: jest.fn(),
+    })),
+}))
+
+function renderNav() {
+    document.body.innerHTML = `
+        <div class="pages-nav-menu">
+            <nav class="docs-sidebar-nav-v2" data-nav-v2>
+                <ul class="docs-sidebar-nav-v2__tree" id="nav-tree">
+                    <li class="relative">
+                        <span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--top">Guides</span>
+                        <ul class="docs-sidebar-nav-v2__label-children w-full">
+                            <li class="flex flex-wrap group-navigation relative">
+                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                    <input id="group-a" type="checkbox" checked />
+                                    <a href="/guide/a" class="sidebar-link nav-v2-link">Group A</a>
+                                </div>
+                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                            <li class="flex flex-wrap group-navigation relative">
+                                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                                    <input id="group-a-1" type="checkbox" checked />
+                                                    <a href="/guide/a/topic-1" class="sidebar-link nav-v2-link">Topic 1</a>
+                                                </div>
+                                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                                            <li class="flex group/li">
+                                                                <a href="/guide/a/topic-1/current-page" class="sidebar-link nav-v2-link">Current page</a>
+                                                            </li>
+                                                        </ul>
+                                                    </div>
+                                                </div>
+                                            </li>
+                                            <li class="flex flex-wrap group-navigation relative">
+                                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                                    <input id="group-a-2" type="checkbox" checked />
+                                                    <a href="/guide/a/topic-2" class="sidebar-link nav-v2-link">Topic 2</a>
+                                                </div>
+                                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                                            <li class="flex group/li">
+                                                                <a href="/guide/a/topic-2/other-page" class="sidebar-link nav-v2-link">Other page</a>
+                                                            </li>
+                                                        </ul>
+                                                    </div>
+                                                </div>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="flex flex-wrap group-navigation relative">
+                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                    <input id="group-b" type="checkbox" checked />
+                                    <a href="/guide/b" class="sidebar-link nav-v2-link">Group B</a>
+                                </div>
+                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                            <li class="flex group/li">
+                                                <a href="/guide/b/page" class="sidebar-link nav-v2-link">Group B page</a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </li>
+                </ul>
+            </nav>
+        </div>
+    `
+
+    return document.querySelector<HTMLElement>('[data-nav-v2]')!
+}
+
+function checkbox(id: string): HTMLInputElement {
+    return document.getElementById(id) as HTMLInputElement
+}
+
+function groupRow(id: string): HTMLElement {
+    return checkbox(id).closest('li.group-navigation') as HTMLElement
+}
+
+describe('initNavV2', () => {
+    const originalRequestAnimationFrame = window.requestAnimationFrame
+
+    beforeEach(() => {
+        sessionStorage.clear()
+        window.requestAnimationFrame = ((cb: FrameRequestCallback) => {
+            cb(0)
+            return 0
+        }) as typeof window.requestAnimationFrame
+    })
+
+    afterEach(() => {
+        document.body.innerHTML = ''
+    })
+
+    afterAll(() => {
+        window.requestAnimationFrame = originalRequestAnimationFrame
+    })
+
+    it('keeps only the active page branch expanded', () => {
+        window.history.pushState({}, '', '/guide/a/topic-1/current-page')
+
+        const nav = renderNav()
+
+        initNavV2(nav)
+
+        expect(checkbox('group-a').checked).toBe(true)
+        expect(checkbox('group-a-1').checked).toBe(true)
+        expect(checkbox('group-a-2').checked).toBe(false)
+        expect(checkbox('group-b').checked).toBe(false)
+    })
+
+    it('collapses sibling folders when a new folder is opened manually', () => {
+        window.history.pushState({}, '', '/guide/a/topic-1/current-page')
+
+        const nav = renderNav()
+
+        initNavV2(nav)
+
+        const groupA = checkbox('group-a')
+        const groupB = checkbox('group-b')
+        groupB.checked = true
+        groupB.dispatchEvent(new Event('change', { bubbles: true }))
+
+        expect(groupB.checked).toBe(true)
+        expect(groupA.checked).toBe(false)
+    })
+
+    it('scrolls the active branch into view when it opens below the viewport', () => {
+        window.history.pushState({}, '', '/guide/b/page')
+
+        const nav = renderNav()
+        const container = document.querySelector(
+            '.pages-nav-menu'
+        ) as HTMLElement
+        const groupB = groupRow('group-b')
+
+        Object.defineProperty(container, 'scrollTop', {
+            value: 0,
+            writable: true,
+            configurable: true,
+        })
+        Object.defineProperty(container, 'clientHeight', {
+            value: 120,
+            configurable: true,
+        })
+        container.getBoundingClientRect = jest.fn(() => ({
+            x: 0,
+            y: 0,
+            top: 0,
+            right: 280,
+            bottom: 120,
+            left: 0,
+            width: 280,
+            height: 120,
+            toJSON: () => ({}),
+        }))
+        groupB.getBoundingClientRect = jest.fn(() => ({
+            x: 0,
+            y: 150,
+            top: 150,
+            right: 280,
+            bottom: 250,
+            left: 0,
+            width: 280,
+            height: 100,
+            toJSON: () => ({}),
+        }))
+
+        initNavV2(nav)
+
+        expect(container.scrollTop).toBe(142)
+    })
+})
diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 83726c4648..daa86d6f32 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -8,6 +8,11 @@ let navV2FolderLinkToggleBound = false
 let navV2OptimisticNavigateBound = false
 
 let navV2TruncationTippyInstances: Instance[] = []
+const navV2ActiveBranchScrollTimeouts = new WeakMap<HTMLElement, number[]>()
+const navV2ActiveBranchScrollObservers = new WeakMap<
+    HTMLElement,
+    ResizeObserver
+>()
 
 function readCollapsedFolderIds(): Set<string> {
     try {
@@ -227,43 +232,42 @@ function ensureNavV2OptimisticCurrentOnNavigate() {
             markCurrentPageForPath(nav, path)
             expandToCurrentPageForPath(nav, path)
             applyActiveSubtreeHighlight(nav)
+            scheduleActiveBranchScroll(nav)
         },
         true
     )
 }
 
 /**
- * Returns all sibling top-level accordion checkboxes for a given checkbox.
- * Siblings are other checkboxes inside [data-v2-accordion] elements at the
- * same nesting level as the given checkbox's ancestor accordion.
+ * Returns all sibling folder checkboxes at the same nesting level.
  */
 function getSiblingAccordionCheckboxes(
     checkbox: HTMLInputElement
 ): HTMLInputElement[] {
-    const accordion = checkbox.closest('[data-v2-accordion]')
-    if (!accordion) {
+    const group = checkbox.closest('li.group-navigation')
+    if (!group) {
         return []
     }
 
-    const parent = accordion.parentElement
+    const parent = group.parentElement
     if (!parent) {
         return []
     }
 
     return Array.from(
         parent.querySelectorAll<HTMLInputElement>(
-            '[data-v2-accordion] > .peer input[type=checkbox]'
+            ':scope > li.group-navigation > .nav-folder-peer input[type=checkbox]'
         )
     ).filter((c) => c !== checkbox)
 }
 
 /**
- * Accordion behaviour: when a top-level section is opened,
- * collapse all its siblings so only one section is expanded at a time.
+ * Accordion behaviour: when a folder is opened, collapse its siblings so
+ * only one branch stays expanded at that nesting level.
  */
 function initAccordion(nav: HTMLElement) {
     nav.querySelectorAll<HTMLInputElement>(
-        '[data-v2-accordion] > .peer input[type=checkbox]'
+        'li.group-navigation > .nav-folder-peer input[type=checkbox]'
     ).forEach((cb) => {
         if (cb.dataset.navV2AccordionBound === 'true') {
             return
@@ -281,6 +285,142 @@ function initAccordion(nav: HTMLElement) {
     })
 }
 
+function getAllFolderCheckboxes(nav: HTMLElement): HTMLInputElement[] {
+    return Array.from(
+        nav.querySelectorAll<HTMLInputElement>(
+            'li.group-navigation > .nav-folder-peer input[type=checkbox]'
+        )
+    )
+}
+
+function collapseInactiveFolders(
+    nav: HTMLElement,
+    activeCheckboxes: Set<HTMLInputElement>
+) {
+    getAllFolderCheckboxes(nav).forEach((cb) => {
+        if (!activeCheckboxes.has(cb)) {
+            cb.checked = false
+        }
+    })
+}
+
+function findNavV2ScrollContainer(nav: HTMLElement): HTMLElement | null {
+    return nav.closest<HTMLElement>('.pages-nav-menu')
+}
+
+function pickActiveBranchScrollTarget(
+    nav: HTMLElement,
+    current: HTMLAnchorElement
+): HTMLElement | null {
+    let target = current.closest<HTMLElement>('li')
+    let walk = target
+    while (walk && walk !== nav) {
+        if (walk.matches('li.group-navigation')) {
+            target = walk
+        }
+
+        walk = walk.parentElement?.closest<HTMLElement>('li') ?? null
+    }
+
+    return target
+}
+
+function scrollActiveBranchIntoView(nav: HTMLElement) {
+    const container = findNavV2ScrollContainer(nav)
+    if (!container) {
+        return
+    }
+
+    const current = deepestCurrentSidebarLink(nav)
+    if (!current) {
+        return
+    }
+
+    const target = pickActiveBranchScrollTarget(nav, current)
+    if (!target) {
+        return
+    }
+
+    const containerRect = container.getBoundingClientRect()
+    const targetRect = target.getBoundingClientRect()
+    const topPadding = 8
+    const bottomPadding = 16
+    const visibleTop = containerRect.top + topPadding
+    const visibleBottom = containerRect.bottom - bottomPadding
+
+    if (targetRect.top >= visibleTop && targetRect.bottom <= visibleBottom) {
+        return
+    }
+
+    const targetTop =
+        targetRect.top - containerRect.top + container.scrollTop - topPadding
+    container.scrollTop = Math.max(0, targetTop)
+}
+
+function scheduleActiveBranchScroll(nav: HTMLElement) {
+    const existingTimeouts = navV2ActiveBranchScrollTimeouts.get(nav)
+    if (existingTimeouts !== undefined) {
+        existingTimeouts.forEach((timeoutId) => window.clearTimeout(timeoutId))
+    }
+
+    const run = () => {
+        if (!nav.isConnected) {
+            return
+        }
+
+        scrollActiveBranchIntoView(nav)
+    }
+
+    requestAnimationFrame(() => {
+        requestAnimationFrame(() => {
+            run()
+        })
+    })
+
+    const timeoutIds = [260, 520].map((delay, index) =>
+        window.setTimeout(() => {
+            run()
+            if (index === 1) {
+                navV2ActiveBranchScrollTimeouts.delete(nav)
+            }
+        }, delay)
+    )
+    navV2ActiveBranchScrollTimeouts.set(nav, timeoutIds)
+}
+
+function initActiveBranchScrollObserver(nav: HTMLElement) {
+    if (
+        typeof ResizeObserver === 'undefined' ||
+        navV2ActiveBranchScrollObservers.has(nav)
+    ) {
+        return
+    }
+
+    const observer = new ResizeObserver(() => {
+        if (!nav.isConnected) {
+            observer.disconnect()
+            navV2ActiveBranchScrollObservers.delete(nav)
+            return
+        }
+
+        scheduleActiveBranchScroll(nav)
+    })
+    navV2ActiveBranchScrollObservers.set(nav, observer)
+
+    const container = findNavV2ScrollContainer(nav)
+    const stickyChrome =
+        container?.previousElementSibling instanceof HTMLElement
+            ? container.previousElementSibling
+            : null
+
+    if (container) {
+        observer.observe(container)
+    }
+    if (stickyChrome) {
+        observer.observe(stickyChrome)
+    }
+}
+
 function warmFolderSubtreeLayoutFromPeer(peer: HTMLElement) {
     const li = peer.parentElement
     if (!li?.matches('li.group-navigation')) {
@@ -568,60 +708,59 @@ function pickDeepestAnchorMatchingPath(
 function expandToCurrentPageForPath(nav: HTMLElement, pathnameRaw: string) {
     const link = pickDeepestAnchorMatchingPath(nav, pathnameRaw)
     if (!link) {
+        collapseInactiveFolders(nav, new Set())
         return
     }
 
     const collapsedIds = readCollapsedFolderIds()
+    const activeCheckboxes = new Set<HTMLInputElement>()
+    let wroteCollapsedIds = false
 
     let el: Element | null = link.parentElement
     while (el && el !== nav) {
         if (el.matches('li')) {
             const cb = el.querySelector<HTMLInputElement>(
-                ':scope > .peer input[type=checkbox]'
+                ':scope > .nav-folder-peer input[type=checkbox]'
             )
             if (cb && cb.id) {
-                const rowLink = el.querySelector<HTMLElement>(
-                    ':scope > .nav-folder-peer > a.sidebar-link'
-                )
-                const currentIsThisFolderRow =
-                    rowLink !== null && rowLink === link
-
+                activeCheckboxes.add(cb)
                 if (collapsedIds.has(cb.id)) {
-                    if (currentIsThisFolderRow) {
-                        // User collapsed this folder while its index is current; HTML swap often
-                        // re-checks the input — force closed so a second click can stay collapsed.
-                        cb.checked = false
-                    } else {
-                        collapsedIds.delete(cb.id)
-                        writeCollapsedFolderIds(collapsedIds)
-                        cb.checked = true
-                    }
-                } else {
-                    cb.checked = true
+                    collapsedIds.delete(cb.id)
+                    wroteCollapsedIds = true
                 }
+                cb.checked = true
             } else if (cb) {
+                activeCheckboxes.add(cb)
                 cb.checked = true
             }
         }
 
         el = el.parentElement
     }
+
+    if (wroteCollapsedIds) {
+        writeCollapsedFolderIds(collapsedIds)
+    }
+
+    collapseInactiveFolders(nav, activeCheckboxes)
 }
 
 /**
  * Expand all ancestor collapsible sections that contain the current page link,
- * so that navigating directly to a URL reveals its location in the sidebar.
- * Does not re-open a folder row that the user collapsed while that folder index
- * is the current page (see session storage + folder row link match).
+ * so that navigating directly to a URL reveals its location in the sidebar,
+ * while collapsing folders that are outside the active branch.
  */
 function expandToCurrentPage(nav: HTMLElement) {
     if (isOnSectionRootPage(nav)) {
+        const activeCheckboxes = new Set<HTMLInputElement>()
         const topLevelFolders = nav.querySelectorAll<HTMLInputElement>(
-            '#nav-tree > li > .peer > input[type="checkbox"]'
+            '#nav-tree > li.group-navigation > .nav-folder-peer > input[type="checkbox"]'
         )
         if (topLevelFolders.length === 1) {
             topLevelFolders[0].checked = true
+            activeCheckboxes.add(topLevelFolders[0])
         }
+        collapseInactiveFolders(nav, activeCheckboxes)
         return
     }
     expandToCurrentPageForPath(nav, window.location.pathname)
@@ -704,6 +843,8 @@ export function initNavV2(nav: HTMLElement) {
     markCurrentPage(nav)
     expandToCurrentPage(nav)
     applyActiveSubtreeHighlight(nav)
+    initActiveBranchScrollObserver(nav)
+    scheduleActiveBranchScroll(nav)
     initNavV2FolderLayoutWarmup(nav)
     requestAnimationFrame(() => {
         requestAnimationFrame(() => initNavV2TruncationTooltips(nav))

From b52c145fd37e01a8695b3d23a284e6d32b2830c6 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 19 May 2026 16:19:28 +0200
Subject: [PATCH 215/226] Keep nav-v2 focused on the active section

Same-section navigation could leave stale folders expanded, which made the sidebar show multiple open branches. Recomputing expansion from the active page path keeps one relevant branch open and preserves accordion behavior when folders are opened manually.

Co-Authored-By: OpenAI GPT-5.4 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/pages-nav-v2.test.ts               | 135 ++++++++++++++++++
 .../Assets/pages-nav-v2.ts                    |  80 ++++++-----
 2 files changed, 183 insertions(+), 32 deletions(-)
 create mode 100644 src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
new file mode 100644
index 0000000000..e1f07d4bb7
--- /dev/null
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
@@ -0,0 +1,135 @@
+import { initNavV2 } from './pages-nav-v2'
+
+jest.mock('tippy.js', () => ({
+    __esModule: true,
+    default: jest.fn(() => ({
+        destroy: jest.fn(),
+        setContent: jest.fn(),
+    })),
+}))
+
+function renderNav() {
+    document.body.innerHTML = `
+        <nav class="docs-sidebar-nav-v2" data-nav-v2>
+            <ul class="docs-sidebar-nav-v2__tree" id="nav-tree">
+                <li class="relative">
+                    <span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--top">Guides</span>
+                    <ul class="docs-sidebar-nav-v2__label-children w-full">
+                        <li class="flex flex-wrap group-navigation relative">
+                            <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                <input id="group-a" type="checkbox" checked />
+                                <a href="/guide/a" class="sidebar-link nav-v2-link">Group A</a>
+                            </div>
+                            <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                    <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                        <li class="flex flex-wrap group-navigation relative">
+                                            <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                                <input id="group-a-1" type="checkbox" checked />
+                                                <a href="/guide/a/topic-1" class="sidebar-link nav-v2-link">Topic 1</a>
+                                            </div>
+                                            <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                                <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                                    <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                                        <li class="flex group/li">
+                                                            <a href="/guide/a/topic-1/current-page" class="sidebar-link nav-v2-link">Current page</a>
+                                                        </li>
+                                                    </ul>
+                                                </div>
+                                            </div>
+                                        </li>
+                                        <li class="flex flex-wrap group-navigation relative">
+                                            <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                                <input id="group-a-2" type="checkbox" checked />
+                                                <a href="/guide/a/topic-2" class="sidebar-link nav-v2-link">Topic 2</a>
+                                            </div>
+                                            <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                                <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                                    <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                                        <li class="flex group/li">
+                                                            <a href="/guide/a/topic-2/other-page" class="sidebar-link nav-v2-link">Other page</a>
+                                                        </li>
+                                                    </ul>
+                                                </div>
+                                            </div>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </li>
+                        <li class="flex flex-wrap group-navigation relative">
+                            <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                <input id="group-b" type="checkbox" checked />
+                                <a href="/guide/b" class="sidebar-link nav-v2-link">Group B</a>
+                            </div>
+                            <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                    <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                        <li class="flex group/li">
+                                            <a href="/guide/b/page" class="sidebar-link nav-v2-link">Group B page</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </li>
+                    </ul>
+                </li>
+            </ul>
+        </nav>
+    `
+
+    return document.querySelector<HTMLElement>('[data-nav-v2]')!
+}
+
+function checkbox(id: string): HTMLInputElement {
+    return document.getElementById(id) as HTMLInputElement
+}
+
+describe('initNavV2', () => {
+    const originalRequestAnimationFrame = window.requestAnimationFrame
+
+    beforeEach(() => {
+        sessionStorage.clear()
+        window.requestAnimationFrame = ((cb: FrameRequestCallback) => {
+            cb(0)
+            return 0
+        }) as typeof window.requestAnimationFrame
+    })
+
+    afterEach(() => {
+        document.body.innerHTML = ''
+    })
+
+    afterAll(() => {
+        window.requestAnimationFrame = originalRequestAnimationFrame
+    })
+
+    it('keeps only the active page branch expanded', () => {
+        window.history.pushState({}, '', '/guide/a/topic-1/current-page')
+
+        const nav = renderNav()
+
+        initNavV2(nav)
+
+        expect(checkbox('group-a').checked).toBe(true)
+        expect(checkbox('group-a-1').checked).toBe(true)
+        expect(checkbox('group-a-2').checked).toBe(false)
+        expect(checkbox('group-b').checked).toBe(false)
+    })
+
+    it('collapses sibling folders when a new folder is opened manually', () => {
+        window.history.pushState({}, '', '/guide/a/topic-1/current-page')
+
+        const nav = renderNav()
+
+        initNavV2(nav)
+
+        const groupA = checkbox('group-a')
+        const groupB = checkbox('group-b')
+        groupB.checked = true
+        groupB.dispatchEvent(new Event('change', { bubbles: true }))
+
+        expect(groupB.checked).toBe(true)
+        expect(groupA.checked).toBe(false)
+    })
+})
diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 83726c4648..221b4c9cc3 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -233,37 +233,35 @@ function ensureNavV2OptimisticCurrentOnNavigate() {
 }
 
 /**
- * Returns all sibling top-level accordion checkboxes for a given checkbox.
- * Siblings are other checkboxes inside [data-v2-accordion] elements at the
- * same nesting level as the given checkbox's ancestor accordion.
+ * Returns all sibling folder checkboxes at the same nesting level.
  */
 function getSiblingAccordionCheckboxes(
     checkbox: HTMLInputElement
 ): HTMLInputElement[] {
-    const accordion = checkbox.closest('[data-v2-accordion]')
-    if (!accordion) {
+    const group = checkbox.closest('li.group-navigation')
+    if (!group) {
         return []
     }
 
-    const parent = accordion.parentElement
+    const parent = group.parentElement
     if (!parent) {
         return []
     }
 
     return Array.from(
         parent.querySelectorAll<HTMLInputElement>(
-            '[data-v2-accordion] > .peer input[type=checkbox]'
+            ':scope > li.group-navigation > .nav-folder-peer input[type=checkbox]'
         )
     ).filter((c) => c !== checkbox)
 }
 
 /**
- * Accordion behaviour: when a top-level section is opened,
- * collapse all its siblings so only one section is expanded at a time.
+ * Accordion behaviour: when a folder is opened, collapse its siblings so
+ * only one branch stays expanded at that nesting level.
  */
 function initAccordion(nav: HTMLElement) {
     nav.querySelectorAll<HTMLInputElement>(
-        '[data-v2-accordion] > .peer input[type=checkbox]'
+        'li.group-navigation > .nav-folder-peer input[type=checkbox]'
     ).forEach((cb) => {
         if (cb.dataset.navV2AccordionBound === 'true') {
             return
@@ -281,6 +279,25 @@ function initAccordion(nav: HTMLElement) {
     })
 }
 
+function getAllFolderCheckboxes(nav: HTMLElement): HTMLInputElement[] {
+    return Array.from(
+        nav.querySelectorAll<HTMLInputElement>(
+            'li.group-navigation > .nav-folder-peer input[type=checkbox]'
+        )
+    )
+}
+
+function collapseInactiveFolders(
+    nav: HTMLElement,
+    activeCheckboxes: Set<HTMLInputElement>
+) {
+    getAllFolderCheckboxes(nav).forEach((cb) => {
+        if (!activeCheckboxes.has(cb)) {
+            cb.checked = false
+        }
+    })
+}
+
 function warmFolderSubtreeLayoutFromPeer(peer: HTMLElement) {
     const li = peer.parentElement
     if (!li?.matches('li.group-navigation')) {
@@ -568,60 +585,59 @@ function pickDeepestAnchorMatchingPath(
 function expandToCurrentPageForPath(nav: HTMLElement, pathnameRaw: string) {
     const link = pickDeepestAnchorMatchingPath(nav, pathnameRaw)
     if (!link) {
+        collapseInactiveFolders(nav, new Set())
         return
     }
 
     const collapsedIds = readCollapsedFolderIds()
+    const activeCheckboxes = new Set<HTMLInputElement>()
+    let wroteCollapsedIds = false
 
     let el: Element | null = link.parentElement
     while (el && el !== nav) {
         if (el.matches('li')) {
             const cb = el.querySelector<HTMLInputElement>(
-                ':scope > .peer input[type=checkbox]'
+                ':scope > .nav-folder-peer input[type=checkbox]'
             )
             if (cb && cb.id) {
-                const rowLink = el.querySelector<HTMLElement>(
-                    ':scope > .nav-folder-peer > a.sidebar-link'
-                )
-                const currentIsThisFolderRow =
-                    rowLink !== null && rowLink === link
-
+                activeCheckboxes.add(cb)
                 if (collapsedIds.has(cb.id)) {
-                    if (currentIsThisFolderRow) {
-                        // User collapsed this folder while its index is current; HTML swap often
-                        // re-checks the input — force closed so a second click can stay collapsed.
-                        cb.checked = false
-                    } else {
-                        collapsedIds.delete(cb.id)
-                        writeCollapsedFolderIds(collapsedIds)
-                        cb.checked = true
-                    }
-                } else {
-                    cb.checked = true
+                    collapsedIds.delete(cb.id)
+                    wroteCollapsedIds = true
                 }
+                cb.checked = true
             } else if (cb) {
+                activeCheckboxes.add(cb)
                 cb.checked = true
             }
         }
 
         el = el.parentElement
     }
+
+    if (wroteCollapsedIds) {
+        writeCollapsedFolderIds(collapsedIds)
+    }
+
+    collapseInactiveFolders(nav, activeCheckboxes)
 }
 
 /**
  * Expand all ancestor collapsible sections that contain the current page link,
- * so that navigating directly to a URL reveals its location in the sidebar.
- * Does not re-open a folder row that the user collapsed while that folder index
- * is the current page (see session storage + folder row link match).
+ * so that navigating directly to a URL reveals its location in the sidebar,
+ * while collapsing folders that are outside the active branch.
  */
 function expandToCurrentPage(nav: HTMLElement) {
     if (isOnSectionRootPage(nav)) {
+        const activeCheckboxes = new Set<HTMLInputElement>()
         const topLevelFolders = nav.querySelectorAll<HTMLInputElement>(
-            '#nav-tree > li > .peer > input[type="checkbox"]'
+            '#nav-tree > li.group-navigation > .nav-folder-peer > input[type="checkbox"]'
         )
         if (topLevelFolders.length === 1) {
             topLevelFolders[0].checked = true
+            activeCheckboxes.add(topLevelFolders[0])
         }
+        collapseInactiveFolders(nav, activeCheckboxes)
         return
     }
     expandToCurrentPageForPath(nav, window.location.pathname)

From 646ed798d1c02456192032eb4ccfaa9e08e1a7f8 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 19 May 2026 19:03:19 +0200
Subject: [PATCH 216/226] Auto-scroll nav-v2 to the active branch

Opening a lower section could still leave part of the active branch clipped below the sidebar viewport. Re-scrolling after the nav layout settles keeps the selected branch fully visible and locks in the behavior with a focused regression test.

Co-Authored-By: OpenAI GPT-5.4 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/pages-nav-v2.test.ts               | 176 ++++++++++++------
 .../Assets/pages-nav-v2.ts                    |  87 +++++++++
 2 files changed, 201 insertions(+), 62 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
index e1f07d4bb7..9a37c59014 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
@@ -10,72 +10,74 @@ jest.mock('tippy.js', () => ({
 
 function renderNav() {
     document.body.innerHTML = `
-        <nav class="docs-sidebar-nav-v2" data-nav-v2>
-            <ul class="docs-sidebar-nav-v2__tree" id="nav-tree">
-                <li class="relative">
-                    <span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--top">Guides</span>
-                    <ul class="docs-sidebar-nav-v2__label-children w-full">
-                        <li class="flex flex-wrap group-navigation relative">
-                            <div class="peer nav-folder-peer grid w-full grid-cols-1">
-                                <input id="group-a" type="checkbox" checked />
-                                <a href="/guide/a" class="sidebar-link nav-v2-link">Group A</a>
-                            </div>
-                            <div class="docs-sidebar-nav-v2__folder-clip w-full">
-                                <div class="docs-sidebar-nav-v2__folder-clip-inner">
-                                    <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
-                                        <li class="flex flex-wrap group-navigation relative">
-                                            <div class="peer nav-folder-peer grid w-full grid-cols-1">
-                                                <input id="group-a-1" type="checkbox" checked />
-                                                <a href="/guide/a/topic-1" class="sidebar-link nav-v2-link">Topic 1</a>
-                                            </div>
-                                            <div class="docs-sidebar-nav-v2__folder-clip w-full">
-                                                <div class="docs-sidebar-nav-v2__folder-clip-inner">
-                                                    <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
-                                                        <li class="flex group/li">
-                                                            <a href="/guide/a/topic-1/current-page" class="sidebar-link nav-v2-link">Current page</a>
-                                                        </li>
-                                                    </ul>
+        <div class="pages-nav-menu">
+            <nav class="docs-sidebar-nav-v2" data-nav-v2>
+                <ul class="docs-sidebar-nav-v2__tree" id="nav-tree">
+                    <li class="relative">
+                        <span class="docs-sidebar-nav-v2__label docs-sidebar-nav-v2__label--top">Guides</span>
+                        <ul class="docs-sidebar-nav-v2__label-children w-full">
+                            <li class="flex flex-wrap group-navigation relative">
+                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                    <input id="group-a" type="checkbox" checked />
+                                    <a href="/guide/a" class="sidebar-link nav-v2-link">Group A</a>
+                                </div>
+                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                            <li class="flex flex-wrap group-navigation relative">
+                                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                                    <input id="group-a-1" type="checkbox" checked />
+                                                    <a href="/guide/a/topic-1" class="sidebar-link nav-v2-link">Topic 1</a>
+                                                </div>
+                                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                                            <li class="flex group/li">
+                                                                <a href="/guide/a/topic-1/current-page" class="sidebar-link nav-v2-link">Current page</a>
+                                                            </li>
+                                                        </ul>
+                                                    </div>
                                                 </div>
-                                            </div>
-                                        </li>
-                                        <li class="flex flex-wrap group-navigation relative">
-                                            <div class="peer nav-folder-peer grid w-full grid-cols-1">
-                                                <input id="group-a-2" type="checkbox" checked />
-                                                <a href="/guide/a/topic-2" class="sidebar-link nav-v2-link">Topic 2</a>
-                                            </div>
-                                            <div class="docs-sidebar-nav-v2__folder-clip w-full">
-                                                <div class="docs-sidebar-nav-v2__folder-clip-inner">
-                                                    <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
-                                                        <li class="flex group/li">
-                                                            <a href="/guide/a/topic-2/other-page" class="sidebar-link nav-v2-link">Other page</a>
-                                                        </li>
-                                                    </ul>
+                                            </li>
+                                            <li class="flex flex-wrap group-navigation relative">
+                                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                                    <input id="group-a-2" type="checkbox" checked />
+                                                    <a href="/guide/a/topic-2" class="sidebar-link nav-v2-link">Topic 2</a>
                                                 </div>
-                                            </div>
-                                        </li>
-                                    </ul>
+                                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                                            <li class="flex group/li">
+                                                                <a href="/guide/a/topic-2/other-page" class="sidebar-link nav-v2-link">Other page</a>
+                                                            </li>
+                                                        </ul>
+                                                    </div>
+                                                </div>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="flex flex-wrap group-navigation relative">
+                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                    <input id="group-b" type="checkbox" checked />
+                                    <a href="/guide/b" class="sidebar-link nav-v2-link">Group B</a>
                                 </div>
-                            </div>
-                        </li>
-                        <li class="flex flex-wrap group-navigation relative">
-                            <div class="peer nav-folder-peer grid w-full grid-cols-1">
-                                <input id="group-b" type="checkbox" checked />
-                                <a href="/guide/b" class="sidebar-link nav-v2-link">Group B</a>
-                            </div>
-                            <div class="docs-sidebar-nav-v2__folder-clip w-full">
-                                <div class="docs-sidebar-nav-v2__folder-clip-inner">
-                                    <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
-                                        <li class="flex group/li">
-                                            <a href="/guide/b/page" class="sidebar-link nav-v2-link">Group B page</a>
-                                        </li>
-                                    </ul>
+                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                            <li class="flex group/li">
+                                                <a href="/guide/b/page" class="sidebar-link nav-v2-link">Group B page</a>
+                                            </li>
+                                        </ul>
+                                    </div>
                                 </div>
-                            </div>
-                        </li>
-                    </ul>
-                </li>
-            </ul>
-        </nav>
+                            </li>
+                        </ul>
+                    </li>
+                </ul>
+            </nav>
+        </div>
     `
 
     return document.querySelector<HTMLElement>('[data-nav-v2]')!
@@ -85,6 +87,10 @@ function checkbox(id: string): HTMLInputElement {
     return document.getElementById(id) as HTMLInputElement
 }
 
+function groupRow(id: string): HTMLElement {
+    return checkbox(id).closest('li.group-navigation') as HTMLElement
+}
+
 describe('initNavV2', () => {
     const originalRequestAnimationFrame = window.requestAnimationFrame
 
@@ -132,4 +138,50 @@ describe('initNavV2', () => {
         expect(groupB.checked).toBe(true)
         expect(groupA.checked).toBe(false)
     })
+
+    it('scrolls the active branch into view when it opens below the viewport', () => {
+        window.history.pushState({}, '', '/guide/b/page')
+
+        const nav = renderNav()
+        const container = document.querySelector(
+            '.pages-nav-menu'
+        ) as HTMLElement
+        const groupB = groupRow('group-b')
+
+        Object.defineProperty(container, 'scrollTop', {
+            value: 0,
+            writable: true,
+            configurable: true,
+        })
+        Object.defineProperty(container, 'clientHeight', {
+            value: 120,
+            configurable: true,
+        })
+        container.getBoundingClientRect = jest.fn(() => ({
+            x: 0,
+            y: 0,
+            top: 0,
+            right: 280,
+            bottom: 120,
+            left: 0,
+            width: 280,
+            height: 120,
+            toJSON: () => ({}),
+        }))
+        groupB.getBoundingClientRect = jest.fn(() => ({
+            x: 0,
+            y: 150,
+            top: 150,
+            right: 280,
+            bottom: 250,
+            left: 0,
+            width: 280,
+            height: 100,
+            toJSON: () => ({}),
+        }))
+
+        initNavV2(nav)
+
+        expect(container.scrollTop).toBe(142)
+    })
 })
diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 221b4c9cc3..5f246e578c 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -8,6 +8,7 @@ let navV2FolderLinkToggleBound = false
 let navV2OptimisticNavigateBound = false
 
 let navV2TruncationTippyInstances: Instance[] = []
+const navV2ActiveBranchScrollTimeouts = new WeakMap<HTMLElement, number[]>()
 
 function readCollapsedFolderIds(): Set<string> {
     try {
@@ -227,6 +228,7 @@ function ensureNavV2OptimisticCurrentOnNavigate() {
             markCurrentPageForPath(nav, path)
             expandToCurrentPageForPath(nav, path)
             applyActiveSubtreeHighlight(nav)
+            scheduleActiveBranchScroll(nav)
         },
         true
     )
@@ -298,6 +300,90 @@ function collapseInactiveFolders(
     })
 }
 
+function findNavV2ScrollContainer(nav: HTMLElement): HTMLElement | null {
+    return nav.closest<HTMLElement>('.pages-nav-menu')
+}
+
+function pickActiveBranchScrollTarget(
+    nav: HTMLElement,
+    current: HTMLAnchorElement
+): HTMLElement | null {
+    let target = current.closest<HTMLElement>('li')
+    let walk = target
+    while (walk && walk !== nav) {
+        if (walk.matches('li.group-navigation')) {
+            target = walk
+        }
+
+        walk = walk.parentElement?.closest<HTMLElement>('li') ?? null
+    }
+
+    return target
+}
+
+function scrollActiveBranchIntoView(nav: HTMLElement) {
+    const container = findNavV2ScrollContainer(nav)
+    if (!container) {
+        return
+    }
+
+    const current = deepestCurrentSidebarLink(nav)
+    if (!current) {
+        return
+    }
+
+    const target = pickActiveBranchScrollTarget(nav, current)
+    if (!target) {
+        return
+    }
+
+    const containerRect = container.getBoundingClientRect()
+    const targetRect = target.getBoundingClientRect()
+    const topPadding = 8
+    const bottomPadding = 16
+    const visibleTop = containerRect.top + topPadding
+    const visibleBottom = containerRect.bottom - bottomPadding
+
+    if (targetRect.top >= visibleTop && targetRect.bottom <= visibleBottom) {
+        return
+    }
+
+    const targetTop =
+        targetRect.top - containerRect.top + container.scrollTop - topPadding
+    container.scrollTop = Math.max(0, targetTop)
+}
+
+function scheduleActiveBranchScroll(nav: HTMLElement) {
+    const existingTimeouts = navV2ActiveBranchScrollTimeouts.get(nav)
+    if (existingTimeouts !== undefined) {
+        existingTimeouts.forEach((timeoutId) => window.clearTimeout(timeoutId))
+    }
+
+    const run = () => {
+        if (!nav.isConnected) {
+            return
+        }
+
+        scrollActiveBranchIntoView(nav)
+    }
+
+    requestAnimationFrame(() => {
+        requestAnimationFrame(() => {
+            run()
+        })
+    })
+
+    const timeoutIds = [260, 520].map((delay, index) =>
+        window.setTimeout(() => {
+            run()
+            if (index === 1) {
+                navV2ActiveBranchScrollTimeouts.delete(nav)
+            }
+        }, delay)
+    )
+    navV2ActiveBranchScrollTimeouts.set(nav, timeoutIds)
+}
+
 function warmFolderSubtreeLayoutFromPeer(peer: HTMLElement) {
     const li = peer.parentElement
     if (!li?.matches('li.group-navigation')) {
@@ -720,6 +806,7 @@ export function initNavV2(nav: HTMLElement) {
     markCurrentPage(nav)
     expandToCurrentPage(nav)
     applyActiveSubtreeHighlight(nav)
+    scheduleActiveBranchScroll(nav)
     initNavV2FolderLayoutWarmup(nav)
     requestAnimationFrame(() => {
         requestAnimationFrame(() => initNavV2TruncationTooltips(nav))

From 829ec0d49cd025ea9fd46cb53fd09cffe6901159 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 19 May 2026 19:06:31 +0200
Subject: [PATCH 217/226] Re-scroll nav-v2 after sidebar chrome resizes

The Jump to page web component can alter the sidebar chrome after the active branch scroll is first calculated. Observing the sidebar chrome and scroll container makes the active branch scroll correction respond to those late layout changes.

Co-Authored-By: OpenAI GPT-5.4 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/pages-nav-v2.ts                    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 5f246e578c..845146c7e1 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -9,6 +9,7 @@ let navV2OptimisticNavigateBound = false
 
 let navV2TruncationTippyInstances: Instance[] = []
 const navV2ActiveBranchScrollTimeouts = new WeakMap<HTMLElement, number[]>()
+const navV2ActiveBranchScrollObservers = new WeakMap<HTMLElement, ResizeObserver>()
 
 function readCollapsedFolderIds(): Set<string> {
     try {
@@ -384,6 +385,39 @@ function scheduleActiveBranchScroll(nav: HTMLElement) {
     navV2ActiveBranchScrollTimeouts.set(nav, timeoutIds)
 }
 
+function initActiveBranchScrollObserver(nav: HTMLElement) {
+    if (
+        typeof ResizeObserver === 'undefined' ||
+        navV2ActiveBranchScrollObservers.has(nav)
+    ) {
+        return
+    }
+
+    const observer = new ResizeObserver(() => {
+        if (!nav.isConnected) {
+            observer.disconnect()
+            navV2ActiveBranchScrollObservers.delete(nav)
+            return
+        }
+
+        scheduleActiveBranchScroll(nav)
+    })
+    navV2ActiveBranchScrollObservers.set(nav, observer)
+
+    const container = findNavV2ScrollContainer(nav)
+    const stickyChrome =
+        container?.previousElementSibling instanceof HTMLElement
+            ? container.previousElementSibling
+            : null
+
+    if (container) {
+        observer.observe(container)
+    }
+    if (stickyChrome) {
+        observer.observe(stickyChrome)
+    }
+}
+
 function warmFolderSubtreeLayoutFromPeer(peer: HTMLElement) {
     const li = peer.parentElement
     if (!li?.matches('li.group-navigation')) {
@@ -806,6 +840,7 @@ export function initNavV2(nav: HTMLElement) {
     markCurrentPage(nav)
     expandToCurrentPage(nav)
     applyActiveSubtreeHighlight(nav)
+    initActiveBranchScrollObserver(nav)
     scheduleActiveBranchScroll(nav)
     initNavV2FolderLayoutWarmup(nav)
     requestAnimationFrame(() => {

From b3834e1d96c53a08c7d6ab8155b2691931692eee Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 19 May 2026 19:15:11 +0200
Subject: [PATCH 218/226] Format nav-v2 scroll observer

Prettier wrapped the ResizeObserver map type so the npm formatting check passes in CI.

Co-Authored-By: OpenAI GPT-5.4 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 845146c7e1..daa86d6f32 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -9,7 +9,10 @@ let navV2OptimisticNavigateBound = false
 
 let navV2TruncationTippyInstances: Instance[] = []
 const navV2ActiveBranchScrollTimeouts = new WeakMap<HTMLElement, number[]>()
-const navV2ActiveBranchScrollObservers = new WeakMap<HTMLElement, ResizeObserver>()
+const navV2ActiveBranchScrollObservers = new WeakMap<
+    HTMLElement,
+    ResizeObserver
+>()
 
 function readCollapsedFolderIds(): Set<string> {
     try {

From 608a295ecd18f86817a96aa7027adf7dbb07c47c Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Tue, 19 May 2026 21:13:45 +0200
Subject: [PATCH 219/226] Fix inline code callouts with links

Inline callouts can contain Markdown links, but the parser rejected slash characters and skipped those callouts. Allow slashes in inline callout text and render inline callout Markdown without splitting the list item body so the existing formatting expectation passes.

Co-Authored-By: OpenAI GPT-5.4 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Markdown/Myst/CodeBlocks/CallOutParser.cs         | 2 +-
 .../Myst/CodeBlocks/EnhancedCodeBlockHtmlRenderer.cs          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Elastic.Markdown/Myst/CodeBlocks/CallOutParser.cs b/src/Elastic.Markdown/Myst/CodeBlocks/CallOutParser.cs
index 5864c55dd4..b1fcb9fb2d 100644
--- a/src/Elastic.Markdown/Myst/CodeBlocks/CallOutParser.cs
+++ b/src/Elastic.Markdown/Myst/CodeBlocks/CallOutParser.cs
@@ -11,6 +11,6 @@ public static partial class CallOutParser
 	[GeneratedRegex(@"^.+\S+.*?\s<\d+>$", RegexOptions.IgnoreCase, 2000)]
 	public static partial Regex CallOutNumber();
 
-	[GeneratedRegex(@"^.+\S+.*?\s(?:\/\/|#)\s[^""\/#]+$", RegexOptions.IgnoreCase, 2000)]
+	[GeneratedRegex(@"^.+\S+.*?\s(?:\/\/|#)\s[^""#]+$", RegexOptions.IgnoreCase, 2000)]
 	public static partial Regex MathInlineAnnotation();
 }
diff --git a/src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlockHtmlRenderer.cs b/src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlockHtmlRenderer.cs
index 4adf9f9d14..1af15968e6 100644
--- a/src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlockHtmlRenderer.cs
+++ b/src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlockHtmlRenderer.cs
@@ -239,8 +239,8 @@ protected override void Write(HtmlRenderer renderer, EnhancedCodeBlock block)
 			_ = renderer.WriteLine("<ol class=\"code-callouts\">");
 			foreach (var c in block.UniqueCallOuts)
 			{
-				_ = renderer.WriteLine("<li>");
-				_ = renderer.WriteLine(RenderCalloutMarkdown(block, c).Value ?? string.Empty);
+				_ = renderer.Write("<li>");
+				_ = renderer.Write(RenderCalloutMarkdown(block, c).Value ?? string.Empty);
 				_ = renderer.WriteLine("</li>");
 			}
 

From e54dac522afa1832f61a80a5618279e33802d2fe Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 20 May 2026 10:22:25 +0200
Subject: [PATCH 220/226] Support default-expanded Nav V2 groups

Allow selected Nav V2 folders to stay open by default without losing manual collapse behavior, so high-priority guide sections remain visible while deeper folders stay collapsed.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 config/navigation-v2.yml                      |  3 +
 .../Toc/NavigationV2File.cs                   |  7 +-
 .../V2/PageFolderNavigationNode.cs            |  5 ++
 .../V2/PlaceholderNavigationNode.cs           |  5 ++
 .../V2/SiteNavigationV2.cs                    |  8 +--
 .../Assets/pages-nav-v2.test.ts               | 68 ++++++++++++++++---
 .../Assets/pages-nav-v2.ts                    | 34 +++++++++-
 .../Navigation/_TocTreeNavV2.cshtml           | 14 ++++
 .../NavigationV2FileTests.cs                  | 40 +++++++++++
 9 files changed, 167 insertions(+), 17 deletions(-)
 create mode 100644 tests/Elastic.Documentation.Configuration.Tests/NavigationV2FileTests.cs

diff --git a/config/navigation-v2.yml b/config/navigation-v2.yml
index a34de76574..f19fa6aed9 100644
--- a/config/navigation-v2.yml
+++ b/config/navigation-v2.yml
@@ -1788,6 +1788,7 @@ nav:
             - page: docs-content://manage-data/migrate/migrate-internal-indices.md
               title: Migrate system indices
         - group: Ingest tools
+          expanded: true
           page: docs-content://reference/ingestion-tools/index.md
           children:
           - toc: opentelemetry://reference
@@ -2086,6 +2087,7 @@ nav:
           # FTS is the foundation — everything else layers on top.
           # -----------------------------------------------------------------------
           - group: Search approaches
+            expanded: true
             page: docs-content://solutions/search/search-approaches.md
             children:
             # Full-text is core to every deployment, not just one option
@@ -2173,6 +2175,7 @@ nav:
           # Two dimensions: what language? what interface?
           # -----------------------------------------------------------------------
           - group: Build search queries
+            expanded: true
             page: docs-content://solutions/search/querying-for-search.md
             children:
             - group: The search API
diff --git a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
index 71cbf85b70..570adea70b 100644
--- a/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
+++ b/src/Elastic.Documentation.Configuration/Toc/NavigationV2File.cs
@@ -57,6 +57,7 @@ Uri Source
 public record GroupNavV2Item(
 	string Title,
 	Uri? Page,
+	bool Expanded,
 	IReadOnlyList<INavV2Item> Children
 ) : INavV2Item;
 
@@ -181,6 +182,10 @@ private static IReadOnlyList<INavV2Item> ReadItemList(IParser parser, ObjectDese
 
 		if (dict.TryGetValue("group", out var groupVal) && groupVal is string groupStr)
 		{
+			var expanded = dict.TryGetValue("expanded", out var expVal)
+				&& expVal is string expStr
+				&& bool.TryParse(expStr, out var expBool)
+				&& expBool;
 			var groupChildren = dict.TryGetValue("children", out var gch) && gch is IReadOnlyList<INavV2Item> gChildList
 				? gChildList
 				: [];
@@ -190,7 +195,7 @@ private static IReadOnlyList<INavV2Item> ReadItemList(IParser parser, ObjectDese
 				var gpUri = gpStr.Contains("://") ? gpStr : $"docs-content://{gpStr}";
 				_ = Uri.TryCreate(gpUri, UriKind.Absolute, out groupPage);
 			}
-			return new GroupNavV2Item(groupStr, groupPage, groupChildren);
+			return new GroupNavV2Item(groupStr, groupPage, expanded, groupChildren);
 		}
 
 		if (dict.TryGetValue("page", out var pageVal) && pageVal is string pageStr)
diff --git a/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs
index a610f70a4b..962ab122ab 100644
--- a/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs
+++ b/src/Elastic.Documentation.Navigation/V2/PageFolderNavigationNode.cs
@@ -19,6 +19,7 @@ public PageFolderNavigationNode(
 		string title,
 		Uri page,
 		string sitePrefix,
+		bool expandedByDefault,
 		IReadOnlyCollection<INavigationItem> children,
 		INodeNavigationItem<INavigationModel, INavigationItem>? parent
 	)
@@ -26,6 +27,7 @@ public PageFolderNavigationNode(
 		Id = ShortId.Create("page-folder", title);
 		NavigationTitle = title;
 		Url = ResolveUrl(page, sitePrefix);
+		ExpandedByDefault = expandedByDefault;
 		NavigationItems = children;
 		Parent = parent;
 		NavigationRoot = parent?.NavigationRoot!;
@@ -41,6 +43,9 @@ public PageFolderNavigationNode(
 	/// <inheritdoc />
 	public string NavigationTitle { get; }
 
+	/// <summary>Whether this folder starts expanded by default.</summary>
+	public bool ExpandedByDefault { get; }
+
 	/// <inheritdoc />
 	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
 
diff --git a/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs b/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs
index 5835f191ae..65b84b2f53 100644
--- a/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs
+++ b/src/Elastic.Documentation.Navigation/V2/PlaceholderNavigationNode.cs
@@ -18,6 +18,7 @@ public class PlaceholderNavigationNode : INodeNavigationItem<INavigationModel, I
 	public PlaceholderNavigationNode(
 		string title,
 		string sitePrefix,
+		bool expandedByDefault,
 		IReadOnlyCollection<INavigationItem> children,
 		INodeNavigationItem<INavigationModel, INavigationItem>? parent
 	)
@@ -25,6 +26,7 @@ public PlaceholderNavigationNode(
 		Id = ShortId.Create("placeholder-group", title);
 		NavigationTitle = title;
 		Url = ComputeUrl(title, sitePrefix);
+		ExpandedByDefault = expandedByDefault;
 		NavigationItems = children;
 		Parent = parent;
 		NavigationRoot = parent?.NavigationRoot!;
@@ -40,6 +42,9 @@ public PlaceholderNavigationNode(
 	/// <inheritdoc />
 	public string NavigationTitle { get; }
 
+	/// <summary>Whether this folder starts expanded by default.</summary>
+	public bool ExpandedByDefault { get; }
+
 	/// <inheritdoc />
 	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
 
diff --git a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
index 3d6359755a..6e536c2018 100644
--- a/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
+++ b/src/Elastic.Documentation.Navigation/V2/SiteNavigationV2.cs
@@ -318,12 +318,12 @@ string sitePrefix
 	{
 		if (group.Page is not null)
 		{
-			var folderPlaceholder = new PageFolderNavigationNode(group.Title, group.Page, sitePrefix, [], parent);
+			var folderPlaceholder = new PageFolderNavigationNode(group.Title, group.Page, sitePrefix, group.Expanded, [], parent);
 			var folderChildren = BuildV2Items(group.Children, nodes, folderPlaceholder, sitePrefix);
-			return new PageFolderNavigationNode(group.Title, group.Page, sitePrefix, folderChildren, parent);
+			return new PageFolderNavigationNode(group.Title, group.Page, sitePrefix, group.Expanded, folderChildren, parent);
 		}
-		var placeholder = new PlaceholderNavigationNode(group.Title, sitePrefix, [], parent);
+		var placeholder = new PlaceholderNavigationNode(group.Title, sitePrefix, group.Expanded, [], parent);
 		var children = BuildV2Items(group.Children, nodes, placeholder, sitePrefix);
-		return new PlaceholderNavigationNode(group.Title, sitePrefix, children, parent);
+		return new PlaceholderNavigationNode(group.Title, sitePrefix, group.Expanded, children, parent);
 	}
 }
diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
index 9a37c59014..3b68691018 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
@@ -41,12 +41,27 @@ function renderNav() {
                                             </li>
                                             <li class="flex flex-wrap group-navigation relative">
                                                 <div class="peer nav-folder-peer grid w-full grid-cols-1">
-                                                    <input id="group-a-2" type="checkbox" checked />
+                                                    <input id="group-a-2" type="checkbox" checked data-nav-v2-expanded-default="true" />
                                                     <a href="/guide/a/topic-2" class="sidebar-link nav-v2-link">Topic 2</a>
                                                 </div>
                                                 <div class="docs-sidebar-nav-v2__folder-clip w-full">
                                                     <div class="docs-sidebar-nav-v2__folder-clip-inner">
                                                         <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                                            <li class="flex flex-wrap group-navigation relative">
+                                                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                                                    <input id="group-a-2-child" type="checkbox" checked />
+                                                                    <a href="/guide/a/topic-2/nested" class="sidebar-link nav-v2-link">Nested topic</a>
+                                                                </div>
+                                                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                                                            <li class="flex group/li">
+                                                                                <a href="/guide/a/topic-2/nested/page" class="sidebar-link nav-v2-link">Nested page</a>
+                                                                            </li>
+                                                                        </ul>
+                                                                    </div>
+                                                                </div>
+                                                            </li>
                                                             <li class="flex group/li">
                                                                 <a href="/guide/a/topic-2/other-page" class="sidebar-link nav-v2-link">Other page</a>
                                                             </li>
@@ -60,7 +75,7 @@ function renderNav() {
                             </li>
                             <li class="flex flex-wrap group-navigation relative">
                                 <div class="peer nav-folder-peer grid w-full grid-cols-1">
-                                    <input id="group-b" type="checkbox" checked />
+                                    <input id="group-b" type="checkbox" checked data-nav-v2-expanded-default="true" />
                                     <a href="/guide/b" class="sidebar-link nav-v2-link">Group B</a>
                                 </div>
                                 <div class="docs-sidebar-nav-v2__folder-clip w-full">
@@ -73,6 +88,21 @@ function renderNav() {
                                     </div>
                                 </div>
                             </li>
+                            <li class="flex flex-wrap group-navigation relative">
+                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                    <input id="group-c" type="checkbox" checked />
+                                    <a href="/guide/c" class="sidebar-link nav-v2-link">Group C</a>
+                                </div>
+                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                            <li class="flex group/li">
+                                                <a href="/guide/c/page" class="sidebar-link nav-v2-link">Group C page</a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </li>
                         </ul>
                     </li>
                 </ul>
@@ -110,7 +140,7 @@ describe('initNavV2', () => {
         window.requestAnimationFrame = originalRequestAnimationFrame
     })
 
-    it('keeps only the active page branch expanded', () => {
+    it('keeps the active page branch and default-expanded folders expanded', () => {
         window.history.pushState({}, '', '/guide/a/topic-1/current-page')
 
         const nav = renderNav()
@@ -119,11 +149,13 @@ describe('initNavV2', () => {
 
         expect(checkbox('group-a').checked).toBe(true)
         expect(checkbox('group-a-1').checked).toBe(true)
-        expect(checkbox('group-a-2').checked).toBe(false)
-        expect(checkbox('group-b').checked).toBe(false)
+        expect(checkbox('group-a-2').checked).toBe(true)
+        expect(checkbox('group-a-2-child').checked).toBe(false)
+        expect(checkbox('group-b').checked).toBe(true)
+        expect(checkbox('group-c').checked).toBe(false)
     })
 
-    it('collapses sibling folders when a new folder is opened manually', () => {
+    it('collapses non-default sibling folders when a new folder is opened manually', () => {
         window.history.pushState({}, '', '/guide/a/topic-1/current-page')
 
         const nav = renderNav()
@@ -132,11 +164,29 @@ describe('initNavV2', () => {
 
         const groupA = checkbox('group-a')
         const groupB = checkbox('group-b')
-        groupB.checked = true
-        groupB.dispatchEvent(new Event('change', { bubbles: true }))
+        const groupC = checkbox('group-c')
+        groupC.checked = true
+        groupC.dispatchEvent(new Event('change', { bubbles: true }))
 
-        expect(groupB.checked).toBe(true)
+        expect(groupC.checked).toBe(true)
         expect(groupA.checked).toBe(false)
+        expect(groupB.checked).toBe(true)
+    })
+
+    it('respects manually collapsed default-expanded folders', () => {
+        window.history.pushState({}, '', '/guide/a/topic-1/current-page')
+        sessionStorage.setItem(
+            'docs-builder-nav-v2-collapsed-ids',
+            JSON.stringify(['group-b'])
+        )
+
+        const nav = renderNav()
+
+        initNavV2(nav)
+
+        const groupB = checkbox('group-b')
+
+        expect(groupB.checked).toBe(false)
     })
 
     it('scrolls the active branch into view when it opens below the viewport', () => {
diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index daa86d6f32..846947e348 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -261,9 +261,24 @@ function getSiblingAccordionCheckboxes(
     ).filter((c) => c !== checkbox)
 }
 
+function isDefaultExpandedCheckbox(checkbox: HTMLInputElement) {
+    return checkbox.dataset.navV2ExpandedDefault === 'true'
+}
+
+function shouldKeepDefaultExpanded(
+    checkbox: HTMLInputElement,
+    collapsedIds: Set<string>
+) {
+    return (
+        isDefaultExpandedCheckbox(checkbox) &&
+        (!checkbox.id || !collapsedIds.has(checkbox.id))
+    )
+}
+
 /**
  * Accordion behaviour: when a folder is opened, collapse its siblings so
- * only one branch stays expanded at that nesting level.
+ * only one branch stays expanded at that nesting level. Default-expanded
+ * siblings stay open unless the user explicitly collapsed them this session.
  */
 function initAccordion(nav: HTMLElement) {
     nav.querySelectorAll<HTMLInputElement>(
@@ -277,7 +292,13 @@ function initAccordion(nav: HTMLElement) {
         cb.addEventListener('change', (e) => {
             const target = e.target as HTMLInputElement
             if (target.checked) {
+                const collapsedIds = readCollapsedFolderIds()
                 getSiblingAccordionCheckboxes(target).forEach((sibling) => {
+                    if (shouldKeepDefaultExpanded(sibling, collapsedIds)) {
+                        sibling.checked = true
+                        return
+                    }
+
                     sibling.checked = false
                 })
             }
@@ -297,10 +318,17 @@ function collapseInactiveFolders(
     nav: HTMLElement,
     activeCheckboxes: Set<HTMLInputElement>
 ) {
+    const collapsedIds = readCollapsedFolderIds()
     getAllFolderCheckboxes(nav).forEach((cb) => {
-        if (!activeCheckboxes.has(cb)) {
-            cb.checked = false
+        if (
+            activeCheckboxes.has(cb) ||
+            shouldKeepDefaultExpanded(cb, collapsedIds)
+        ) {
+            cb.checked = true
+            return
         }
+
+        cb.checked = false
     })
 }
 
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index 8ed4867eca..0edd892571 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -79,6 +79,10 @@
 					<input
 						id="@placeholderGroup.Id"
 						type="checkbox"
+						@if (placeholderGroup.ExpandedByDefault)
+						{
+							<text>data-nav-v2-expanded-default="true"</text>
+						}
 						class="sr-only pointer-events-none"
 						tabindex="-1"
 						aria-hidden="true">
@@ -161,6 +165,12 @@
 	else if (item is INodeNavigationItem<INavigationModel, INavigationItem> folder)
 	{
 		var allHidden = folder.NavigationItems.All(n => n.Hidden);
+		var expandedByDefault = folder switch
+		{
+			PageFolderNavigationNode pageFolder => pageFolder.ExpandedByDefault,
+			PlaceholderNavigationNode placeholderFolder => placeholderFolder.ExpandedByDefault,
+			_ => false
+		};
 		<li class="flex flex-wrap group-navigation relative">
 			<div class="peer nav-folder-peer grid w-full grid-cols-1">
 				@if (!allHidden)
@@ -168,6 +178,10 @@
 					<input
 						id="@folder.Id"
 						type="checkbox"
+						@if (expandedByDefault)
+						{
+							<text>data-nav-v2-expanded-default="true"</text>
+						}
 						class="sr-only pointer-events-none"
 						tabindex="-1"
 						aria-hidden="true">
diff --git a/tests/Elastic.Documentation.Configuration.Tests/NavigationV2FileTests.cs b/tests/Elastic.Documentation.Configuration.Tests/NavigationV2FileTests.cs
new file mode 100644
index 0000000000..1a77ade4e1
--- /dev/null
+++ b/tests/Elastic.Documentation.Configuration.Tests/NavigationV2FileTests.cs
@@ -0,0 +1,40 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using AwesomeAssertions;
+using Elastic.Documentation.Configuration.Toc;
+
+namespace Elastic.Documentation.Configuration.Tests;
+
+public class NavigationV2FileTests
+{
+	[Fact]
+	public void Deserialize_GroupExpanded_ParsesFlag()
+	{
+		// language=yaml
+		var yaml = """
+		          nav:
+		            - section: Guides
+		              url: /docs
+		              children:
+		                - group: Expanded group
+		                  expanded: true
+		                  page: docs-content://expanded.md
+		                  children:
+		                    - page: docs-content://expanded/child.md
+		                      title: Child
+		                - group: Collapsed group
+		                  page: docs-content://collapsed.md
+		          """;
+
+		var file = NavigationV2File.Deserialize(yaml);
+		var section = file.Nav[0].Should().BeOfType<SectionNavV2Item>().Subject;
+
+		var expandedGroup = section.Children[0].Should().BeOfType<GroupNavV2Item>().Subject;
+		expandedGroup.Expanded.Should().BeTrue();
+
+		var collapsedGroup = section.Children[1].Should().BeOfType<GroupNavV2Item>().Subject;
+		collapsedGroup.Expanded.Should().BeFalse();
+	}
+}

From 8c7cc8b90e8baa2f46ab22e69fa556d3dee41af8 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 20 May 2026 11:57:35 +0200
Subject: [PATCH 221/226] Fix mobile docs layout overflow

Constrain the page grid and mobile nav chrome so wide header content does not force the docs viewport to scroll horizontally.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Documentation.Site/Assets/assembler.css        | 6 ++++++
 src/Elastic.Documentation.Site/Assets/styles.css           | 1 +
 src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/assembler.css b/src/Elastic.Documentation.Site/Assets/assembler.css
index b99630104e..fc0ffa1fc6 100644
--- a/src/Elastic.Documentation.Site/Assets/assembler.css
+++ b/src/Elastic.Documentation.Site/Assets/assembler.css
@@ -21,6 +21,12 @@ body.air-gapped elastic-docs-header .euiHeader {
 	padding-inline: calc((100vw - var(--max-layout-width)) / 2 + 8px);
 }
 
+#elastic-nav-wrapper,
+#elastic-nav {
+	max-width: 100%;
+	overflow-x: clip;
+}
+
 #elastic-nav {
 	@media screen and (min-width: 1200px) {
 		[data-component='Container'] {
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index ae529928d6..6e972ad4ac 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -928,6 +928,7 @@ nav.docs-sidebar-nav-v2
 body {
 	min-height: 100vh;
 	display: grid;
+	grid-template-columns: minmax(0, 1fr);
 	grid-template-rows: auto auto 1fr auto;
 }
 
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index aac4e70c20..563de0d697 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -6,10 +6,10 @@
 	<ask-ai></ask-ai>
 	<nav id="secondary-nav" hx-select-oob="#main-container" hx-swap="none"
 	     class="bg-grey-10 border-b border-grey-20">
-		<div class="w-full max-w-(--max-layout-width) mx-auto px-4 h-[55px] flex items-center">
+		<div class="w-full max-w-(--max-layout-width) mx-auto px-4 h-[55px] flex items-center min-w-0 overflow-x-auto">
 			@if (Model.NavV2Sections is { Count: > 0 } navTabs)
 			{
-				<ul class="flex gap-6 font-sans font-semibold text-sm text-ink-light md:text-base">
+				<ul class="flex w-max max-w-none flex-nowrap gap-6 font-sans font-semibold text-sm text-ink-light md:text-base">
 				@foreach (var navTab in navTabs.Where(s => !s.Isolated))
 				{
 					var isAbsolute = navTab.Url.StartsWith("http", StringComparison.OrdinalIgnoreCase);

From b2821077ca06351cd423cd171f6f66b3a09aff76 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 20 May 2026 13:52:49 +0200
Subject: [PATCH 222/226] Focus selected duplicate Nav V2 entries

Store the clicked sidebar occurrence so duplicate page links keep the user's chosen nav context, while direct loads use a stable canonical fallback.

Co-Authored-By: OpenAI GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/pages-nav-v2.test.ts               |  79 ++++++++
 .../Assets/pages-nav-v2.ts                    | 178 +++++++++++++-----
 .../Navigation/NavigationTreeItem.cs          |   1 +
 .../Navigation/_TocTreeNavV2.cshtml           |  21 ++-
 4 files changed, 226 insertions(+), 53 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
index 3b68691018..e65431e876 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
@@ -103,6 +103,48 @@ function renderNav() {
                                     </div>
                                 </div>
                             </li>
+                            <li class="flex flex-wrap group-navigation relative">
+                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                    <input id="duplicate-primary" type="checkbox" checked />
+                                    <a href="/guide/fundamentals" data-nav-v2-location="3" class="sidebar-link nav-v2-link">Fundamentals</a>
+                                </div>
+                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                            <li class="flex group/li">
+                                                <a href="/guide/shared" data-nav-v2-location="3.0" class="sidebar-link nav-v2-link">Shared page in fundamentals</a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="flex flex-wrap group-navigation relative">
+                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                    <input id="duplicate-secondary" type="checkbox" checked data-nav-v2-expanded-default="true" />
+                                    <a href="/guide/platform" data-nav-v2-location="4" class="sidebar-link nav-v2-link">Platform</a>
+                                </div>
+                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                            <li class="flex flex-wrap group-navigation relative">
+                                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                                    <input id="duplicate-secondary-child" type="checkbox" checked />
+                                                    <a href="/guide/platform/ingest" data-nav-v2-location="4.0" class="sidebar-link nav-v2-link">Ingest or migrate data</a>
+                                                </div>
+                                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                                            <li class="flex group/li">
+                                                                <a href="/guide/shared" data-nav-v2-location="4.0.0" class="sidebar-link nav-v2-link">Shared page in platform</a>
+                                                            </li>
+                                                        </ul>
+                                                    </div>
+                                                </div>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </li>
                         </ul>
                     </li>
                 </ul>
@@ -121,6 +163,12 @@ function groupRow(id: string): HTMLElement {
     return checkbox(id).closest('li.group-navigation') as HTMLElement
 }
 
+function currentLinks(nav: HTMLElement): string[] {
+    return Array.from(nav.querySelectorAll('a.sidebar-link.current')).map(
+        (a) => a.textContent?.trim() ?? ''
+    )
+}
+
 describe('initNavV2', () => {
     const originalRequestAnimationFrame = window.requestAnimationFrame
 
@@ -234,4 +282,35 @@ describe('initNavV2', () => {
 
         expect(container.scrollTop).toBe(142)
     })
+
+    it('focuses the canonical duplicate location on direct page load', () => {
+        window.history.pushState({}, '', '/guide/shared')
+
+        const nav = renderNav()
+
+        initNavV2(nav)
+
+        expect(currentLinks(nav)).toEqual(['Shared page in fundamentals'])
+        expect(checkbox('duplicate-primary').checked).toBe(true)
+        expect(checkbox('duplicate-secondary').checked).toBe(false)
+        expect(checkbox('duplicate-secondary-child').checked).toBe(false)
+    })
+
+    it('focuses the clicked duplicate location after navigation', () => {
+        window.history.pushState({}, '', '/guide/start')
+
+        const nav = renderNav()
+        const platformDuplicate = nav.querySelector<HTMLAnchorElement>(
+            'a[data-nav-v2-location="4.0.0"]'
+        )!
+
+        platformDuplicate.click()
+        window.history.pushState({}, '', '/guide/shared')
+        initNavV2(nav)
+
+        expect(currentLinks(nav)).toEqual(['Shared page in platform'])
+        expect(checkbox('duplicate-primary').checked).toBe(false)
+        expect(checkbox('duplicate-secondary').checked).toBe(true)
+        expect(checkbox('duplicate-secondary-child').checked).toBe(true)
+    })
 })
diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 846947e348..8a1333ca37 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -3,6 +3,8 @@ import tippy from 'tippy.js'
 import type { Instance } from 'tippy.js'
 
 const navV2CollapsedStorageKey = 'docs-builder-nav-v2-collapsed-ids'
+const navV2SelectedLocationsStorageKey =
+    'docs-builder-nav-v2-selected-locations'
 
 let navV2FolderLinkToggleBound = false
 let navV2OptimisticNavigateBound = false
@@ -36,6 +38,47 @@ function writeCollapsedFolderIds(ids: Set<string>) {
     sessionStorage.setItem(navV2CollapsedStorageKey, JSON.stringify([...ids]))
 }
 
+function readSelectedNavLocations(): Record<string, string> {
+    try {
+        const raw = sessionStorage.getItem(navV2SelectedLocationsStorageKey)
+        if (!raw) {
+            return {}
+        }
+
+        const parsed = JSON.parse(raw) as unknown
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+            return {}
+        }
+
+        return Object.fromEntries(
+            Object.entries(parsed).filter(
+                (entry): entry is [string, string] =>
+                    typeof entry[0] === 'string' &&
+                    typeof entry[1] === 'string'
+            )
+        )
+    } catch {
+        return {}
+    }
+}
+
+function rememberSelectedNavLocation(pathnameRaw: string, location?: string) {
+    if (!location) {
+        return
+    }
+
+    const locations = readSelectedNavLocations()
+    locations[normalizeDocPathname(pathnameRaw)] = location
+    sessionStorage.setItem(
+        navV2SelectedLocationsStorageKey,
+        JSON.stringify(locations)
+    )
+}
+
+function selectedNavLocationForPath(pathnameRaw: string): string | null {
+    return readSelectedNavLocations()[normalizeDocPathname(pathnameRaw)] ?? null
+}
+
 function persistFolderCheckboxCollapsedState(cb: HTMLInputElement) {
     if (!cb.id) {
         return
@@ -223,9 +266,16 @@ function ensureNavV2OptimisticCurrentOnNavigate() {
                 return
             }
 
-            const here = window.location.pathname.replace(/\/$/, '')
-            const pathStripped = path.replace(/\/$/, '')
-            if (pathStripped === here) {
+            const selectedLocation = a.dataset.navV2Location
+            const previousSelectedLocation = selectedNavLocationForPath(path)
+            rememberSelectedNavLocation(path, selectedLocation)
+
+            const here = normalizeDocPathname(window.location.pathname)
+            const pathStripped = normalizeDocPathname(path)
+            if (
+                pathStripped === here &&
+                (!selectedLocation || selectedLocation === previousSelectedLocation)
+            ) {
                 return
             }
 
@@ -314,15 +364,33 @@ function getAllFolderCheckboxes(nav: HTMLElement): HTMLInputElement[] {
     )
 }
 
+function folderContainsMatchingPath(
+    checkbox: HTMLInputElement,
+    pathnameRaw: string
+) {
+    const group = checkbox.closest('li.group-navigation')
+    if (!group) {
+        return false
+    }
+
+    return getAnchorsMatchingPath(group, pathnameRaw).length > 0
+}
+
 function collapseInactiveFolders(
     nav: HTMLElement,
-    activeCheckboxes: Set<HTMLInputElement>
+    activeCheckboxes: Set<HTMLInputElement>,
+    pathnameRaw?: string
 ) {
     const collapsedIds = readCollapsedFolderIds()
     getAllFolderCheckboxes(nav).forEach((cb) => {
+        if (activeCheckboxes.has(cb)) {
+            cb.checked = true
+            return
+        }
+
         if (
-            activeCheckboxes.has(cb) ||
-            shouldKeepDefaultExpanded(cb, collapsedIds)
+            shouldKeepDefaultExpanded(cb, collapsedIds) &&
+            (!pathnameRaw || !folderContainsMatchingPath(cb, pathnameRaw))
         ) {
             cb.checked = true
             return
@@ -593,30 +661,8 @@ function navListItemDepthFromAnchor(anchor: Element, nav: HTMLElement): number {
     return depth
 }
 
-/**
- * Prefer the deepest {@code a.sidebar-link.current} when several share the URL (folder index
- * and child, or duplicate toc entries). Otherwise {@code querySelector} picks the first in DOM
- * order (usually a parent folder) and subtree/ancestor classes apply to the wrong rows.
- */
 function deepestCurrentSidebarLink(nav: HTMLElement): HTMLAnchorElement | null {
-    const anchors = nav.querySelectorAll<HTMLAnchorElement>(
-        'a.sidebar-link.current'
-    )
-    if (anchors.length === 0) {
-        return null
-    }
-
-    let best = anchors[0]
-    let bestDepth = navListItemDepthFromAnchor(best, nav)
-    for (let i = 1; i < anchors.length; i++) {
-        const candidate = anchors[i]
-        const d = navListItemDepthFromAnchor(candidate, nav)
-        if (d > bestDepth) {
-            bestDepth = d
-            best = candidate
-        }
-    }
-    return best
+    return nav.querySelector<HTMLAnchorElement>('a.sidebar-link.current')
 }
 
 /**
@@ -680,16 +726,11 @@ function applyActiveSubtreeHighlight(nav: HTMLElement) {
     }
 }
 
-/**
- * Mark all nav links whose href matches {@code pathname} with the "current" CSS class.
- */
 function markCurrentPageForPath(nav: HTMLElement, pathnameRaw: string) {
     $$('.current', nav).forEach((el) => el.classList.remove('current'))
 
-    const pathname = stripTrailingSlashForNavHref(pathnameRaw)
-    $$(`a[href="${pathname}"], a[href="${pathname}/"]`, nav).forEach((el) =>
-        el.classList.add('current')
-    )
+    const current = pickAnchorMatchingPath(nav, pathnameRaw)
+    current?.classList.add('current')
 }
 
 /**
@@ -704,37 +745,74 @@ function markCurrentPage(nav: HTMLElement) {
     markCurrentPageForPath(nav, window.location.pathname)
 }
 
-function pickDeepestAnchorMatchingPath(
-    nav: HTMLElement,
+function getAnchorsMatchingPath(
+    root: ParentNode,
     pathnameRaw: string
-): HTMLElement | null {
+): HTMLAnchorElement[] {
     const pathname = stripTrailingSlashForNavHref(pathnameRaw)
-    const matches = nav.querySelectorAll<HTMLElement>(
-        `a[href="${pathname}"], a[href="${pathname}/"]`
+    return Array.from(
+        root.querySelectorAll<HTMLAnchorElement>(
+            `a[href="${pathname}"], a[href="${pathname}/"]`
+        )
     )
-    if (matches.length === 0) {
+}
+
+function pickCanonicalAnchor(
+    nav: HTMLElement,
+    anchors: HTMLAnchorElement[]
+): HTMLAnchorElement | null {
+    if (anchors.length === 0) {
         return null
     }
 
-    let best = matches[0]
+    let best = anchors[0]
     let bestDepth = navListItemDepthFromAnchor(best, nav)
-    for (let i = 1; i < matches.length; i++) {
-        const m = matches[i]
-        const d = navListItemDepthFromAnchor(m, nav)
+    let bestLi = best.closest('li')
+    for (let i = 1; i < anchors.length; i++) {
+        const candidate = anchors[i]
+        const candidateLi = candidate.closest('li')
+        if (!bestLi || !candidateLi || !bestLi.contains(candidateLi)) {
+            continue
+        }
+
+        const d = navListItemDepthFromAnchor(candidate, nav)
         if (d > bestDepth) {
             bestDepth = d
-            best = m
+            best = candidate
+            bestLi = candidateLi
         }
     }
     return best
 }
 
+function pickAnchorMatchingPath(
+    nav: HTMLElement,
+    pathnameRaw: string
+): HTMLAnchorElement | null {
+    const matches = getAnchorsMatchingPath(nav, pathnameRaw)
+    if (matches.length === 0) {
+        return null
+    }
+
+    const selectedLocation = selectedNavLocationForPath(pathnameRaw)
+    if (selectedLocation) {
+        const selected = matches.find(
+            (m) => m.dataset.navV2Location === selectedLocation
+        )
+        if (selected) {
+            return selected
+        }
+    }
+
+    return pickCanonicalAnchor(nav, matches)
+}
+
 /**
  * Expand all ancestor collapsible sections that contain the link for {@code pathnameRaw}.
- * Uses the deepest matching anchor when several share the URL.
+ * Uses the selected nav occurrence when available; direct loads fall back to the canonical occurrence.
  */
 function expandToCurrentPageForPath(nav: HTMLElement, pathnameRaw: string) {
-    const link = pickDeepestAnchorMatchingPath(nav, pathnameRaw)
+    const link = pickAnchorMatchingPath(nav, pathnameRaw)
     if (!link) {
         collapseInactiveFolders(nav, new Set())
         return
@@ -770,7 +848,7 @@ function expandToCurrentPageForPath(nav: HTMLElement, pathnameRaw: string) {
         writeCollapsedFolderIds(collapsedIds)
     }
 
-    collapseInactiveFolders(nav, activeCheckboxes)
+    collapseInactiveFolders(nav, activeCheckboxes, pathnameRaw)
 }
 
 /**
diff --git a/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs b/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs
index dfc09e2e40..3b68007979 100644
--- a/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs
+++ b/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs
@@ -16,6 +16,7 @@ public class NavigationTreeItem
 	public required bool IsGlobalAssemblyBuild { get; init; }
 	public required string RootNavigationId { get; set; }
 	public required IHtmxAttributeProvider Htmx { get; init; }
+	public string NavV2LocationPath { get; init; } = "";
 
 	/// <summary>True when this subtree renders inside an island (entry-point + descendants).
 	/// Links here must swap the full page chrome so clicking from a parent section's sidebar
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
index 0edd892571..77784f692b 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNavV2.cshtml
@@ -11,6 +11,7 @@
 	var navHxAttrs = Model.IsIslandSubtree
 		? Model.Htmx.GetHxAttributes(hxSwapOob: "#main-container,#secondary-nav", preload: null)
 		: Model.Htmx.GetNavHxAttributes(true, null);
+	var navV2ItemIndex = 0;
 }
 @foreach (var item in Model.SubTree.NavigationItems)
 {
@@ -19,6 +20,11 @@
 		continue;
 	}
 
+	var itemLocation = string.IsNullOrEmpty(Model.NavV2LocationPath)
+		? $"{navV2ItemIndex}"
+		: $"{Model.NavV2LocationPath}.{navV2ItemIndex}";
+	navV2ItemIndex++;
+
 	if (item is LabelNavigationNode label)
 	{
 		var labelBodyIsSubsection = NavV2LabelListKind.IsSubsectionList(label);
@@ -50,7 +56,8 @@
 						SubTree = label,
 						RootNavigationId = Model.RootNavigationId,
 						Htmx = Model.Htmx,
-						IsIslandSubtree = Model.IsIslandSubtree
+						IsIslandSubtree = Model.IsIslandSubtree,
+						NavV2LocationPath = itemLocation
 					}))
 				</ul>
 			}
@@ -62,6 +69,7 @@
 			<a
 				href="@placeholder.Url"
 				@navHxAttrs
+				data-nav-v2-location="@itemLocation"
 				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 				style="--nav-level:@Model.Level">
 				<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
@@ -90,6 +98,7 @@
 				<a
 					href="@placeholderGroup.Url"
 					@navHxAttrs
+					data-nav-v2-location="@itemLocation"
 					class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 					style="--nav-level:@Model.Level">
 					@if (!allHidden)
@@ -126,7 +135,8 @@
 								SubTree = placeholderGroup,
 								RootNavigationId = Model.RootNavigationId,
 								Htmx = Model.Htmx,
-								IsIslandSubtree = Model.IsIslandSubtree
+								IsIslandSubtree = Model.IsIslandSubtree,
+								NavV2LocationPath = itemLocation
 							}))
 						</ul>
 					</div>
@@ -141,6 +151,7 @@
 			<a
 				href="@island.Url"
 				@islandHxAttrs
+				data-nav-v2-location="@itemLocation"
 				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 				style="--nav-level:@Model.Level">
 				<span class="nav-item-slot shrink-0" aria-hidden="true"></span>
@@ -154,6 +165,7 @@
 			<a
 				href="@group.Url"
 				@navHxAttrs
+				data-nav-v2-location="@itemLocation"
 				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 				style="--nav-level:@Model.Level"
 			>
@@ -189,6 +201,7 @@
 				<a
 					href="@(folder.Url)"
 					@navHxAttrs
+					data-nav-v2-location="@itemLocation"
 					class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 					style="--nav-level:@Model.Level">
 					@if (!allHidden)
@@ -225,7 +238,8 @@
 								SubTree = folder,
 								RootNavigationId = Model.RootNavigationId,
 								Htmx = Model.Htmx,
-								IsIslandSubtree = Model.IsIslandSubtree
+								IsIslandSubtree = Model.IsIslandSubtree,
+								NavV2LocationPath = itemLocation
 							}))
 						</ul>
 					</div>
@@ -239,6 +253,7 @@
 			<a
 				href="@leaf.Url"
 				@navHxAttrs
+				data-nav-v2-location="@itemLocation"
 				class="sidebar-link nav-v2-link flex w-full items-center gap-2 py-[6px]"
 				style="--nav-level:@Model.Level"
 			>

From c21fecf43dc4ae9654e7803f9abfe75bc46ea6b2 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 20 May 2026 13:57:04 +0200
Subject: [PATCH 223/226] Format Nav V2 duplicate focus script

Co-Authored-By: OpenAI GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 8a1333ca37..337968be60 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -53,8 +53,7 @@ function readSelectedNavLocations(): Record<string, string> {
         return Object.fromEntries(
             Object.entries(parsed).filter(
                 (entry): entry is [string, string] =>
-                    typeof entry[0] === 'string' &&
-                    typeof entry[1] === 'string'
+                    typeof entry[0] === 'string' && typeof entry[1] === 'string'
             )
         )
     } catch {
@@ -274,7 +273,8 @@ function ensureNavV2OptimisticCurrentOnNavigate() {
             const pathStripped = normalizeDocPathname(path)
             if (
                 pathStripped === here &&
-                (!selectedLocation || selectedLocation === previousSelectedLocation)
+                (!selectedLocation ||
+                    selectedLocation === previousSelectedLocation)
             ) {
                 return
             }

From b5245a275533fac9aa412890adddad173e1b718c Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 20 May 2026 14:46:44 +0200
Subject: [PATCH 224/226] Honor same-page duplicate folder selection

Only treat same-page folder-row clicks as expand toggles when that exact row is already focused, so duplicate rows can still update the selected nav location.

Co-Authored-By: OpenAI GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/pages-nav-v2.test.ts               | 49 +++++++++++++++++++
 .../Assets/pages-nav-v2.ts                    | 11 ++++-
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
index e65431e876..a50cc6011d 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.test.ts
@@ -145,6 +145,36 @@ function renderNav() {
                                     </div>
                                 </div>
                             </li>
+                            <li class="flex flex-wrap group-navigation relative">
+                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                    <input id="duplicate-folder-primary" type="checkbox" checked />
+                                    <a href="/guide/shared-folder" data-nav-v2-location="5" class="sidebar-link nav-v2-link">Shared folder primary</a>
+                                </div>
+                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                            <li class="flex group/li">
+                                                <a href="/guide/shared-folder/child" data-nav-v2-location="5.0" class="sidebar-link nav-v2-link">Shared folder child</a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="flex flex-wrap group-navigation relative">
+                                <div class="peer nav-folder-peer grid w-full grid-cols-1">
+                                    <input id="duplicate-folder-secondary" type="checkbox" checked />
+                                    <a href="/guide/shared-folder" data-nav-v2-location="6" class="sidebar-link nav-v2-link">Shared folder secondary</a>
+                                </div>
+                                <div class="docs-sidebar-nav-v2__folder-clip w-full">
+                                    <div class="docs-sidebar-nav-v2__folder-clip-inner">
+                                        <ul class="docs-sidebar-nav-v2__folder-children w-full relative">
+                                            <li class="flex group/li">
+                                                <a href="/guide/shared-folder/other-child" data-nav-v2-location="6.0" class="sidebar-link nav-v2-link">Shared folder other child</a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </li>
                         </ul>
                     </li>
                 </ul>
@@ -313,4 +343,23 @@ describe('initNavV2', () => {
         expect(checkbox('duplicate-secondary').checked).toBe(true)
         expect(checkbox('duplicate-secondary-child').checked).toBe(true)
     })
+
+    it('focuses a duplicate folder row when already on its page', () => {
+        window.history.pushState({}, '', '/guide/shared-folder')
+
+        const nav = renderNav()
+        initNavV2(nav)
+
+        expect(currentLinks(nav)).toEqual(['Shared folder primary'])
+
+        const secondaryFolder = nav.querySelector<HTMLAnchorElement>(
+            'a[data-nav-v2-location="6"]'
+        )!
+
+        secondaryFolder.click()
+
+        expect(currentLinks(nav)).toEqual(['Shared folder secondary'])
+        expect(checkbox('duplicate-folder-primary').checked).toBe(false)
+        expect(checkbox('duplicate-folder-secondary').checked).toBe(true)
+    })
 })
diff --git a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
index 337968be60..6e6f1cdc5d 100644
--- a/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
+++ b/src/Elastic.Documentation.Site/Assets/pages-nav-v2.ts
@@ -183,7 +183,10 @@ function ensureNavV2FolderLinkToggle() {
                 return
             }
 
-            if (linkPathMatchesCurrentPage(a)) {
+            if (
+                a.classList.contains('current') &&
+                linkPathMatchesCurrentPage(a)
+            ) {
                 cb.checked = !cb.checked
                 cb.dispatchEvent(new Event('change', { bubbles: true }))
                 persistFolderCheckboxCollapsedState(cb)
@@ -249,7 +252,11 @@ function ensureNavV2OptimisticCurrentOnNavigate() {
                 li?.querySelector<HTMLAnchorElement>(
                     ':scope > .nav-folder-peer > a.sidebar-link'
                 ) ?? null
-            if (folderRowInLi === a && linkPathMatchesCurrentPage(a)) {
+            if (
+                folderRowInLi === a &&
+                a.classList.contains('current') &&
+                linkPathMatchesCurrentPage(a)
+            ) {
                 return
             }
 

From 1a0a0259f6e52d602cc4507f37d8e1dbf7879568 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 20 May 2026 15:19:31 +0200
Subject: [PATCH 225/226] Fix Products dropdown layering

Allow the desktop Products dropdown to escape the secondary nav scroll container while keeping the Elastic nav above sticky docs chrome.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Elastic.Documentation.Site/Assets/assembler.css         | 5 +++++
 .../Assets/secondary-nav-dropdown.css                       | 6 ++++++
 src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml  | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Elastic.Documentation.Site/Assets/assembler.css b/src/Elastic.Documentation.Site/Assets/assembler.css
index fc0ffa1fc6..3d30d90c43 100644
--- a/src/Elastic.Documentation.Site/Assets/assembler.css
+++ b/src/Elastic.Documentation.Site/Assets/assembler.css
@@ -27,6 +27,11 @@ body.air-gapped elastic-docs-header .euiHeader {
 	overflow-x: clip;
 }
 
+#elastic-nav-wrapper {
+	position: relative;
+	z-index: 40;
+}
+
 #elastic-nav {
 	@media screen and (min-width: 1200px) {
 		[data-component='Container'] {
diff --git a/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css b/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css
index 48580da254..90b915a62a 100644
--- a/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css
+++ b/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css
@@ -7,6 +7,12 @@
  */
 
 @layer components {
+	@media screen and (min-width: 768px) {
+		.secondary-nav-scroll-container {
+			overflow: visible;
+		}
+	}
+
 	.secondary-nav-dropdown {
 		display: inline-flex;
 		align-items: center;
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index 563de0d697..41fea3a8fa 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -6,7 +6,7 @@
 	<ask-ai></ask-ai>
 	<nav id="secondary-nav" hx-select-oob="#main-container" hx-swap="none"
 	     class="bg-grey-10 border-b border-grey-20">
-		<div class="w-full max-w-(--max-layout-width) mx-auto px-4 h-[55px] flex items-center min-w-0 overflow-x-auto">
+		<div class="secondary-nav-scroll-container w-full max-w-(--max-layout-width) mx-auto px-4 h-[55px] flex items-center min-w-0 overflow-x-auto">
 			@if (Model.NavV2Sections is { Count: > 0 } navTabs)
 			{
 				<ul class="flex w-max max-w-none flex-nowrap gap-6 font-sans font-semibold text-sm text-ink-light md:text-base">

From a7df12623a7eb84c4b4bbd8111fa8afd8067d5c6 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferri Benedetti <fabri.ferribenedetti@elastic.co>
Date: Wed, 20 May 2026 15:21:33 +0200
Subject: [PATCH 226/226] Fix secondary nav overflow cascade

Keep the desktop Products dropdown override outside Tailwind layers so it wins over the overflow utility after builds.

Co-Authored-By: GPT-5.5 <noreply@openai.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/secondary-nav-dropdown.css                  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css b/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css
index 90b915a62a..5ca9443d24 100644
--- a/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css
+++ b/src/Elastic.Documentation.Site/Assets/secondary-nav-dropdown.css
@@ -6,13 +6,13 @@
  * to a child page without going through the section landing.
  */
 
-@layer components {
-	@media screen and (min-width: 768px) {
-		.secondary-nav-scroll-container {
-			overflow: visible;
-		}
+@media screen and (min-width: 768px) {
+	.secondary-nav-scroll-container {
+		overflow: visible;
 	}
+}
 
+@layer components {
 	.secondary-nav-dropdown {
 		display: inline-flex;
 		align-items: center;