Merge branch 'main' into lcawl/security-ccr

Author: lcawl

docs/overlays/elasticsearch-openapi-overlays.yaml

@@ -9,10 +9,14 @@ actions:
     update:
       title: Elasticsearch API
       description: >
+        Elasticsearch provides REST APIs that are used by the UI components and can be called directly to configure and access Elasticsearch features.
+        
         ## Documentation source and versions
         
         This documentation is derived from the `main` branch of the [elasticsearch-specification](https://github.com/elastic/elasticsearch-specification) repository.
         It is provided under license [Attribution-NonCommercial-NoDerivatives 4.0 International](https://creativecommons.org/licenses/by-nc-nd/4.0/).
+
+        This documentation contains work-in-progress information for future Elastic Stack releases.
       x-doc-license:
         name: Attribution-NonCommercial-NoDerivatives 4.0 International
         url: 'https://creativecommons.org/licenses/by-nc-nd/4.0/'

docs/overlays/elasticsearch-shared-overlays.yaml

@@ -1050,6 +1050,17 @@ actions:
         externalDocs:
           url: https://www.elastic.co/guide/en/elasticsearch/reference/master/query-dsl.html
           description: Query DSL
+  - target: "$.components['schemas']['_global.search._types:FieldCollapse']"
+    description: Add x-model and externalDocs
+    update:
+      x-model: true
+      externalDocs:
+        url: https://www.elastic.co/guide/en/elasticsearch/reference/master/collapse-search-results.html
+  - target: "$.components['schemas']['_global.msearch:MultisearchBody'].properties"
+    description: Add x-model
+    update:
+      aggregations:
+        x-model: true
 # Examples
   - target: "$.components['requestBodies']['async_search.submit']"
     description: "Add example for asynch search submit request"