Merge remote-tracking branch 'origin/main' into feature/api-docs-multiple

Author: Mpdreamz

src/tooling/docs-assembler/assembler.yml renamed to config/assembler.yml

@@ -20,19 +20,26 @@ environments:
   edge: 
     uri: https://d34ipnu52o64md.cloudfront.net
     path_prefix: docs
-    content_source: current
+    content_source: edge
     google_tag_manager:
       enabled: false
     feature_flags:
       LAZY_LOAD_NAVIGATION: true
   dev:
     uri: http://localhost:4000
-    content_source: next
+    content_source: current
     path_prefix: docs
 
-named_git_references:
-  stack: &stack 9.0
-  cloud-hosted: ms-120
+shared_configuration:
+  stack: &stack
+    current:  9.0
+    next: 9.1
+    edge: main
+
+  master: &master
+    current: master
+    next: master
+    edge: master
 
 ###
 # 'narrative' shares the same keys as keys in 'references' (<repository_config>)
@@ -67,9 +74,6 @@ references:
   apm-agent-rum-js:
   apm-aws-lambda:
   apm-k8s-attacher:
-  beats:
-    current: "9.0"
-    next: main
   ecs-dotnet:
   ecs-logging-go-logrus:
   ecs-logging-go-zap:
@@ -80,9 +84,6 @@ references:
   ecs-logging-python:
   ecs-logging-ruby:
   ecs-logging:
-  ecs:
-    current: "9.0"
-    next: main
   elastic-otel-dotnet:
   elastic-otel-java:
   elastic-otel-node:
@@ -92,22 +93,20 @@ references:
   integration-docs:
   integrations:
   logstash-docs-md:
-  logstash:
-    current: "9.0"
-    next: main
   opentelemetry:
-  
+
+  #stack aligned using gated deploys
+  beats: *stack
+  logstash: *stack
+  ecs:
+    <<: *stack
+    next: main
+
   # @elastic/admin-docs
   cloud-on-k8s:
-  cloud:
-    current: master
-    next: master
-  curator:
-    current: master
-    next: master
-  ecctl:
-    current: master
-    next: master
+  cloud: *master
+  curator: *master
+  ecctl: *master
 
   # @elastic/admin-docs and @elastic/developer-docs
   elasticsearch:

src/tooling/docs-assembler/legacy-url-mappings.yml renamed to config/legacy-url-mappings.yml

@@ -1,7 +1,7 @@
 versioning_systems:
   stack: &stack
     base: 9.0
-    current: 9.0
+    current: 9.0.3
 
   # Using an unlikely high version
   # So that our logic that would display "planned" doesn't trigger
@@ -91,4 +91,4 @@ versioning_systems:
   edot_cf_aws:
     base: 0.1
     current: 0.1.6
-  
+  

src/tooling/docs-assembler/navigation.yml renamed to config/navigation.yml

@@ -111,6 +111,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation.Legac
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation.LegacyDocs.Tests", "tests\Elastic.Documentation.LegacyDocs.Tests\Elastic.Documentation.LegacyDocs.Tests.csproj", "{164F55EC-9412-4CD4-81AD-3598B57632A6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{6FAB566B-76E3-4E90-8A5C-E75B0F1E1C63}"
+	ProjectSection(SolutionItems) = preProject
+		config\versions.yml = config\versions.yml
+		config\assembler.yml = config\assembler.yml
+		config\legacy-url-mappings.yml = config\legacy-url-mappings.yml
+		config\navigation.yml = config\navigation.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

src/Elastic.Documentation.Configuration/versions.yml renamed to config/versions.yml

@@ -94,13 +94,15 @@ toc:
       - file: frontmatter.md
       - file: icons.md
       - file: images.md
+      - file: kbd.md
       - file: lists.md
       - file: line_breaks.md
       - file: links.md
       - file: passthrough.md
       - file: sidebars.md
       - file: stepper.md
       - file: substitutions.md
+      - file: version-variables.md
       - file: sundries.md
       - file: tables.md
       - file: tabs.md
@@ -123,6 +125,10 @@ toc:
       - file: custom-highlighters.md
       - hidden: archive.md
       - hidden: landing-page.md
+      - file: nest-under-index/index.md
+        children:
+          - file: nest-under-index/nested-page-1.md
+          - file: nest-under-index/nested-page-2.md
       - folder: mover
         children:
           - file: first-page.md

docs-builder.sln

@@ -35,7 +35,7 @@ Tagged
 
 This is the default. To get started, follow our [guide](/migration/guide/index.md) to set up the new docs folder structure and CI configuration.
 
-Once setup ensure the repository is added to our `assembler.yml`  under `references`. 
+Once setup ensure the repository is added to our [`assembler.yml`](https://github.com/elastic/docs-builder/blob/main/config/assembler.yml)  under `references`. 
 
 For example say you want to onboard `elastic/my-repository` into the production build:
 
@@ -59,7 +59,7 @@ Once the repository is added, its navigation still needs to be injected into to
 ### Tagged
 
 If you want to have more control over the timing of when your docs go live to production. Configure the repository
-in our `assembler.yml` to have a fixed git reference (typically a branch) deploy the `current` content source to production.
+in our [`assembler.yml`](https://github.com/elastic/docs-builder/blob/main/config/assembler.yml) to have a fixed git reference (typically a branch) deploy the `current` content source to production.
 
 ```yaml
 references:
@@ -101,4 +101,4 @@ jobs:
       pull-requests: write
 ```
 
-1. Ensure version branches are built and publish their links ahead of time.
+1. Ensure version branches are built and publish their links ahead of time.

docs/_docset.yml

@@ -1,13 +1,13 @@
 # `assembler.yml`
 
-The global navigation is defined in the `assembler.yml` file. This file can roughly be thought of as the V3 equivalent of conf.yaml in the asciidoc build system. This file, which writers own, allows for arbitrary nesting of `docset.yml` and `toc.yml` references. This file will live in the `elastic/docs-content` repository, but will not build or have any influence over the `docs-builder` builds in that repo.
+The global navigation is defined in the [`assembler.yml`](https://github.com/elastic/docs-builder/blob/main/config/assembler.yml) file. This file can roughly be thought of as the V3 equivalent of conf.yaml in the asciidoc build system. This file, which writers own, allows for arbitrary nesting of `docset.yml` and `toc.yml` references. This file will live in the `elastic/docs-content` repository, but will not build or have any influence over the `docs-builder` builds in that repo.
 
-The global navigation that is defined in `assembler.yml` can be composed of three main resources:
+The global navigation that is defined in [`assembler.yml`](https://github.com/elastic/docs-builder/blob/main/config/assembler.yml) can be composed of three main resources:
 1. Local TOC files: toc.yml files that live in the docs-content repository.
 2. External TOC files: A subset of a content set (represented by a toc.yml file) that is external to the docs-content repository.
 3. External content set declarations: An entire docset.yml file that is external to the docs-content repository.
 
-The `assembler.yml` file might look something like this:
+The [`assembler.yml`](https://github.com/elastic/docs-builder/blob/main/config/assembler.yml) file might look something like this:
 
 ```yaml
 

docs/configure/content-sources.md

@@ -22,8 +22,8 @@ TBD
 In both the AsciiDoctor- and V3-based system, there is site-wide configuration where you list all content sources, where to find those sources, and in what order they should be added to the site.
 
 In the AsciiDoctor system, this all happens in one YAML file in the `/docs` repo. In the V3 system:
-* Content configuration happens in the [`assembler.yml`](https://github.com/elastic/docs-builder/blob/main/src/tooling/docs-assembler/assembler.yml) file in `docs-builder`.
-* Navigation configuration happens in the [`navigation.yml`](https://github.com/elastic/docs-builder/blob/main/src/tooling/docs-assembler/navigation.yml) file in `docs-builder`.
+* Content configuration happens in the [`assembler.yml`](https://github.com/elastic/docs-builder/blob/main/config/assembler.yml) file in `docs-builder`.
+* Navigation configuration happens in the [`navigation.yml`](https://github.com/elastic/docs-builder/blob/main/config/navigation.yml) file in `docs-builder`.
 
 [assembler.yml](./content.md)
 

docs/configure/site/content.md

@@ -12,10 +12,9 @@ Specifically for versioned products, badges will display differently when the `a
 
   Example: {applies_to}`stack: removed 99.99`
 
-This is computed at build time (there is a docs build every 30 minutes). The documentation team tracks and maintains released versions for these products centrally in [versions.yml](https://github.com/elastic/docs-builder/blob/main/src/Elastic.Documentation.Configuration/versions.yml).
-
+This is computed at build time (there is a docs build every 30 minutes). The documentation team tracks and maintains released versions for these products centrally in [`versions.yml`](https://github.com/elastic/docs-builder/blob/main/config/versions.yml). 
 When multiple lifecycle statuses and versions are specified in the sources, several badges are shown.
 
 :::{note}
 Visuals and wording in the output documentation are subject to changes and optimizations.
-:::
+:::