Merge branch 'main' into update-contributing

Author: JoshMock

docs/index-custom-title-page.html

@@ -159,7 +159,7 @@ <h4 class="mt-3">
       </a>
     </div>
     <div class="col-md-4 col-12 mb-2">
-      <a class="no-text-decoration" href="https://www.elastic.co/guide/en/welcome-to-elastic/current/getting-started-observability.html">
+      <a class="no-text-decoration" href="https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/current/getting-started-observability.html">
         <div class="card h-100">
           <h4 class="mt-3">
             <span class="inline-block float-left icon mr-2" style="background-image: url('https://images.contentstack.io/v3/assets/bltefdd0b53724fa2ce/bltaa08b370a00bbecc/634d9da14e565f1cdce27f7c/observability-logo-color-32px.png');"></span>

docs/reference.asciidoc

@@ -7020,15 +7020,15 @@ Creates or updates a query ruleset.
 {ref}/put-query-ruleset.html[Endpoint documentation]
 [source,ts]
 ----
-client.queryRuleset.put({ ruleset_id })
+client.queryRuleset.put({ ruleset_id, rules })
 ----
 
 [discrete]
 ==== Arguments
 
 * *Request (object):*
 ** *`ruleset_id` (string)*: The unique identifier of the query ruleset to be created or updated
-** *`query_ruleset` (Optional, { ruleset_id, rules })*
+** *`rules` ({ rule_id, type, criteria, actions }[])*
 
 [discrete]
 === rollup

src/api/api/query_ruleset.ts

@@ -131,15 +131,22 @@ export default class QueryRuleset {
   async put (this: That, params: T.QueryRulesetPutRequest | TB.QueryRulesetPutRequest, options?: TransportRequestOptions): Promise<T.QueryRulesetPutResponse>
   async put (this: That, params: T.QueryRulesetPutRequest | TB.QueryRulesetPutRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['ruleset_id']
-    const acceptedBody: string[] = ['query_ruleset']
+    const acceptedBody: string[] = ['rules']
     const querystring: Record<string, any> = {}
     // @ts-expect-error
-    let body: any = params.body ?? undefined
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = userBody != null ? { ...userBody } : undefined
+    }
 
     for (const key in params) {
       if (acceptedBody.includes(key)) {
+        body = body ?? {}
         // @ts-expect-error
-        body = params[key]
+        body[key] = params[key]
       } else if (acceptedPath.includes(key)) {
         continue
       } else if (key !== 'body') {

src/api/types.ts

@@ -3240,8 +3240,8 @@ export type AggregationsFrequentItemSetsBucket = AggregationsFrequentItemSetsBuc
 
 export interface AggregationsFrequentItemSetsField {
   field: Field
-  exclude?: string | string[]
-  include?: string | string[]
+  exclude?: AggregationsTermsExclude
+  include?: AggregationsTermsInclude
 }
 
 export type AggregationsGapPolicy = 'skip' | 'insert_zeros' | 'keep_values'
@@ -3856,7 +3856,7 @@ export interface AggregationsSignificantTextAggregation extends AggregationsBuck
   field?: Field
   filter_duplicate_text?: boolean
   gnd?: AggregationsGoogleNormalizedDistanceHeuristic
-  include?: string | string[]
+  include?: AggregationsTermsInclude
   jlh?: EmptyObject
   min_doc_count?: long
   mutual_information?: AggregationsMutualInformationHeuristic
@@ -15279,7 +15279,7 @@ export interface QueryRulesetListResponse {
 
 export interface QueryRulesetPutRequest extends RequestBase {
   ruleset_id: Id
-  query_ruleset?: QueryRulesetQueryRuleset
+  rules: QueryRulesetQueryRule[]
 }
 
 export interface QueryRulesetPutResponse {

src/api/typesWithBodyKey.ts

@@ -3313,8 +3313,8 @@ export type AggregationsFrequentItemSetsBucket = AggregationsFrequentItemSetsBuc
 
 export interface AggregationsFrequentItemSetsField {
   field: Field
-  exclude?: string | string[]
-  include?: string | string[]
+  exclude?: AggregationsTermsExclude
+  include?: AggregationsTermsInclude
 }
 
 export type AggregationsGapPolicy = 'skip' | 'insert_zeros' | 'keep_values'
@@ -3929,7 +3929,7 @@ export interface AggregationsSignificantTextAggregation extends AggregationsBuck
   field?: Field
   filter_duplicate_text?: boolean
   gnd?: AggregationsGoogleNormalizedDistanceHeuristic
-  include?: string | string[]
+  include?: AggregationsTermsInclude
   jlh?: EmptyObject
   min_doc_count?: long
   mutual_information?: AggregationsMutualInformationHeuristic
@@ -15574,8 +15574,10 @@ export interface QueryRulesetListResponse {
 
 export interface QueryRulesetPutRequest extends RequestBase {
   ruleset_id: Id
-  /** @deprecated The use of the 'body' key has been deprecated, use 'query_ruleset' instead. */
-  body?: QueryRulesetQueryRuleset
+  /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */
+  body?: {
+    rules: QueryRulesetQueryRule[]
+  }
 }
 
 export interface QueryRulesetPutResponse {