Merge branch 'refs/heads/main' into feature/add-applies-to-tests

Author: reakaleek

config/assembler.yml

@@ -21,7 +21,7 @@ environments:
       cookies_win: x
     feature_flags:
       SEARCH_OR_ASK_AI: true
-  edge: 
+  edge:
     uri: https://d34ipnu52o64md.cloudfront.net
     path_prefix: docs
     content_source: edge
@@ -94,12 +94,14 @@ references:
   ecs-logging-python:
   ecs-logging-ruby:
   ecs-logging:
+  elastic-agent:
   elastic-otel-dotnet:
   elastic-otel-java:
   elastic-otel-node:
   elastic-otel-php:
   elastic-otel-python:
   elastic-serverless-forwarder:
+  fleet-server:
   integration-docs:
     private: true
   integrations:

config/navigation.yml

@@ -80,10 +80,13 @@ toc:
       - toc: kibana://release-notes
         path_prefix: release-notes/kibana
 
-      # Fleet and Elastic Agent
-      # https://github.com/elastic/docs-content/blob/main/release-notes/fleet-elastic-agent/toc.yml
-      - toc: docs-content://release-notes/fleet-elastic-agent
-        path_prefix: release-notes/fleet
+      # Elastic Agent
+      - toc: elastic-agent://release-notes
+        path_prefix: release-notes/elastic-agent
+
+      # Fleet Server
+      - toc: fleet-server://release-notes
+        path_prefix: release-notes/fleet-server
 
       # Logstash
       # https://github.com/elastic/logstash/blob/main/docs/release-notes/toc.yml
@@ -107,7 +110,7 @@ toc:
       # https://github.com/elastic/cloud/blob/master/docs/docset.yml
       - toc: cloud://release-notes/cloud-hosted
         path_prefix: release-notes/cloud-hosted
-        
+
       # Cloud Enterprise
       # https://github.com/elastic/cloud/blob/master/docs/release-notes/cloud-enterprise/toc.yml
       - toc: cloud://release-notes/cloud-enterprise
@@ -131,7 +134,7 @@ toc:
           # EDOT iOS / Swift
           # https://github.com/elastic/apm-agent-ios/blob/main/docs/release-notes/toc.yml
           - toc: apm-agent-ios://release-notes
-            path_prefix: release-notes/edot/sdks/ios         
+            path_prefix: release-notes/edot/sdks/ios
           # EDOT Java
           # https://github.com/elastic/elastic-otel-java/blob/main/docs/release-notes/toc.yml
           - toc: elastic-otel-java://release-notes
@@ -308,7 +311,7 @@ toc:
           # https://github.com/elastic/elasticsearch/blob/main/docs/reference/elasticsearch-plugins/toc.yml
           - toc: elasticsearch://reference/elasticsearch-plugins
             path_prefix: reference/elasticsearch/plugins
-          
+
       # Security
       # https://github.com/elastic/docs-content/blob/main/reference/security/toc.yml
       - toc: docs-content://reference/security

docs/_redirects.yml

@@ -22,12 +22,3 @@ redirects:
   'testing/redirects/third-page.md':
     anchors:
       'removed-anchor':
-  # Related to https://github.com/elastic/docs-builder/pull/1614
-  'docs/contribute/cumulative-docs.md': 'contribute/cumulative-docs/index.md'
-  'docs/versions/content-patterns.md': 'contribute/cumulative-docs/example-scenarios.md'
-  'docs/versions/index.md': 'contribute/cumulative-docs/index.md'
-  # I shouldn't need to do this should I?
-  # I'm just going to do it to get the preview to build...
-  'docs/versions/_snippets/content-patterns-list.md': 'contribute/cumulative-docs/index.md'
-  'docs/contribute/cumulative-docs/images/example-not-one-section.png': 'contribute/cumulative-docs/example-scenarios.md'
-  'docs/contribute/cumulative-docs/images/example-one-section.png': 'contribute/cumulative-docs/example-scenarios.md'

src/Elastic.Markdown/Myst/InlineParsers/DiagnosticLinkInlineParser.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.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.IO.Abstractions;
 using System.Runtime.InteropServices;
@@ -248,9 +247,23 @@ private static void ValidateInternalUrl(InlineProcessor processor, string url, s
 		if (string.IsNullOrWhiteSpace(url))
 			return;
 
+
 		var pathOnDisk = Path.GetFullPath(Path.Combine(includeFrom, url.TrimStart('/')));
 		if (!context.Build.ReadFileSystem.File.Exists(pathOnDisk))
-			processor.EmitError(link, $"`{url}` does not exist. resolved to `{pathOnDisk}");
+		{
+			if (context.Configuration.Redirects is not null && context.Configuration.Redirects.TryGetValue(url.TrimStart('/'), out var redirect))
+			{
+				var name = redirect.To ??
+					(redirect.Many is not null
+					 ? $"one of: {string.Join(", ", redirect.Many.Select(m => m.To))}"
+					 : "unknown"
+					);
+				processor.EmitWarning(link, $"Local file `{url}` has a redirect, please update this reference to: {name}");
+			}
+			else
+				processor.EmitError(link, $"`{url}` does not exist. If it was recently removed add a redirect. resolved to `{pathOnDisk}");
+
+		}
 	}
 
 	private static void ProcessLinkText(InlineProcessor processor, LinkInline link, MarkdownFile? markdown, string? anchor, string url, IFileInfo file)