Merge branch 'main' into curator-8-to-legacy

Author: shainaraskas

.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@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0
+      uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0
       with:
         role-to-assume: ${{ steps.role_arn.outputs.result }}
         aws-region: ${{ inputs.aws_region }}

.github/actions/bootstrap/action.yml

@@ -38,7 +38,7 @@ runs:
         echo "full-version=${REPO_VERSION}" >> $GITHUB_OUTPUT
         echo "major-version=$(echo ${REPO_VERSION} | cut -d"." -f1)" >> $GITHUB_OUTPUT
         
-    - uses: actions/setup-node@v5
+    - uses: actions/setup-node@v6
       with:
         cache: npm
         cache-dependency-path: src/Elastic.Documentation.Site/package-lock.json

.github/workflows/ci.yml

@@ -77,7 +77,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - uses: actions/setup-node@v5
+      - uses: actions/setup-node@v6
         with:
           cache: npm
           cache-dependency-path: src/Elastic.Documentation.Site/package-lock.json

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

@@ -45,7 +45,7 @@ jobs:
         run: |
           zip -j "${ZIP_FILE}" ./bootstrap
 
-      - uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0
+      - uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0
         with:
           role-to-assume: arn:aws:iam::197730964718:role/elastic-docs-v3-api-deployer-${{ inputs.environment }}
           aws-region: us-east-1

.github/workflows/preview-build.yml

@@ -82,6 +82,7 @@ jobs:
       content-source-match: ${{ steps.event-check.outputs.content-source-match != '' && steps.event-check.outputs.content-source-match || steps.match.outputs.content-source-match }}
       content-source-next: ${{ steps.event-check.outputs.content-source-next != '' && steps.event-check.outputs.content-source-next || steps.match.outputs.content-source-next }}
       content-source-current: ${{ steps.event-check.outputs.content-source-current != '' && steps.event-check.outputs.content-source-current || steps.match.outputs.content-source-current }}
+      content-source-edge: ${{ steps.event-check.outputs.content-source-edge != '' && steps.event-check.outputs.content-source-edge || steps.match.outputs.content-source-edge }}
       content-source-speculative: ${{ steps.event-check.outputs.content-source-speculative != '' && steps.event-check.outputs.content-source-speculative || steps.match.outputs.content-source-speculative }}
     steps:
       - name: Not a push event
@@ -92,6 +93,7 @@ jobs:
           echo "content-source-match=true" >> $GITHUB_OUTPUT
           echo "content-source-next=false" >> $GITHUB_OUTPUT
           echo "content-source-current=false" >> $GITHUB_OUTPUT
+          echo "content-source-edge=false" >> $GITHUB_OUTPUT
           echo "content-source-speculative=false" >> $GITHUB_OUTPUT
       - name: Match for push events
         id: match
@@ -106,6 +108,7 @@ jobs:
           echo "content-source-match=${{ steps.event-check.outputs.content-source-match != '' && steps.event-check.outputs.content-source-match || steps.match.outputs.content-source-match }}"
           echo "content-source-next=${{ steps.event-check.outputs.content-source-next != '' && steps.event-check.outputs.content-source-next || steps.match.outputs.content-source-next }}"
           echo "content-source-current=${{ steps.event-check.outputs.content-source-current != '' && steps.event-check.outputs.content-source-current || steps.match.outputs.content-source-current }}"
+          echo "content-source-current=${{ steps.event-check.outputs.content-source-edge != '' && steps.event-check.outputs.content-source-edge || steps.match.outputs.content-source-edge }}"
           echo "content-source-speculative=${{ steps.event-check.outputs.content-source-speculative != '' && steps.event-check.outputs.content-source-speculative || steps.match.outputs.content-source-speculative }}"
           echo "ref=${{ github.ref_name }}"
           echo "repo=${{ github.repository }}"
@@ -449,6 +452,10 @@ jobs:
           && (steps.docs-build.outputs.skip != 'true' || steps.internal-docs-build.outputs.skip != 'true')
           && steps.deployment.outputs.result
           && (steps.docs-build.outcome == 'success' || steps.internal-docs-build.outcome == 'success')
+        env:
+          # https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-retries.html#cli-usage-retries-configure
+          AWS_RETRY_MODE: standard
+          AWS_MAX_ATTEMPTS: 6
         run: |
           aws s3 sync .artifacts/docs/html "s3://elastic-docs-v3-website-preview${PATH_PREFIX}" --delete --no-follow-symlinks
           aws cloudfront create-invalidation \
@@ -460,11 +467,6 @@ jobs:
           env.MATCH == 'true'
           && (
             contains(fromJSON('["push", "workflow_dispatch"]'), github.event_name) 
-            && (
-              needs.match.outputs.content-source-current == 'true' 
-              || needs.match.outputs.content-source-next == 'true'
-              || needs.match.outputs.content-source-speculative == 'true'
-            ) 
             && steps.s3-upload.outcome == 'success'
           )
         uses: elastic/docs-builder/actions/update-link-index@main

.github/workflows/release.yml

@@ -110,7 +110,7 @@ jobs:
         run: |
           zip -j "${ZIP_FILE}" ./bootstrap
 
-      - uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0
+      - uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0
         with:
           role-to-assume: arn:aws:iam::197730964718:role/elastic-docs-v3-link-index-updater-deployer
           aws-region: us-east-2

.github/workflows/required-labels.yml

@@ -19,6 +19,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
+      - name: Wait for PR to be ready (if just opened)
+        if: github.event_name == 'pull_request_target' && github.event.action == 'opened'
+        run: sleep 30
       - id: get-labels
         run: |
           labels=$(yq '[.categories[].labels] + .exclude-labels | flatten | unique | sort | @tsv' .github/release-drafter.yml | tr '\t' ',')

Directory.Packages.props

@@ -23,11 +23,13 @@
     <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" />
+    <PackageVersion Include="Elastic.OpenTelemetry" Version="1.1.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0"/>
     <PackageVersion Include="KubernetesClient" Version="17.0.14" />
     <PackageVersion Include="Elastic.Aspire.Hosting.Elasticsearch" Version="9.3.0" />
     <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.1.4" />
     <PackageVersion Include="FakeItEasy" Version="8.3.0" />
-    <PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.14.0" />
+    <PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.15.1" />
     <PackageVersion Include="InMemoryLogger" Version="1.0.66" />
     <PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.6.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
@@ -75,7 +77,6 @@
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
   </ItemGroup>

README.md

@@ -102,15 +102,36 @@ jobs:
 To set up the tool to publish to GitHub Pages, use the following configuration.
 
 ```yaml
-environment:
-  name: github-pages
-  url: ${{ steps.deployment.outputs.page_url }}
-steps:
-  - uses: actions/checkout@v4
-    
-  - name: Publish Github
-    uses: elastic/docs-builder/actions/publish@main
-    id: deployment
+name: Build the docs
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  docs:
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Publish Github
+        uses: elastic/docs-builder/actions/publish@main
+        id: deployment
+        with:
+          continue-on-error: "true"
+          private: true
 ```
 
 This single action will build and validate the documentation before publishing.

actions/assembler-match/action.yml

@@ -20,6 +20,8 @@ outputs:
     description: "true/false indicating the branch acts as the next content source"
   content-source-current:
     description: "true/false indicating the branch acts as the current content source"
+  content-source-edge:
+    description: "true/false indicating the branch acts as the edge content source"
   content-source-speculative:
     description: "true/false speculative match, used to build version branches before they are marked as current/next"