Merge branch 'main' into ecs-9.1

Author: mjwolf

.github/actions/aws-auth/action.yml

@@ -37,7 +37,7 @@ runs:
           with open(os.environ["GITHUB_OUTPUT"], "a") as f:
             f.write(f"result=arn:aws:iam::{os.environ["AWS_ACCOUNT_ID"]}:role/{prefix}{hash}")
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
+      uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
       with:
         role-to-assume: ${{ steps.role_arn.outputs.result }}
         aws-region: ${{ inputs.aws_region }}

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

@@ -39,7 +39,7 @@ jobs:
         run: |
           zip -j "${ZIP_FILE}" ./bootstrap
 
-      - uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
+      - uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
         with:
           role-to-assume: arn:aws:iam::197730964718:role/elastic-docs-v3-api-deployer-edge
           aws-region: us-east-1

.github/workflows/preview-build.yml

@@ -117,10 +117,10 @@ jobs:
     outputs:
       any_modified: ${{ steps.check-files.outputs.any_modified }}
       all_changed_files: ${{ steps.check-files.outputs.all_changed_files }}
-      added_files: ${{ steps.check-files.outputs.added_files }}
-      modified_files: ${{ steps.check-files.outputs.modified_files }}
-      deleted_files: ${{ steps.check-files.outputs.deleted_files }}
-      renamed_files: ${{ steps.check-files.outputs.renamed_files }}
+      added_files: ${{ steps.check-modified-file-detail.outputs.added_files }}
+      modified_files: ${{ steps.check-modified-file-detail.outputs.modified_files }}
+      deleted_files: ${{ steps.check-modified-file-detail.outputs.deleted_files }}
+      renamed_files: ${{ steps.check-modified-file-detail.outputs.renamed_files }}
     steps:
       - name: Checkout
         if: contains(fromJSON('["push", "merge_group", "workflow_dispatch"]'), github.event_name)
@@ -139,6 +139,61 @@ jobs:
             .github/**
             README.md
 
+      - name: Get modified file detail
+        if: contains(fromJSON('["merge_group", "pull_request", "pull_request_target"]'), github.event_name)
+        id: check-modified-file-detail
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        env:
+          PATH_PATTERN: "${{ inputs.path-pattern != '' && inputs.path-pattern || '**' }}"
+          IGNORE_PATTERNS: |
+            ${{ inputs.path-pattern-ignore }}
+            .github/**
+            README.md
+        with:
+          script: |
+            const pathPattern = process.env.PATH_PATTERN;
+            const ignorePatterns = process.env.IGNORE_PATTERNS;
+            const ignoreGlobber = await glob.create(ignorePatterns);
+            const ignoredPaths = new Set(await ignoreGlobber.glob());
+            
+            const { owner, repo } = context.repo;
+            const pull_number = context.payload.pull_request.number;
+            
+            const allFiles = await github.paginate(github.rest.pulls.listFiles, {
+              owner,
+              repo,
+              pull_number,
+            });
+            
+            const filteredFiles = allFiles.filter(file => !ignoredPaths.has(file.filename));
+            
+            const added = [];
+            const modified = [];
+            const deleted = [];
+            const renamed = [];
+            
+            for (const file of filteredFiles) {
+              switch (file.status) {
+                case 'added':
+                  added.push(file.filename);
+                  break;
+                case 'modified':
+                  modified.push(file.filename);
+                  break;
+                case 'removed':
+                  deleted.push(file.filename);
+                  break;
+                case 'renamed':
+                  renamed.push(`${file.previous_filename}:${file.filename}`);
+                  break;
+              }
+            }
+            
+            core.setOutput('added_files', added.join(' '));
+            core.setOutput('modified_files', modified.join(' '));
+            core.setOutput('deleted_files', deleted.join(' '));
+            core.setOutput('renamed_files', renamed.join(' '));              
+
   build:
     if: github.event.repository.fork == false # Skip running the job on the fork itself (It still runs on PRs on the upstream from forks)
     runs-on: ubuntu-latest
@@ -256,6 +311,21 @@ jobs:
         run: |
           dotnet run --project src/tooling/docs-builder -- diff validate
 
+      - name: 'Validate redirect rules'
+        if: >
+          env.MATCH == 'true'
+          && (
+            github.repository != 'elastic/docs-builder'
+            && (
+              steps.deployment.outputs.result
+              || (
+                needs.check.outputs.any_modified == 'true'
+                && github.event_name == 'merge_group'
+              )
+            )
+          )
+        uses: elastic/docs-builder/actions/diff-validate@main
+
       # we run our artifact directly, please use the prebuild
       # elastic/docs-builder@main GitHub Action for all other repositories!
       - name: Build documentation

.github/workflows/release.yml

@@ -99,7 +99,7 @@ jobs:
         run: |
           zip -j "${ZIP_FILE}" ./bootstrap
 
-      - uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
+      - uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
         with:
           role-to-assume: arn:aws:iam::197730964718:role/elastic-docs-v3-link-index-updater-deployer
           aws-region: us-east-2

actions/diff-validate/action.yml

@@ -2,9 +2,8 @@ name: 'Validate Redirect Rules'
 description: 'Validates consistency of the documentation changes in relation to redirect rules'
 
 runs:
-  using: "composite"
-  steps:
-    - name: Validate Redirect Rules
-      uses: elastic/docs-builder@main
-      with:
-        command: "diff validate"
+  using: 'docker'
+  image: "docker://ghcr.io/elastic/docs-builder:edge"
+  args:
+    - "diff"
+    - "validate"

actions/update-link-index/action.yml

@@ -42,7 +42,7 @@ runs:
           with open(os.environ["GITHUB_OUTPUT"], "a") as f:
             f.write(f"result=arn:aws:iam::{aws_account_id}:role/{prefix}{hash}")
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
+      uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
       with:
         role-to-assume: ${{ steps.role_arn.outputs.result }}
         aws-region: us-east-1

config/assembler.yml

@@ -30,6 +30,8 @@ environments:
     uri: http://localhost:4000
     content_source: current
     path_prefix: docs
+    feature_flags:
+      SEARCH_OR_ASK_AI: true
 
 shared_configuration:
   stack: &stack

config/legacy-url-mappings.yml

@@ -13,7 +13,7 @@ mappings:
   en/apm/agent/java/: ['1.54.0', '0.7', '0.6']
   en/apm/agent/nodejs/: [ '4.x', '3.x', '2.x', '1.x' ]
   en/apm/agent/php/: [ '1.15.1', '1.x' ]
-  en/apm/agent/python/: [ '6.23.0', '5.x', '4.x', '3.x', '2.x', '1.x' ]
+  en/apm/agent/python/: [ '6.24.0', '5.x', '4.x', '3.x', '2.x', '1.x' ]
   en/apm/agent/ruby/: [ '4.8.0', '3.x', '2.x', '1.x' ]
   en/apm/agent/rum-js/: [ '5.17.0', '4.x', '3.x', '2.x', '1.x', '0.x' ]
   en/apm/agent/swift/: [ '1.2.1', '0.x' ]

config/versions.yml

@@ -56,7 +56,7 @@ versioning_systems:
     current: 1.15.1
   apm_agent_python:
     base: 6.0
-    current: 6.23.0
+    current: 6.24.0
   apm_agent_ruby:
     base: 4.0
     current: 4.8.0
@@ -67,7 +67,7 @@ versioning_systems:
   # EDOTs
   edot_collector:
     base: 9.0
-    current: 9.1.0
+    current: 9.1.2
   edot_ios:
     base: 1.0
     current: 1.2.1

docs/contribute/redirects.md

@@ -16,7 +16,11 @@ For API redirects, consult with the documentation engineering team on Slack (#el
 
 For elastic.co/guide redirects, open a [web team request](http://ela.st/web-request).
 
-## File location.
+## Validation
+
+Running `docs-builder diff validate` will give you feedback on whether all necessary redirect rules are in place after your changes. It will also run on pull requests.
+
+## File location
 
 Redirects are configured at the content set-level.
 The configuration file should be located next to your `docset.yml` file: