Merge branch 'main' into feature/product_config

Author: cotti

.github/workflows/preview-build.yml

@@ -367,6 +367,7 @@ jobs:
           env.MATCH == 'true'
           && (
             !cancelled()
+            && github.repository != 'elastic/docs-builder'
             && steps.docs-build.outputs.skip != 'true' 
             && (
               steps.deployment.outputs.result
@@ -377,12 +378,31 @@ jobs:
             )
           )
         uses: elastic/docs-builder/actions/validate-inbound-local@main
+        
+      - name: 'Validate inbound links'
+        if: >
+          env.MATCH == 'true'
+          && (
+            !cancelled()
+            && github.repository == 'elastic/docs-builder'
+            && steps.docs-build.outputs.skip != 'true' 
+            && (
+              steps.deployment.outputs.result
+              || (
+                needs.check.outputs.any_modified == 'true' 
+                && github.event_name == 'merge_group'
+              )
+            )
+          )
+        run: |
+          dotnet run --project src/tooling/docs-builder -- inbound-links validate-link-reference
 
       - name: 'Validate local path prefixes against those claimed by global navigation.yml'
         if: >
           env.MATCH == 'true'
           && (
             !cancelled() 
+            && github.repository != 'elastic/docs-builder'
             && steps.docs-build.outputs.skip != 'true'
             && (
               steps.deployment.outputs.result 
@@ -393,6 +413,24 @@ jobs:
             )
           )
         uses: elastic/docs-builder/actions/validate-path-prefixes-local@main
+        
+      - name: 'Validate local path prefixes against those claimed by global navigation.yml'
+        if: >
+          env.MATCH == 'true'
+          && (
+            !cancelled() 
+            && github.repository == 'elastic/docs-builder'
+            && steps.docs-build.outputs.skip != 'true'
+            && (
+              steps.deployment.outputs.result 
+              || (
+                needs.check.outputs.any_modified == 'true' 
+                && github.event_name == 'merge_group'
+              )
+            )
+          )
+        run: |
+          dotnet run --project src/tooling/docs-builder -- path-prefixes validate-link-reference
 
       - uses: elastic/docs-builder/.github/actions/aws-auth@main
         if: >

src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/SearchOrAskAiModal.tsx

@@ -9,6 +9,7 @@ import {
     EuiText,
     EuiHorizontalRule,
     useEuiOverflowScroll,
+    EuiLink,
 } from '@elastic/eui'
 import { css } from '@emotion/react'
 import * as React from 'react'
@@ -85,11 +86,18 @@ export const SearchOrAskAiModal = () => {
                     `}
                     label="Beta"
                     color="accent"
-                    tooltipContent="This feature is in beta. Got feedback? We'd love to hear it!"
+                    tooltipContent="This feature is in beta. It's only enabled if you are in Elastic's Global VPN."
                 />
 
                 <EuiText color="subdued" size="xs">
-                    This feature is in beta. Got feedback? We'd love to hear it!
+                    This feature is in beta.{' '}
+                    <EuiLink
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        href="https://github.com/elastic/docs-eng-team/issues/new?template=search-or-ask-ai-feedback.yml"
+                    >
+                        Got feedback? We'd love to hear it!
+                    </EuiLink>
                 </EuiText>
             </div>
         </div>

src/tooling/docs-builder/Cli/DiffCommands.cs

@@ -77,31 +77,33 @@ public async Task<int> ValidateRedirects(string? path = null, Cancel ctx = defau
 		if (changed.Length != 0)
 			_log.LogInformation("Found {Count} changes to files related to documentation in the current branch.", changed.Length);
 
-		var missingRedirects = changed
-			.Where(c =>
-				c.ChangeType is GitChangeType.Deleted or GitChangeType.Renamed
-				&& !redirects.ContainsKey(c is RenamedGitChange renamed ? renamed.OldFilePath : c.FilePath)
-			)
-			.ToArray();
-
-		if (missingRedirects.Length != 0)
-		{
-			var relativeRedirectFile = Path.GetRelativePath(root.FullName, redirectFile.Source.FullName);
-			_log.LogInformation("Found {Count} changes that still require updates to: {RedirectFile}", missingRedirects.Length, relativeRedirectFile);
-		}
-
-		foreach (var notFound in missingRedirects)
+		var deletedAndRenamed = changed.Where(c => c.ChangeType is GitChangeType.Deleted or GitChangeType.Renamed).ToArray();
+		var missingCount = 0;
+		foreach (var change in deletedAndRenamed)
 		{
-			if (notFound is RenamedGitChange renamed)
+			var lookupPath = change is RenamedGitChange renamed ? renamed.OldFilePath : change.FilePath;
+			var docSetRelativePath = Path.GetRelativePath(buildContext.DocumentationSourceDirectory.FullName, Path.Combine(root.FullName, lookupPath));
+			var rootRelativePath = Path.GetRelativePath(root.FullName, Path.Combine(root.FullName, lookupPath));
+			if (redirects.ContainsKey(docSetRelativePath))
+				continue;
+			if (redirects.ContainsKey(rootRelativePath))
 			{
 				collector.EmitError(redirectFile.Source,
-					$"File '{renamed.OldFilePath}' was renamed to '{renamed.NewFilePath}' but it has no redirect configuration set.");
-			}
-			else if (notFound.ChangeType is GitChangeType.Deleted)
-			{
-				collector.EmitError(redirectFile.Source,
-					$"File '{notFound.FilePath}' was deleted but it has no redirect targets. This will lead to broken links.");
+					$"Redirect contains path relative to root '{rootRelativePath}' but should be relative to the documentation set '{docSetRelativePath}'");
+				continue;
 			}
+			missingCount++;
+
+			if (change is RenamedGitChange rename)
+				collector.EmitError(redirectFile.Source, $"Missing '{docSetRelativePath}' in redirects.yml. '{rename.OldFilePath}' was renamed to '{rename.NewFilePath}' but it has no redirect configuration set.");
+			else if (change.ChangeType is GitChangeType.Deleted)
+				collector.EmitError(redirectFile.Source, $"Missing '{docSetRelativePath}' in redirects.yml. '{change.FilePath}' was deleted but it has no redirect targets. This will lead to broken links.");
+		}
+
+		if (missingCount != 0)
+		{
+			var relativeRedirectFile = Path.GetRelativePath(root.FullName, redirectFile.Source.FullName);
+			_log.LogInformation("Found {Count} changes that still require updates to: {RedirectFile}", missingCount, relativeRedirectFile);
 		}
 
 		await collector.StopAsync(ctx);