Merge branch 'main' into feature/optimize-nav-lazy-load

Author: reakaleek

.github/workflows/smoke-test.yml

@@ -15,7 +15,7 @@ jobs:
             landing-page-path-output: /docs/
           - repository: elastic/elasticsearch
             landing-page-path-output: /docs/reference/
-          - repository: elastic/apm-agent-android
+          - repository: elastic/opentelemetry
             landing-page-path-output: /docs/reference/
 
             # This is a random repository that should not have a docset.yml

src/Elastic.Documentation.Site/Layout/_Header.cshtml

@@ -1,7 +1,7 @@
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
 @if (Model.Features.PrimaryNavEnabled)
 {
-	<div id="elastic-nav"></div>
+	<div id="elastic-nav" hx-disable="true"></div>
 	<script src="https://www.elastic.co/elastic-nav.js"></script>
  	@await RenderPartialAsync(_SecondaryNav.Create(Model))
 }

src/tooling/docs-assembler/assembler.yml

@@ -51,95 +51,6 @@ narrative:
 #   current: <git_ref>
 #   next: <git_ref>
 ###
-
-### This is not yet ready but already added
-
-#versions:
-#  stack:
-#    # This is the default versioning scheme, used for most of the docs.
-#    # It uses the stack version as the current version.
-#    base: '9.0'
-#    current: '9.0.1' # https://artifacts.elastic.co/releases/stack.json
-#  apm_agent_android:
-#    current: '1.0.0' # https://github.com/elastic/apm-agent-android/releases
-#  apm_agent_dotnet:
-#    current: '1.32.0' # https://github.com/elastic/apm-agent-dotnet/releases
-#  apm_agent_go:
-#    current: '2.7.1' # https://github.com/elastic/apm-agent-go/releases
-#  apm_agent_java:
-#    current: '1.54.0' # https://github.com/elastic/apm-agent-java/releases
-#  apm_agent_nodejs:
-#    current: '4.13.0' # https://github.com/elastic/apm-agent-nodejs/releases
-#  apm_agent_php:
-#    current: '1.15.0' # https://github.com/elastic/apm-agent-php/releases
-#  apm_agent_python:
-#    current: '6.23.0' # https://github.com/elastic/apm-agent-python/releases
-#  apm_agent_ruby:
-#    current: '4.7.3' # https://github.com/elastic/apm-agent-ruby/releases
-#  apm_agent_rum_js:
-#    current: '5.17.0' # https://github.com/elastic/apm-agent-rum-js/releases
-#  apm_agent_ios:
-#    current: '1.2.1' # https://github.com/elastic/apm-agent-ios/releases
-#  apm_k8s_attacher:
-#    current: '1.1.3' # https://github.com/elastic/apm-k8s-attacher/releases
-#  apm_aws_lambda:
-#    current: '1.5.8' # https://github.com/elastic/apm-aws-lambda/releases
-#  cloud_enterprise:
-#    path_prefix: en/cloud-enterprise
-#    current: '4.1.0' # https://github.com/elastic/cloud/blob/master/version
-#  cloud_heroku:
-#    current: 'current'
-#  cloud_on_k8s:
-#    current: '3.0.0' # https://github.com/elastic/cloud-on-k8s/releases
-#  cloud:
-#    current: 'current'
-#  ecctl:
-#    current: '1.14.3' # https://github.com/elastic/ecctl/releases
-#  ecs_logging:
-#    current: 'current'
-#  ecs_logging_dotnet:
-#    current: '8.18.1' # https://github.com/elastic/ecs-dotnet/releases
-#  ecs_logging_go_logrus:
-#    current: '1.0.0' # https://github.com/elastic/ecs-logging-go-logrus/releases
-#  ecs_logging_go_zap:
-#    current: '1.0.3' # https://github.com/elastic/ecs-logging-go-zap/releases
-#  ecs_logging_go_zerolog:
-#    current: '0.2.0' # https://github.com/elastic/ecs-logging-go-zerolog/releases
-#  ecs_logging_java:
-#    current: '1.7.0' # https://github.com/elastic/ecs-logging-java/releases
-#  ecs_logging_nodejs:
-#    current: '1.5.3' # https://github.com/elastic/ecs-logging-nodejs/tags
-#  ecs_logging_php:
-#    current: '2.0.0' # https://github.com/elastic/ecs-logging-php/releases
-#  ecs_logging_python:
-#    current: '2.2.0' # https://github.com/elastic/ecs-logging-python/releases
-#  ecs_logging_ruby:
-#    current: '1.0.0' # https://github.com/elastic/ecs-logging-ruby/tags
-#  ecs:
-#    current: '9.0' #
-#  elastic-stack-glossary:
-#    current: 'current'
-#  curator:
-#    current: '8.0'
-#  eland:
-#    current: '9.0.1' # https://github.com/elastic/eland/releases
-#  esf:
-#    current: '1.20.1' # https://github.com/elastic/elastic-serverless-forwarder/releases
-#  ingest-overview:
-#    current: 'current'
-#  integrations-developer:
-#    current: 'current'
-#  integrations:
-#    current: 'current'
-#  logstash-versioned-plugins:
-#    current: 'current'
-#  reference-architectures:
-#    current: 'current'
-#  search-ui:
-#    current: '1.24.0' # https://github.com/elastic/search-ui
-#  serverless:
-#    current: 'current'
-
 references:
   apm-server:
   apm-agent-android:

src/tooling/docs-assembler/legacy-url-mappings.yml

@@ -31,7 +31,7 @@ mappings:
   en/cloud-on-k8s/: [ '3.0.0', '2.16', '2.15', '2.14', '2.13', '2.12', '2.11', '2.10', '2.9', '2.8', '2.7', '2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0', '1.9', '1.8', '1.7', '1.6', '1.5', '1.4', '1.3', '1.2', '1.1', '1.0' ]
   en/cloud/: []
   en/cloud-enterprise/: [ '4.0', '3.8', '3.7', '3.6', '3.5', '3.4', '3.3', '3.2', '3.1', '3.0', '2.13', '2.12', '2.11', '2.10', '2.9', '2.8', '2.7', '2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0', '1.1', '1.0' ]
-  en/ecctl/: [ '1.13', '1.12', '1.11', '1.10', '1.9', '1.8', '1.7', '1.6', '1.5', '1.4', '1.3', '1.2', '1.1', '1.0' ]
+  en/ecctl/: [ '1.14+', '1.13', '1.12', '1.11', '1.10', '1.9', '1.8', '1.7', '1.6', '1.5', '1.4', '1.3', '1.2', '1.1', '1.0' ]
   en/ecs-logging/: []
   en/ecs-logging/dotnet/: [ '8.18.1' ]
   en/ecs-logging/go-logrus/: [ '1.0.0' ]

src/tooling/docs-assembler/navigation.yml

@@ -103,12 +103,14 @@ toc:
       # https://github.com/elastic/docs-content/blob/main/release-notes/elastic-cloud-serverless/toc.yml
       - toc: docs-content://release-notes/elastic-cloud-serverless
         path_prefix: release-notes/cloud-serverless
+
       # Cloud Hosted
       # https://github.com/elastic/cloud/blob/master/docs/release-notes/cloud-hosted/toc.yml
       # We probably need to add `max_toc_depth: 2` to
       # 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
@@ -204,6 +206,11 @@ toc:
       - toc: ecs://release-notes
         path_prefix: release-notes/ecs
 
+      # ECCTL
+      # https://github.com/elastic/ecctl/blob/master/docs/release-notes/toc.yml
+      - toc: ecctl://release-notes
+        path_prefix: release-notes/ecctl
+
   #############
   # REFERENCE #
   #############
@@ -357,11 +364,6 @@ toc:
               - toc: docs-content://reference/apm-agents
                 path_prefix: reference/apm-agents
                 children:
-                  # APM Android agent
-                  # ✅ https://github.com/elastic/apm-agent-android/blob/main/docs/reference/toc.yml
-                  - toc: apm-agent-android://reference
-                    path_prefix: reference/apm/agents/android
-                    # Children include the entire AsciiDoc book
 
                   # APM .NET agent
                   # ✅ https://github.com/elastic/apm-agent-dotnet/blob/main/docs/reference/toc.yml
@@ -375,12 +377,6 @@ toc:
                     path_prefix: reference/apm/agents/go
                     # Children include the entire AsciiDoc book
 
-                  # APM iOS agent
-                  # ✅ https://github.com/elastic/apm-agent-ios/blob/main/docs/reference/toc.yml
-                  - toc: apm-agent-ios://reference
-                    path_prefix: reference/apm/agents/ios
-                    # Children include the entire AsciiDoc book
-
                   # APM Java agent
                   # ✅ https://github.com/elastic/apm-agent-java/blob/main/docs/reference/toc.yml
                   - toc: apm-agent-java://reference