Merge branch 'main' into copilot/fix-1862

Author: reakaleek

.github/actions/bootstrap/action.yml

@@ -24,7 +24,7 @@ runs:
       run: |
         git config --global init.defaultBranch main
 
-    - uses: actions/setup-dotnet@v4
+    - uses: actions/setup-dotnet@v5
       with:
         global-json-file: global.json
 

.github/workflows/auto-add-needs-triage-label.yml

@@ -0,0 +1,26 @@
+---
+name: Auto-add triage label
+
+on:
+  issues:
+    types:
+      - opened
+
+permissions:
+  contents: read
+  issues: write
+
+jobs:
+  add-triage-label:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add needs triage label
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              labels: ['needs triage']
+            })

.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-assembler -- navigation validate-link-reference
 
       - uses: elastic/docs-builder/.github/actions/aws-auth@main
         if: >

Directory.Packages.props

@@ -60,7 +60,7 @@
     <PackageVersion Include="Sep" Version="0.11.0" />
     <PackageVersion Include="Slugify.Core" Version="4.0.1" />
     <PackageVersion Include="SoftCircuits.IniFileParser" Version="2.7.0" />
-    <PackageVersion Include="System.IO.Abstractions" Version="22.0.15" />
+    <PackageVersion Include="System.IO.Abstractions" Version="22.0.16" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.4" />
     <PackageVersion Include="Utf8StreamReader" Version="1.3.2" />
     <PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.1.3" PrivateAssets="All" />
@@ -87,7 +87,7 @@
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.15" />
+    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.16" />
     <PackageVersion Include="Unquote" Version="7.0.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>

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
@@ -330,7 +333,23 @@ toc:
       # https://github.com/elastic/opentelemetry/blob/main/docs/reference/toc.yml
       - toc: opentelemetry://reference
         path_prefix: reference/opentelemetry
-        # Children include all EDOT distribution docs.
+        children:
+          - 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
 
       # Ingestion tools
       # https://github.com/elastic/docs-content/blob/main/reference/ingestion-tools/toc.yml

config/versions.yml

@@ -41,7 +41,7 @@ versioning_systems:
   # current: 1.0.0
   apm_agent_dotnet:
     base: 1.0
-    current: 1.34.0
+    current: 1.34.1
   apm_agent_go:
     base: 2.0
     current: 2.7.1
@@ -82,7 +82,7 @@ versioning_systems:
     current: 1.5.0
   edot_node:
     base: 1.0
-    current: 1.2.0
+    current: 1.3.0
   edot_php:
     base: 1.0
     current: 1.1.1
@@ -91,4 +91,4 @@ versioning_systems:
     current: 1.7.0
   edot_cf_aws:
     base: 0.1
-    current: 0.1.6
+    current: 0.2.0

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.Documentation.Configuration/Elastic.Documentation.Configuration.csproj

@@ -18,6 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="System.IO.Abstractions" />
     <EmbeddedResource Include="$(SolutionRoot)\config\versions.yml" />
     <EmbeddedResource Include="$(SolutionRoot)\config\assembler.yml" />
     <EmbeddedResource Include="$(SolutionRoot)\config\navigation.yml" />

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'
@@ -83,13 +84,20 @@ export const SearchOrAskAiModal = () => {
                         block-size: 2em;
                         display: flex;
                     `}
-                    label="Beta"
+                    label="Alpha"
                     color="accent"
-                    tooltipContent="This feature is in beta. Got feedback? We'd love to hear it!"
+                    tooltipContent="This feature is in private preview and is 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 private preview (alpha).{' '}
+                    <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>