Merge branch 'master' into 8.13-bump-city

elastic · Mar 25, 2024 · 2b8b9e8 · 2b8b9e8
2 parents 1c47218 + 0ce190c
commit 2b8b9e8
Show file tree

Hide file tree

Showing 9 changed files with 102 additions and 116 deletions.
diff --git a/.buildkite/build_pipeline.yml b/.buildkite/build_pipeline.yml
@@ -36,6 +36,7 @@ steps:
     agents:
       provider: "gcp"
       image: family/docs-ubuntu-2204
+      diskSizeGb: 150
       machineType: ${BUILD_MACHINE_TYPE}
     concurrency_group: build-docs-${BUILDKITE_BRANCH}
     concurrency: 1

diff --git a/.buildkite/build_pr_pipeline.yml b/.buildkite/build_pr_pipeline.yml
@@ -16,6 +16,7 @@ steps:
     agents:
       provider: "gcp"
       image: family/docs-ubuntu-2204
+      diskSizeGb: 150
       machineType: ${BUILD_MACHINE_TYPE}
   - key: "teardown"
     label: "teardown"
@@ -27,3 +28,4 @@ steps:
       fi
     depends_on:
       - step: "build-pr"
+        allow_failure: true
diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json
@@ -9,7 +9,7 @@
         "admin",
         "write"
       ],
-      "allowed_list": ["github-actions[bot]", "renovate[bot]", "mergify[bot]"],
+      "allowed_list": ["github-actions[bot]", "renovate[bot]", "mergify[bot]", "dependabot[bot]"],
       "build_on_commit": true,
       "build_on_comment": true,
       "trigger_comment_regex": "run docs-build ?(?<rebuild_opt>rebuild)? ?(?<warn_opt>warnlinkcheck)? ?(?<skip_opt>skiplinkcheck)?",

diff --git a/catalog-info.yaml b/catalog-info.yaml
@@ -32,8 +32,6 @@ spec:
       teams:
         docs-build-guild:
           access_level: MANAGE_BUILD_AND_READ
-        ci-docs-migration-taskforce:
-          access_level: MANAGE_BUILD_AND_READ
         docs:
           access_level: BUILD_AND_READ
         everyone:
@@ -76,12 +74,8 @@ spec:
       teams:
         docs-build-guild:
           access_level: MANAGE_BUILD_AND_READ
-        ci-docs-migration-taskforce:
-          access_level: MANAGE_BUILD_AND_READ
-        docs:
-          access_level: BUILD_AND_READ
         everyone:
-          access_level: READ_ONLY
+          access_level: BUILD_AND_READ
 
 # Declare daily preview cleaner
 ---
@@ -121,8 +115,6 @@ spec:
       teams:
         docs-build-guild:
           access_level: MANAGE_BUILD_AND_READ
-        ci-docs-migration-taskforce:
-          access_level: MANAGE_BUILD_AND_READ
         docs:
           access_level: BUILD_AND_READ
         everyone:
@@ -155,8 +147,6 @@ spec:
       teams:
         docs-build-guild:
           access_level: MANAGE_BUILD_AND_READ
-        ci-docs-migration-taskforce:
-          access_level: MANAGE_BUILD_AND_READ
         docs:
           access_level: BUILD_AND_READ
         everyone:
@@ -200,8 +190,6 @@ spec:
       teams:
         docs-build-guild:
           access_level: MANAGE_BUILD_AND_READ
-        ci-docs-migration-taskforce:
-          access_level: MANAGE_BUILD_AND_READ
         docs:
           access_level: BUILD_AND_READ
         everyone:

diff --git a/conf.yaml b/conf.yaml
diff --git a/extra/docs_landing.html b/extra/docs_landing.html
@@ -419,6 +419,7 @@
 <div id="subnavigation" class="subnavigation">
   <p>
     <a class="inline-block mr-3" href="https://www.elastic.co/guide/index.html#viewall">Browse all docs</a>
+    <a class="inline-block mr-3" href="en/starting-with-the-elasticsearch-platform-and-its-solutions/current/api-reference.html">API reference</a>
     <a class="inline-block mr-3" href="en/starting-with-the-elasticsearch-platform-and-its-solutions/current/new.html">Release docs</a>
   </p>
 </div>

diff --git a/resources/web/docs_js/utils.js b/resources/web/docs_js/utils.js
@@ -25,9 +25,9 @@ export function open_current(pathname) {
 export function console_regex() {
   // Port of
   // https://github.com/elastic/elasticsearch/blob/master/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy#L71-L79
-  var method = '(GET|PUT|POST|HEAD|OPTIONS|DELETE)';
+  var method = '(GET|PUT|POST|PATCH|HEAD|OPTIONS|DELETE)';
   var pathAndQuery = '([^\\n]+)';
-  var badBody = 'GET|PUT|POST|HEAD|OPTIONS|DELETE|#';
+  var badBody = 'GET|PUT|POST|PATCH|HEAD|OPTIONS|DELETE|#';
   var body = '((?:\\n(?!$badBody)[^\\n]+)+)'.replace('$badBody', badBody);
   var nonComment = '$method\\s+$pathAndQuery$body?'.replace(
     '$method',

diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc
@@ -249,7 +249,9 @@ Kibana app and UI names
 :data-sources-caps:  Data Views
 :data-source-cap:    Data view
 :data-sources-cap:   Data views
-
+// Use data-source-cap instead of Data-source
+// Use data-sources-cap instead of Data-sources
+// Use data-sources-caps instead of Data-Sources
 
 //////////
 Enterprise Search
@@ -536,12 +538,4 @@ Legacy definitions
 :apm-overview-ref-70:  https://www.elastic.co/guide/en/apm/get-started/7.0
 :apm-overview-ref-m:   https://www.elastic.co/guide/en/apm/get-started/master
 :infra-guide:          https://www.elastic.co/guide/en/infrastructure/guide/{branch}
-// Use data-sources-caps instead of Data-Sources
-:Data-Sources:         Data Views
-// Use data-source-cap instead of Data-source
-:Data-source:          Data view
-// Use data-sources-cap instead of Data-sources
-:Data-sources:         Data views
-// Do not use A-data-source or a-data-source
-:A-data-source:      A data view
-:a-data-source:      a data view
+:a-data-source:        a data view
diff --git a/shared/versions/stack/8.12.asciidoc b/shared/versions/stack/8.12.asciidoc
@@ -1,12 +1,12 @@
-:version:                8.12.1
+:version:                8.12.2
 ////
 bare_version never includes -alpha or -beta
 ////
-:bare_version:           8.12.1
-:logstash_version:       8.12.1
-:elasticsearch_version:  8.12.1
-:kibana_version:         8.12.1
-:apm_server_version:     8.12.1
+:bare_version:           8.12.2
+:logstash_version:       8.12.2
+:elasticsearch_version:  8.12.2
+:kibana_version:         8.12.2
+:apm_server_version:     8.12.2
 :branch:                 8.12
 :minor-version:          8.12
 :major-version:          8.x