Merge branch 'update-cli-add-cf-repos' of github.com:elastic/docs-builder into update-cli-add-cf-repos

Author: theletterf

.github/workflows/build-api-lambda.yml

@@ -36,7 +36,7 @@ jobs:
           stat "${BINARY_PATH}"
       - name: Archive artifact
         id: upload-artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: api-lambda-binary
           retention-days: 1

.github/workflows/build-link-index-updater-lambda.yml

@@ -33,7 +33,7 @@ jobs:
           stat "${BINARY_PATH}"
       - name: Archive artifact
         id: upload-artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: link-index-updater-lambda-binary
           retention-days: 1

.github/workflows/deploy-api-lambda.yml

@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Download bootstrap binary
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: api-lambda-binary # Defined in build-api-lambda.yml
 

.github/workflows/release.yml

@@ -102,7 +102,7 @@ jobs:
     steps:
 
       - name: Download bootstrap binary
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with: 
           name: link-index-updater-lambda-binary # Defined in build-link-index-updater-lambda.yml
 

Directory.Packages.props

@@ -13,16 +13,16 @@
   <!-- AWS -->
   <ItemGroup>
     <PackageVersion Include="Amazon.Lambda.AspNetCoreServer.Hosting" Version="1.9.0" />
-    <PackageVersion Include="Amazon.Lambda.RuntimeSupport" Version="1.13.1" />
-    <PackageVersion Include="Amazon.Lambda.Core" Version="2.7.0" />
+    <PackageVersion Include="Amazon.Lambda.RuntimeSupport" Version="1.13.4" />
+    <PackageVersion Include="Amazon.Lambda.Core" Version="2.7.1" />
     <PackageVersion Include="Amazon.Lambda.S3Events" Version="3.1.0" />
     <PackageVersion Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
     <PackageVersion Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
-    <PackageVersion Include="Aspire.Hosting" Version="9.4.2" />
+    <PackageVersion Include="Aspire.Hosting" Version="9.5.2" />
     <PackageVersion Include="Aspire.Hosting.Testing" Version="9.4.2" />
-    <PackageVersion Include="AWSSDK.Core" Version="4.0.0.2" />
+    <PackageVersion Include="AWSSDK.Core" Version="4.0.1.2" />
     <PackageVersion Include="AWSSDK.SQS" Version="4.0.0.1" />
-    <PackageVersion Include="AWSSDK.S3" Version="4.0.0.1" />
+    <PackageVersion Include="AWSSDK.S3" Version="4.0.7.14" />
     <PackageVersion Include="Elastic.OpenTelemetry" Version="1.1.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
     <PackageVersion Include="KubernetesClient" Version="17.0.14" />
@@ -83,7 +83,7 @@
   <!-- Test packages -->
   <ItemGroup>
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.4.2" />
-    <PackageVersion Include="AngleSharp.Diffing" Version="1.0.0" />
+    <PackageVersion Include="AngleSharp.Diffing" Version="1.1.0" />
     <PackageVersion Include="DiffPlex" Version="1.7.2" />
     <PackageVersion Include="FluentAssertions" Version="7.2.0" />
     <PackageVersion Include="FsUnit.xUnit" Version="7.0.1" />

config/assembler.yml

@@ -82,7 +82,7 @@ references:
   apm-aws-lambda:
   apm-k8s-attacher:
   ecs:
-    current: 9.1 # releases do not always align with the Stack version
+    current: 9.2 # releases do not always align with the Stack version
     next: main
   ecs-dotnet:
   ecs-logging-go-logrus:

config/versions.yml

@@ -19,11 +19,11 @@ versioning_systems:
   ech: *all
   eck:
     base: 3.0
-    current: 3.1.0
+    current: 3.2.0
   ess: *all
   ecs:
     base: 9.0
-    current: 9.1.0
+    current: 9.2.0
   self: *stack
   ecctl:
     base: 1.0
@@ -73,7 +73,7 @@ versioning_systems:
   # EDOTs
   edot-collector:
     base: 9.0
-    current: 9.1.5
+    current: 9.2.0
   edot-ios:
     base: 1.0
     current: 1.4.0
@@ -97,7 +97,7 @@ versioning_systems:
     current: 1.9.0
   edot-cf-aws:
     base: 0.1
-    current: 0.2.0
+    current: 0.2.4
   edot-cf-azure:
     base: 0.1
     current: 0.6.0

docs/contribute/cumulative-docs/_snippets/applies-switch-and-tabs.md

@@ -0,0 +1,6 @@
+:::{tip} - Use applies-switch instead of traditional tabs
+
+When you'd like to build a tabbed experience for content that varies specifically between two or more versions, or between two or more deployment types, prefer using [applies-switch](/syntax/applies-switch.md) over regular [tabs](/syntax/tabs.md).
+
+**Applies-switch** natively support using `applies_to` metadata keys as tab titles and offer a more consistent experience with recognizable badges. 
+:::

docs/contribute/cumulative-docs/badge-placement.md

@@ -177,26 +177,17 @@ If needed, break the contents of the cell into multiple lines using `<br>` to is
 
 ### Tabs
 
-In the future ([elastic/docs-builder#1436](https://github.com/elastic/docs-builder/issues/1436)), tabs will be able to accept `applies_to` information. Until then, if an `applies_to` badge is relevant to the entire tab item, add the badge to the beginning of the content.
-
-% TO DO: Add example
-% <image>
+When you need to show versions as tab titles, consider using [applies-switch](/syntax/applies-switch.md) instead. The applies-switch component has built-in support for using applies-to metadata as tab titles and render these as badges.
 
 ### Admonitions
 
-In the future ([elastic/docs-builder#1436](https://github.com/elastic/docs-builder/issues/1436)), admonitions will be able to accept `applies_to` information. Until then, if an `applies_to` badge is relevant to the entire admonition, add the badge to the beginning of the content.
-
-::::{image} ./images/admonition-correct.png
-:screenshot:
-:alt:
-::::
+:::{include} /syntax/_snippets/applies-to-admonitions.md
+:::
 
 ### Dropdowns
 
-In the future ([elastic/docs-builder#1436](https://github.com/elastic/docs-builder/issues/1436)), dropdowns will be able to accept `applies_to` information. Until then, if an `applies_to` badge is relevant to the entire dropdown, add the badge to the beginning of the content.
-
-% TO DO: Add example
-% <image>
+:::{include} /syntax/_snippets/applies-to-dropdowns.md
+:::
 
 ### Code blocks
 

docs/contribute/cumulative-docs/example-scenarios.md

@@ -400,6 +400,9 @@ Using a code callout is the lightest-touch solution, but might not be sufficient
 
 ### Solution B: Use tabs [code-block-tabs]
 
+:::{include} _snippets/applies-switch-and-tabs.md
+:::
+
 **When to use tabs**: If using a [code callout](#code-block-callout) isn't appropriate.
 
 **Best practices**:
@@ -443,6 +446,9 @@ but might not be sufficient in all cases.
 
 ### Solution B: Use tabs [workflow-tabs]
 
+:::{include} _snippets/applies-switch-and-tabs.md
+:::
+
 Tabs are minimally disruptive in many situations.
 
 **When to use tabs**:
@@ -497,6 +503,9 @@ Sometimes the UI differs between versions, deployment types or other conditions.
 
 ### Solution A: Use tabs [screenshot-tabs]
 
+:::{include} _snippets/applies-switch-and-tabs.md
+:::
+
 **When to use tabs**:
 * When the screenshot shows significantly different interfaces or workflows for each product, deployment type, or version.
 * When the screenshot represents a specific, interactive action, like clicking a button or navigating a UI that changes meaningfully between contexts.
@@ -533,6 +542,9 @@ For example, versioning the screenshot on the [Dashboards](https://www.elastic.c
 
 ### Solution A: Use tabs [multiple-block-tabs]
 
+:::{include} _snippets/applies-switch-and-tabs.md
+:::
+
 **When to use tabs**:
 * When the content is structurally similar but differs in detail — for example, slightly different instructions, outputs, or paths.
 * When you want to avoid repeating most of the surrounding content and isolate just the difference.