Merge branch 'master' into test-version-mapping

bmorelli25 · web-flow · commit cdd08914dc28 · 2025-04-11T10:32:40.000-07:00
diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh
@@ -62,25 +62,25 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then
     # repositories with a docs dir and changelog
     "apm-aws-lambda" | "apm-agent-android" | "apm-agent-nodejs" | "apm-agent-python" | "apm-agent-ruby" | "apm-agent-rum-js" | "apm-agent-go" | "apm-agent-java" | "apm-agent-dotnet" | "apm-agent-php" | "apm-agent-ios")
       git fetch origin "$GITHUB_PR_TARGET_BRANCH"
-      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs CHANGELOG.asciidoc)
+      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./docs/**.asciidoc" CHANGELOG.asciidoc)
       ;;
 
-    # test glob
-    "ecs-logging")
+    # repositories with a docs dir that are migrated to docs-builder
+    "apm-k8s-attacher" | "cloud" | "ecs-logging" | "cloud-on-k8s" | "ecctl" | "ecs" | "ecs-dotnet" | "ecs-logging-go-logrus" | "ecs-logging-go-zap" | "ecs-logging-go-zerolog" | "ecs-logging-java" | "ecs-logging-nodejs" | "ecs-logging-php" | "ecs-logging-python" | "ecs-logging-ruby" | "elasticsearch-js" | "elasticsearch-ruby" | "elasticsearch-php"| "elasticsearch-rs" | "logstash" | "logstash-docs" | "security-docs")
       git fetch origin "$GITHUB_PR_TARGET_BRANCH"
-      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "**/*.asciidoc")
+      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./docs/**.asciidoc")
       ;;
 
-    # repositories with a docs dir
-    "apm-k8s-attacher" | "cloud" | "cloud-assets" | "cloud-on-k8s" | "ecctl" | "ecs" | "ecs-dotnet" | "ecs-logging-go-logrus" | "ecs-logging-go-zap" | "ecs-logging-go-zerolog" | "ecs-logging-java" | "ecs-logging-nodejs" | "ecs-logging-php" | "ecs-logging-python" | "ecs-logging-ruby" | "elasticsearch-js" | "elasticsearch-js-legacy" | "elasticsearch-ruby" | "elasticsearch-php" | "elasticsearch-perl" | "elasticsearch-rs" | "kibana-cn" | "logstash" | "logstash-docs" | "security-docs" | "sense" | "swiftype")
+    # repositories with a docs dir that are not migrated to docs-builder
+     "cloud-assets"  | "elasticsearch-js-legacy"  | "elasticsearch-perl" | "kibana-cn" | "sense" | "swiftype")
       git fetch origin "$GITHUB_PR_TARGET_BRANCH"
       docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs)
       ;;
 
     # repositories with a docs dir, changelogs dir, and changelog
     "apm-server")
       git fetch origin "$GITHUB_PR_TARGET_BRANCH"
-      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./changelogs CHANGELOG.asciidoc)
+      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./docs/**.asciidoc" "./changelogs/**.asciidoc" CHANGELOG.asciidoc)
       ;;
 
     "docs-content")
@@ -90,7 +90,7 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then
 
     "beats")
       git fetch origin "$GITHUB_PR_TARGET_BRANCH"
-      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./auditbeat ./CHANGELOG.asciidoc ./docs ./filebeat ./heartbeat ./journalbeat ./libbeat/docs ./libbeat/outputs/*/docs/* ./libbeat/processors/*/docs/* ./metricbeat ./packetbeat ./topbeat/docs ./winlogbeat ./x-pack/auditbeat ./x-pack/dockerlogbeat/docs ./x-pack/filebeat/docs ./x-pack/filebeat/processors/*/docs/* ./x-pack/functionbeat ./x-pack/libbeat/docs ./x-pack/libbeat/processors/*/docs/* ./x-pack/metricbeat/module)
+      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./auditbeat/**.asciidoc" ./**.asciidoc "./docs/**.asciidoc" "./filebeat/**.asciidoc" "./heartbeat/**.asciidoc" "./journalbeat/**.asciidoc" "./libbeat/docs/**.asciidoc" "./libbeat/outputs/*/docs/**.asciidoc" "./libbeat/processors/*/docs/**.asciidoc" "./metricbeat/**/*.asciidoc" "./packetbeat/**.asciidoc" "./topbeat/docs/**.asciidoc" "./winlogbeat/**.asciidoc" "./x-pack/auditbeat/**/*.asciidoc" "./x-pack/dockerlogbeat/docs/**.asciidoc" "./x-pack/filebeat/docs/**.asciidoc" "./x-pack/filebeat/processors/*/docs/**.asciidoc" "./x-pack/functionbeat/**.asciidoc" "./x-pack/libbeat/docs/**.asciidoc" "./x-pack/libbeat/processors/*/docs/**.asciidoc" "./x-pack/metricbeat/module/**.asciidoc")
       ;;
 
     "clients-team")
@@ -103,14 +103,19 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then
       docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/asciidoc)
       ;;
 
-    "eland" | "enterprise-search-php" | "enterprise-search-python" | "enterprise-search-ruby")
+    "eland")
+      git fetch origin "$GITHUB_PR_TARGET_BRANCH"
+      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./docs/guide/**.asciidoc")
+      ;;
+
+    "enterprise-search-php" | "enterprise-search-python" | "enterprise-search-ruby")
       git fetch origin "$GITHUB_PR_TARGET_BRANCH"
       docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/guide)
       ;;
 
     "elasticsearch")
       git fetch origin "$GITHUB_PR_TARGET_BRANCH"
-      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./buildSrc ./build-tools-internal ./build-tools/src/main/resources ./client ./docs ./modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation ./modules/reindex/src/test/java/org/elasticsearch/client/documentation ./plugins/examples ./server/src/internalClusterTest/java/org/elasticsearch/client/documentation ./server/src/main/resources/org/elasticsearch/common ./server/src/test/java/org/elasticsearch/client/documentation ./x-pack/docs ./x-pack/plugin/esql/qa/testFixtures/src/main/resources ./x-pack/plugin/sql/qa ./x-pack/qa/sql)
+      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./buildSrc ./build-tools-internal ./build-tools/src/main/resources ./client "./docs/**.asciidoc" ./modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation ./modules/reindex/src/test/java/org/elasticsearch/client/documentation ./plugins/examples ./server/src/internalClusterTest/java/org/elasticsearch/client/documentation ./server/src/main/resources/org/elasticsearch/common ./server/src/test/java/org/elasticsearch/client/documentation ./x-pack/docs ./x-pack/plugin/esql/qa/testFixtures/src/main/resources ./x-pack/plugin/sql/qa ./x-pack/qa/sql)
       ;;
 
     "elasticsearch-hadoop")
@@ -120,22 +125,22 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then
 
     "elasticsearch-java")
       git fetch origin "$GITHUB_PR_TARGET_BRANCH"
-      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./java-client/src/test/java/co/elastic/clients/documentation)
+      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs "./java-client/src/test/java/co/elastic/clients/documentation/**.asciidoc")
       ;;
 
     "elasticsearch-net")
       git fetch origin "$GITHUB_PR_TARGET_BRANCH"
-      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs ./tests/Tests/Documentation)
+      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./docs/**.asciidoc" ./tests/Tests/Documentation)
       ;;
 
     "elasticsearch-py")
       git fetch origin "$GITHUB_PR_TARGET_BRANCH"
-      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/guide ./docs/examples)
+      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./docs/guide/**.asciidoc" ./docs/examples)
       ;;
 
     "go-elasticsearch")
       git fetch origin "$GITHUB_PR_TARGET_BRANCH"
-      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./.doc)
+      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./.doc/**.asciidoc")
       ;;
 
     "enterprise-search-pubs")
@@ -148,11 +153,16 @@ if [[ "${GITHUB_PR_BASE_REPO}" != 'docs' ]]; then
       docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./packages/enterprise-search/docs)
       ;;
 
-    "esf" | "ingest-docs" | "observability-docs" | "stack-docs" | "x-pack-logstash")
+    "x-pack-logstash")
       git fetch origin "$GITHUB_PR_TARGET_BRANCH"
       docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- ./docs/en)
       ;;
 
+    "esf" | "ingest-docs" | "observability-docs" | "stack-docs" | "x-pack-logstash")
+      git fetch origin "$GITHUB_PR_TARGET_BRANCH"
+      docs_diff=$(git diff --stat "origin/$GITHUB_PR_TARGET_BRANCH"...HEAD -- "./docs/en/**.asciidoc")
+      ;;
+
     "observability-robots-playground")
       git fetch origin "$GITHUB_PR_TARGET_BRANCH"
       echo "This project is only for testing purposes"
diff --git a/conf.yaml b/conf.yaml
@@ -86,6 +86,7 @@ variables:
   cloudSaasCurrent: &cloudSaasCurrent ms-122
 
   mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam
+    ms-119: main
     ms-105: main
     ms-92: main
     ms-81: main
@@ -2110,8 +2111,9 @@ contents:
             prefix:     en/cloud-enterprise
             tags:       CloudEnterprise/Reference
             subject:    ECE
-            current:    ms-105
+            current:    ms-119
             live:
+              - ms-119
               - ms-105
               - ms-92
               - ms-81
@@ -2121,6 +2123,7 @@ contents:
               - ms-70
               - ms-69
             branches:
+              - ms-119: 3.8
               - ms-105: 3.7
               - ms-92: 3.6
               - ms-81: 3.5
@@ -2164,6 +2167,7 @@ contents:
                 repo:   cloud-assets
                 path:   docs
                 map_branches:
+                  ms-119: master
                   ms-105: master
                   ms-92: master
                   ms-81: master
@@ -2267,7 +2271,24 @@ contents:
               -
                 repo:   terraform-provider-ec
                 path:   docs-elastic/
-
+          - title:      Elastic Cloud Hosted Release Notes
+            prefix:     en/cloud-hosted
+            tags:       Cloud/Reference
+            subject:    Elastic Cloud
+            current:    master
+            branches:   [ master ]
+            index:      docs/saas/index.asciidoc
+            chunk:      1
+            sources:
+              -
+                repo:   cloud
+                path:   docs/saas
+              -
+                repo:   docs
+                path:   shared/attributes.asciidoc
+              -
+                repo:   docs
+                path:   shared/versions/stack/current.asciidoc
     -   title:      Archive
         sections:
           - title:      Elastic Stack and Google Cloud's Anthos
diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh
@@ -143,6 +143,9 @@ alias docbldcr='$GIT_HOME/docs/build_docs --doc $GIT_HOME/curator/docs/asciidoc/
 # Cloud
 alias docbldec='$GIT_HOME/docs/build_docs --doc $GIT_HOME/cloud/docs/saas/index.asciidoc --resource=$GIT_HOME/cloud/docs/shared --chunk 1'
 
+# Cloud Release Notes
+alias docbldecrn='$GIT_HOME/docs/build_docs --doc $GIT_HOME/cloud/docs/saas/index.asciidoc --chunk 1'
+
 alias docbldess=docbldec
 
 # Cloud - Elastic Cloud Enterprise
diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc
@@ -47,6 +47,7 @@
 :docker-logging-ref:   https://www.elastic.co/guide/en/beats/loggingplugin/{branch}
 :esf-ref:              https://www.elastic.co/guide/en/esf/{esf_version}
 :kinesis-firehose-ref: https://www.elastic.co/guide/en/kinesis/{kinesis_version}
+:ecctl-ref:            https://www.elastic.co/guide/en/ecctl/current
 ///////
 Elastic-level pages
 ///////
diff --git a/shared/versions/ece/current.asciidoc b/shared/versions/ece/current.asciidoc
@@ -1 +1 @@
-include::ms-105.asciidoc[]
+include::ms-119.asciidoc[]
diff --git a/shared/versions/ece/master.asciidoc b/shared/versions/ece/master.asciidoc
@@ -1,3 +1,3 @@
-:ece-version:  3.8.1
-:ece-version-short:  3.8
-:ece-version-link: 3.8
+:ece-version:  4.0.0
+:ece-version-short:  4.0
+:ece-version-link: 4.0
diff --git a/shared/versions/ece/ms-119.asciidoc b/shared/versions/ece/ms-119.asciidoc
@@ -0,0 +1,3 @@
+:ece-version:  3.8.0
+:ece-version-short:  3.8
+:ece-version-link: 3.8

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include::ms-105.asciidoc[]`
	`1`	`+include::ms-119.asciidoc[]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+:ece-version: 3.8.0`
	`2`	`+:ece-version-short: 3.8`
	`3`	`+:ece-version-link: 3.8`