Merge branch 'main' into more-guidance-versioning

Author: shainaraskas

.github/dependabot.yml

@@ -17,6 +17,11 @@ updates:
       day: 'monday'
       time: '08:00'
     groups:
+      eslint:
+        patterns:
+          - 'eslint'
+          - '@eslint/*'
+          - 'typescript-eslint'
       eui:
         patterns:
           - '@elastic/eui*'

.github/workflows/preview-build.yml

@@ -43,12 +43,17 @@ on:
         type: string
         default: 'false'
         required: false
+      disable-comments:
+        description: 'Disable comments'
+        type: boolean
+        default: false
+        required: false
 
 permissions:
   id-token: write
   deployments: write
   contents: read
-  pull-requests: read
+  pull-requests: write
 
 jobs:
   match:
@@ -231,6 +236,81 @@ jobs:
           aws cloudfront create-invalidation \
             --distribution-id EKT7LT5PM8RKS \
             --paths "${PATH_PREFIX}" "${PATH_PREFIX}/*"
+          
+      - name: Comment on PR
+        continue-on-error: true
+        if: startsWith(github.event_name, 'pull_request') && inputs.disable-comments != 'true' && env.MATCH == 'true' && steps.deployment.outputs.result && steps.check-files.outputs.all_changed_files
+        uses: actions/github-script@v7
+        env:
+          ALL_CHANGED_FILES: ${{ steps.check-files.outputs.all_changed_files }}
+        with:
+          script: |
+            const title = '## 🔍 Preview links for changed docs'
+            const changedMdFiles = process.env.ALL_CHANGED_FILES
+              .split(/\s+/)
+              .filter(i => i.endsWith('.md'))
+              .filter(i => !i.includes('/_snippets/'));
+            
+            if (changedMdFiles.length === 0) {
+              return;
+            }
+            
+            const toLink = (file) => {
+              const path = file
+                .replace('docs/', '')
+                .replace('/index.md', '')
+                .replace('.md', '');
+              return `[${file}](https://docs-v3-preview.elastic.dev${process.env.PATH_PREFIX}/${path})`;
+            }
+            
+            const links = changedMdFiles.map(toLink)
+            
+            const body = [
+              title,
+              ...links.slice(0, 10).map(i => `- ${i}`),
+            ]
+            
+            if (links.length > 10) {
+              body.push('<details>');
+              body.push('<summary>More links …</summary>');
+              body.push('');
+              for (const link of links.slice(10, 100)) {
+                body.push(`- ${link}`);
+              }
+              body.push('');
+              body.push('</details>');
+            }
+            
+            if (links.length > 100) {
+              body.push('');
+              body.push(`<sub>In total, ${links.length} files changed.</sub>`);
+            }
+            
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+            const issue_number = context.payload.pull_request.number;
+            
+            // Post or update a single bot comment
+            const { data: comments } = await github.rest.issues.listComments({
+              owner, repo, issue_number
+            });
+            const existing = comments.find(c =>
+              c.user.type === 'Bot' &&
+              c.body.startsWith(title)
+            );
+            if (existing) {
+              await github.rest.issues.updateComment({
+                owner, repo,
+                comment_id: existing.id,
+                body: body.join('\n'),
+              });
+            } else {
+              await github.rest.issues.createComment({
+                owner, repo,
+                issue_number,
+                body:body.join('\n'),
+              });
+            }
 
       - name: Update Link Index
         if: |

Directory.Packages.props

@@ -13,8 +13,6 @@
     <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="AWSSDK.CloudFront" Version="4.0.0.10" />
-    <PackageVersion Include="AWSSDK.CloudFrontKeyValueStore" Version="4.0.0.9" />
     <PackageVersion Include="AWSSDK.Core" Version="4.0.0.2" />
     <PackageVersion Include="AWSSDK.SQS" Version="4.0.0.1" />
     <PackageVersion Include="AWSSDK.S3" Version="4.0.0.1" />

docs/migration/guide/mapping.md

@@ -6,4 +6,4 @@ navigation_title: What books were migrated?
 
 We did not migrate all Elastic documentation. We are purposefully leaving the majority of content behind in the legacy Asciidoc build system. This system will turn into our documentation archive.
 
-A full list of the content that was migrated to the V3 format is available [here](https://github.com/elastic/asciidocalypse/blob/main/docs/readme.md).
+A full list of the content that was migrated to the V3 format is available [here](https://github.com/elastic/asciidocalypse/tree/main-archive/docs#readme).

docs/migration/versioning.md

@@ -20,4 +20,4 @@ In this new system, documentation is written **cumulatively**. This means that a
 In Docs V3, a single branch is published per repository. This branch is set to `main` by default, but it is possible to instead publish a different branch by changing your repository's branching strategy. You might want to change your branching strategy so you can have more control over when content added for a specific release is published. 
 
 * [Learn how to choose the right branching strategy for your repository](/contribute/branching-strategy.md)
-* [Learn how to set up your selected branching strategy](/configure/content-sources.md)
+* [Learn how to set up your selected branching strategy](/configure/content-sources.md)

docs/syntax/applies.md

@@ -248,9 +248,38 @@ applies_to:
 ---
 ```
 
-## Inline Examples
 
-### Stack
+## Look and feel
+
+### Block
+
+```{applies_to}
+stack: preview 9.1
+serverless: planned
+
+apm_agent_dotnet: ga 1.0.0
+apm_agent_java: beta 1.0.0
+edot_dotnet: preview 1.0.0
+edot_python:
+edot_node: ga 1.0.0
+elasticsearch: preview 9.0.0
+security: removed 9.0.0
+observability: deprecated 9.0.0
+```
+
+### Inline
+
+#### In text
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas ut libero diam. Mauris sed eleifend erat,
+sit amet auctor odio. Donec ac placerat nunc. {applies_to}`stack: preview` Aenean scelerisque viverra lectus
+nec dignissim. Vestibulum ut felis nec massa auctor placerat. Maecenas vel dictum.
+
+- {applies_to}`elasticsearch: preview` Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas ut libero diam. Mauris sed eleifend erat, sit amet auctor odio. Donec ac placerat nunc. 
+- {applies_to}`observability: preview` Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas ut libero diam.
+- {applies_to}`security: preview` Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas ut libero diam. Mauris sed eleifend erat, sit amet auctor odio. Donec ac placerat nunc. Aenean scelerisque viverra lectus nec dignissim. 
+
+#### Stack
 
 | `applies_to`                               | result                               |
 |--------------------------------------------|--------------------------------------|
@@ -281,7 +310,7 @@ applies_to:
 | `` {applies_to}`stack: removed 9.1` ``     | {applies_to}`stack: removed 9.1`     |
 | `` {applies_to}`stack: removed 99.0` ``    | {applies_to}`stack: removed 99.0`    |
 
-### Serverless
+#### Serverless
 
 | `applies_to`                                    | result                                    |
 |-------------------------------------------------|-------------------------------------------|

docs/testing/req.md

@@ -1,7 +1,29 @@
+---
+applies_to:
+  stack: ga
+  serverless:
+    elasticsearch: ga
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/es-connectors-usage.html
+---
 # Requirements
 
+```{applies_to}
+stack: preview 9.0, ga 9.1
+```
+
+
+{applies_to}`stack: preview 9.0` This tutorial is based on Elasticsearch 9.0.
+This tutorial is based on Elasticsearch 9.0. This tutorial is based on Elasticsearch 9.0.
+This tutorial is based on Elasticsearch 9.0.
+
+what
+
+
 To follow this tutorial you will need to install the following components:
 
+
+
 - An installation of Elasticsearch, based on our hosted [Elastic Cloud](https://www.elastic.co/cloud) service (which includes a free trial period), or a self-hosted service that you run on your own computer. See the Install Elasticsearch section above for installation instructions.
 - A [Python](https://python.org) interpreter. Make sure it is a recent version, such as Python 3.8 or newer.
 

src/Elastic.Documentation.Configuration/Versions/Version.cs

@@ -82,7 +82,9 @@ public enum VersioningSystemId
 	[Display(Name = "edot_php")]
 	EdotPhp,
 	[Display(Name = "edot_python")]
-	EdotPython
+	EdotPython,
+	[Display(Name = "edot_cf_aws")]
+	EdotCfAws
 }
 
 [YamlSerializable]

src/Elastic.Documentation.Configuration/versions.yml

@@ -85,3 +85,7 @@ versioning_systems:
   edot_python:
     base: 1.0
     current: 1.3.0
+  edot_cf_aws:
+    base: 0.1
+    current: 0.1.6
+  

src/Elastic.Documentation.Site/Assets/markdown/applies-to.css

@@ -1,88 +1,48 @@
 @layer components {
-	.applies,
-	.applies-inline {
+	.applies {
 		cursor: default;
 
+		@apply text-subdued;
+
 		[data-tippy-content]:not([data-tippy-content='']) {
-			cursor: help;
-			border-radius: 9999px;
-			&:hover {
-				text-decoration: underline;
-			}
+			@apply cursor-help;
 		}
 
-		.applicable-meta-removed {
-			color: var(--color-red-90);
-		}
-		.applicable-meta-ga {
-			color: var(--color-green-90);
-		}
-		.applicable-meta-technical-preview {
-			color: var(--color-blue-elastic-80);
-		}
-		.applicable-meta-deprecated {
-			color: var(--color-pink-90);
+		.applicable-info {
+			@apply border-grey-20 inline-grid cursor-default grid-cols-[auto_1fr_auto] rounded-full border-[1px] bg-white pt-1.5 pr-3 pb-1.5 pl-3;
 		}
-		.applicable-meta-beta {
-			color: var(--color-poppy-90);
+
+		.applicable-name,
+		.applicable-meta {
+			@apply text-xs text-nowrap;
 		}
-		.applicable-meta-planned {
-			color: var(--color-grey-90);
+
+		.applicable-separator {
+			width: 1px;
+			height: 100%;
+			background-color: var(--color-grey-20);
+			margin-left: calc(var(--spacing) * 2);
+			margin-right: calc(var(--spacing) * 2);
 		}
 	}
 
-	.applies {
-		@apply font-sans;
-		border-bottom: 1px solid var(--color-grey-20);
-		padding-bottom: calc(var(--spacing) * 3);
-		font-variant: all-petite-caps;
+	.applies.applies-block {
+		@apply border-b-grey-20 flex flex-wrap gap-2 border-b-1 pb-4;
+	}
 
-		.applicable-info {
-			padding: calc(var(--spacing) * 0.5);
-			padding-left: calc(var(--spacing) * 2);
-			padding-right: calc(var(--spacing) * 2);
-			margin: calc(var(--spacing) * 0.5);
-			display: inline-block;
-			font-size: 0.8em;
-			border-radius: 0.4em;
-			background-color: var(--color-white);
-			border: 1px solid var(--color-grey-20);
-		}
-		.applicable-version {
-			font-weight: bold;
-			margin-left: calc(var(--spacing) * 0.5);
-			font-variant: none;
-			font-size: 0.87em;
+	.applies.applies-inline {
+		display: inline-block;
+		vertical-align: bottom;
+		.applicable-separator {
+			margin-left: calc(var(--spacing) * 1.5);
+			margin-right: calc(var(--spacing) * 1.5);
 		}
-		.applicable-lifecycle {
-			font-weight: bold;
-		}
-	}
-	.applies-inline {
-		@apply font-sans;
-		font-variant: all-petite-caps;
 		.applicable-info {
-			cursor: default;
-			padding: calc(var(--spacing) * 0.5);
-			padding-left: calc(var(--spacing) * 2);
-			padding-right: calc(var(--spacing) * 2);
-			margin-left: calc(var(--spacing) * 0.5);
-			margin-right: calc(var(--spacing) * 0.5);
-			display: inline-block;
-			font-size: 0.8em;
-			border-radius: 0.4em;
-			background-color: var(--color-white);
-			border: 1px solid var(--color-grey-20);
-			font-weight: normal;
-		}
-		.applicable-version {
-			font-weight: bold;
-			margin-left: calc(var(--spacing) * 0.5);
-			font-variant: none;
-			font-size: 0.87em;
+			@apply rounded-sm pt-1 pr-1.5 pb-1 pl-1.5;
 		}
-		.applicable-lifecycle {
-			font-weight: bold;
+		.applicable-name,
+		.applicable-meta {
+			font-size: 0.65em;
 		}
 	}
 }