Merge branch '9.0' into backport-3873-to-9.0

Author: lcawl

output/openapi/elasticsearch-openapi.json

@@ -176,12 +176,6 @@
       ],
       "response": []
     },
-    "ml.stop_datafeed": {
-      "request": [
-        "Request: missing json spec query parameter 'allow_no_datafeeds'"
-      ],
-      "response": []
-    },
     "msearch": {
       "request": [
         "Request: query parameter 'allow_no_indices' does not exist in the json spec",

output/openapi/elasticsearch-serverless-openapi.json

@@ -317,6 +317,7 @@ inference-api-delete,https://www.elastic.co/docs/api/doc/elasticsearch/operation
 inference-api-get,https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-get
 inference-api-post,https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-inference
 inference-api-put,https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put
+inference-api-put-watsonx,https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-watsonx-ai.html
 inference-api-stream,https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-stream-inference
 inference-api-update,https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-update
 inference-processor,https://www.elastic.co/guide/en/elasticsearch/reference/current/inference-processor.html
@@ -854,4 +855,7 @@ watcher-api-start,https://www.elastic.co/docs/api/doc/elasticsearch/operation/op
 watcher-api-stats,https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-stats
 watcher-api-stop,https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-stop
 watcher-api-update-settings,https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-update-settings
+watsonx-api-keys,https://cloud.ibm.com/iam/apikeys
+watsonx-api-models,https://www.ibm.com/products/watsonx-ai/foundation-models
+watsonx-api-version,https://cloud.ibm.com/apidocs/watsonx-ai#active-version-dates
 xpack-rollup,https://www.elastic.co/guide/en/elasticsearch/reference/current/xpack-rollup.html

output/schema/schema-serverless.json

@@ -0,0 +1,35 @@
+{
+  "inference.put_watsonx": {
+    "documentation": {
+      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-watsonx-ai.html",
+      "description": "Configure a Watsonx inference endpoint"
+    },
+    "stability": "stable",
+    "visibility": "public",
+    "headers": {
+      "accept": ["application/json"],
+      "content_type": ["application/json"]
+    },
+    "url": {
+      "paths": [
+        {
+          "path": "/_inference/{task_type}/{watsonx_inference_id}",
+          "methods": ["PUT"],
+          "parts": {
+            "task_type": {
+              "type": "string",
+              "description": "The task type"
+            },
+            "watsonx_inference_id": {
+              "type": "string",
+              "description": "The inference Id"
+            }
+          }
+        }
+      ]
+    },
+    "body": {
+      "description": "The inference endpoint's task and service settings"
+    }
+  }
+}

output/schema/schema.json

@@ -39,13 +39,6 @@
         "required": false,
         "description": "A comma-separate list of fields to optionally include. Valid options are 'definition' and 'total_feature_importance'. Default is none."
       },
-      "include_model_definition": {
-        "type": "boolean",
-        "required": false,
-        "description": "Should the full model definition be included in the results. These definitions can be large. So be cautious when including them. Defaults to false.",
-        "default": false,
-        "deprecated": true
-      },
       "decompress_definition": {
         "type": "boolean",
         "required": false,

output/schema/validation-errors.json

@@ -22,21 +22,6 @@
               "required": true
             }
           }
-        },
-        {
-          "path": "/_ml/trained_models/{model_id}/deployment/_infer",
-          "methods": ["POST"],
-          "parts": {
-            "model_id": {
-              "type": "string",
-              "description": "The unique identifier of the trained model.",
-              "required": true
-            }
-          },
-          "deprecated": {
-            "version": "8.3.0",
-            "description": "/_ml/trained_models/{model_id}/deployment/_infer is deprecated. Use /_ml/trained_models/{model_id}/_infer instead"
-          }
         }
       ]
     },