Skip to content

Commit d15c3ba

Browse files
elasticmachineelasticmachine
authored
Merge branch 'main' into agents_auto_upgrades_license
2 parents 12625f1 + f79b68d commit d15c3ba

File tree

267 files changed

+9990
-1747
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

267 files changed

+9990
-1747
lines changed

‎config/serverless.es.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,18 @@ xpack.ml.dfa.enabled: false
8585
xpack.ml.nlp:
8686
enabled: true
8787
modelDeployment:
88-
allowStaticAllocations: true
88+
allowStaticAllocations: false
8989
vCPURange:
9090
low:
9191
min: 0
9292
max: 2
9393
static: 2
9494
medium:
95-
min: 1
95+
min: 0
9696
max: 32
9797
static: 32
9898
high:
99-
min: 1
99+
min: 0
100100
max: 512
101101
static: 512
102102
xpack.ml.compatibleModuleType: 'search'

‎config/serverless.oblt.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ xpack.ml.nlp:
119119
min: 0
120120
max: 2
121121
medium:
122-
min: 1
122+
min: 0
123123
max: 32
124124
high:
125-
min: 1
125+
min: 0
126126
max: 128
127127
xpack.ml.compatibleModuleType: 'observability'
128128

‎docs/reference/connectors-kibana/elastic-managed-llm.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ The default LLM may change in the future based on evaluations of performance, se
1313

1414
## Region and hosting
1515

16-
The Elastic Managed LLM is currently hosted in AWS US regions, beginning with `us-east-1`.
16+
The Elastic Managed LLM is currently proxying to AWS Bedrock in AWS US regions, beginning with `us-east-1`.
1717

1818
## Data protection
1919

20-
Customer projects or deployments hosted in any cloud service provider or region have access to the Elastic Managed LLM hosted in the specified regions.
20+
Customer projects or deployments hosted in any cloud service provider or region have access to the Elastic Managed LLM in the AWS US region `us-east-1`.
2121
All data is encrypted in transit. The LLM is configured for zero data retention: none of the prompts or outputs are stored by the model.
2222

2323
Only request metadata is logged in AWS CloudWatch.

‎oas_docs/bundle.json‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17238,6 +17238,159 @@
1723817238
]
1723917239
}
1724017240
},
17241+
"/api/fleet/agents/bulk_migrate": {
17242+
"post": {
17243+
"description": "Bulk migrate agents to another cluster.<br/><br/>[Required authorization] Route required privileges: fleet-agents-all.",
17244+
"operationId": "post-fleet-agents-bulk-migrate",
17245+
"parameters": [
17246+
{
17247+
"description": "A required header to protect against CSRF attacks",
17248+
"in": "header",
17249+
"name": "kbn-xsrf",
17250+
"required": true,
17251+
"schema": {
17252+
"example": "true",
17253+
"type": "string"
17254+
}
17255+
}
17256+
],
17257+
"requestBody": {
17258+
"content": {
17259+
"application/json": {
17260+
"schema": {
17261+
"additionalProperties": false,
17262+
"properties": {
17263+
"agents": {
17264+
"items": {
17265+
"type": "string"
17266+
},
17267+
"type": "array"
17268+
},
17269+
"enrollment_token": {
17270+
"type": "string"
17271+
},
17272+
"settings": {
17273+
"additionalProperties": false,
17274+
"properties": {
17275+
"ca_sha256": {
17276+
"type": "string"
17277+
},
17278+
"certificate_authorities": {
17279+
"type": "string"
17280+
},
17281+
"elastic_agent_cert": {
17282+
"type": "string"
17283+
},
17284+
"elastic_agent_cert_key": {
17285+
"type": "string"
17286+
},
17287+
"elastic_agent_cert_key_passphrase": {
17288+
"type": "string"
17289+
},
17290+
"headers": {
17291+
"additionalProperties": {
17292+
"type": "string"
17293+
},
17294+
"type": "object"
17295+
},
17296+
"insecure": {
17297+
"type": "boolean"
17298+
},
17299+
"proxy_disabled": {
17300+
"type": "boolean"
17301+
},
17302+
"proxy_headers": {
17303+
"additionalProperties": {
17304+
"type": "string"
17305+
},
17306+
"type": "object"
17307+
},
17308+
"proxy_url": {
17309+
"type": "string"
17310+
},
17311+
"staging": {
17312+
"type": "boolean"
17313+
},
17314+
"tags": {
17315+
"items": {
17316+
"type": "string"
17317+
},
17318+
"type": "array"
17319+
}
17320+
},
17321+
"type": "object"
17322+
},
17323+
"uri": {
17324+
"format": "uri",
17325+
"type": "string"
17326+
}
17327+
},
17328+
"required": [
17329+
"agents",
17330+
"uri",
17331+
"enrollment_token"
17332+
],
17333+
"type": "object"
17334+
}
17335+
}
17336+
}
17337+
},
17338+
"responses": {
17339+
"200": {
17340+
"content": {
17341+
"application/json": {
17342+
"schema": {
17343+
"additionalProperties": false,
17344+
"properties": {
17345+
"actionId": {
17346+
"type": "string"
17347+
}
17348+
},
17349+
"required": [
17350+
"actionId"
17351+
],
17352+
"type": "object"
17353+
}
17354+
}
17355+
}
17356+
},
17357+
"400": {
17358+
"content": {
17359+
"application/json": {
17360+
"schema": {
17361+
"additionalProperties": false,
17362+
"description": "Generic Error",
17363+
"properties": {
17364+
"attributes": {},
17365+
"error": {
17366+
"type": "string"
17367+
},
17368+
"errorType": {
17369+
"type": "string"
17370+
},
17371+
"message": {
17372+
"type": "string"
17373+
},
17374+
"statusCode": {
17375+
"type": "number"
17376+
}
17377+
},
17378+
"required": [
17379+
"message",
17380+
"attributes"
17381+
],
17382+
"type": "object"
17383+
}
17384+
}
17385+
}
17386+
}
17387+
},
17388+
"summary": "Migrate multiple agents",
17389+
"tags": [
17390+
"Elastic Agents"
17391+
]
17392+
}
17393+
},
1724117394
"/api/fleet/agents/bulk_reassign": {
1724217395
"post": {
1724317396
"description": "[Required authorization] Route required privileges: fleet-agents-all.",

‎oas_docs/bundle.serverless.json‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17238,6 +17238,159 @@
1723817238
]
1723917239
}
1724017240
},
17241+
"/api/fleet/agents/bulk_migrate": {
17242+
"post": {
17243+
"description": "Bulk migrate agents to another cluster.<br/><br/>[Required authorization] Route required privileges: fleet-agents-all.",
17244+
"operationId": "post-fleet-agents-bulk-migrate",
17245+
"parameters": [
17246+
{
17247+
"description": "A required header to protect against CSRF attacks",
17248+
"in": "header",
17249+
"name": "kbn-xsrf",
17250+
"required": true,
17251+
"schema": {
17252+
"example": "true",
17253+
"type": "string"
17254+
}
17255+
}
17256+
],
17257+
"requestBody": {
17258+
"content": {
17259+
"application/json": {
17260+
"schema": {
17261+
"additionalProperties": false,
17262+
"properties": {
17263+
"agents": {
17264+
"items": {
17265+
"type": "string"
17266+
},
17267+
"type": "array"
17268+
},
17269+
"enrollment_token": {
17270+
"type": "string"
17271+
},
17272+
"settings": {
17273+
"additionalProperties": false,
17274+
"properties": {
17275+
"ca_sha256": {
17276+
"type": "string"
17277+
},
17278+
"certificate_authorities": {
17279+
"type": "string"
17280+
},
17281+
"elastic_agent_cert": {
17282+
"type": "string"
17283+
},
17284+
"elastic_agent_cert_key": {
17285+
"type": "string"
17286+
},
17287+
"elastic_agent_cert_key_passphrase": {
17288+
"type": "string"
17289+
},
17290+
"headers": {
17291+
"additionalProperties": {
17292+
"type": "string"
17293+
},
17294+
"type": "object"
17295+
},
17296+
"insecure": {
17297+
"type": "boolean"
17298+
},
17299+
"proxy_disabled": {
17300+
"type": "boolean"
17301+
},
17302+
"proxy_headers": {
17303+
"additionalProperties": {
17304+
"type": "string"
17305+
},
17306+
"type": "object"
17307+
},
17308+
"proxy_url": {
17309+
"type": "string"
17310+
},
17311+
"staging": {
17312+
"type": "boolean"
17313+
},
17314+
"tags": {
17315+
"items": {
17316+
"type": "string"
17317+
},
17318+
"type": "array"
17319+
}
17320+
},
17321+
"type": "object"
17322+
},
17323+
"uri": {
17324+
"format": "uri",
17325+
"type": "string"
17326+
}
17327+
},
17328+
"required": [
17329+
"agents",
17330+
"uri",
17331+
"enrollment_token"
17332+
],
17333+
"type": "object"
17334+
}
17335+
}
17336+
}
17337+
},
17338+
"responses": {
17339+
"200": {
17340+
"content": {
17341+
"application/json": {
17342+
"schema": {
17343+
"additionalProperties": false,
17344+
"properties": {
17345+
"actionId": {
17346+
"type": "string"
17347+
}
17348+
},
17349+
"required": [
17350+
"actionId"
17351+
],
17352+
"type": "object"
17353+
}
17354+
}
17355+
}
17356+
},
17357+
"400": {
17358+
"content": {
17359+
"application/json": {
17360+
"schema": {
17361+
"additionalProperties": false,
17362+
"description": "Generic Error",
17363+
"properties": {
17364+
"attributes": {},
17365+
"error": {
17366+
"type": "string"
17367+
},
17368+
"errorType": {
17369+
"type": "string"
17370+
},
17371+
"message": {
17372+
"type": "string"
17373+
},
17374+
"statusCode": {
17375+
"type": "number"
17376+
}
17377+
},
17378+
"required": [
17379+
"message",
17380+
"attributes"
17381+
],
17382+
"type": "object"
17383+
}
17384+
}
17385+
}
17386+
}
17387+
},
17388+
"summary": "Migrate multiple agents",
17389+
"tags": [
17390+
"Elastic Agents"
17391+
]
17392+
}
17393+
},
1724117394
"/api/fleet/agents/bulk_reassign": {
1724217395
"post": {
1724317396
"description": "[Required authorization] Route required privileges: fleet-agents-all.",

0 commit comments

Comments
 (0)