Skip to content

Commit 0b5fd86

Browse files
mattkimemattkime
authored
Merge branch 'main' into data_views_swap_references
2 parents 403c7fa + 96e6e22 commit 0b5fd86

25 files changed

Lines changed: 1308 additions & 179 deletions

‎docs/api-generated/connectors/connector-apis-passthru.asciidoc‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,6 +1001,7 @@ Any modifications made to this file will be overwritten.
10011001
<li><a href="#Update_connector_request_body_properties"><code>Update_connector_request_body_properties</code> - Update connector request body properties</a></li>
10021002
<li><a href="#action_response_properties"><code>action_response_properties</code> - Action response properties</a></li>
10031003
<li><a href="#config_properties_cases_webhook"><code>config_properties_cases_webhook</code> - Connector request properties for Webhook - Case Management connector</a></li>
1004+
<li><a href="#config_properties_genai"><code>config_properties_genai</code> - Connector request properties for a generative AI connector</a></li>
10041005
<li><a href="#config_properties_index"><code>config_properties_index</code> - Connector request properties for an index connector</a></li>
10051006
<li><a href="#config_properties_jira"><code>config_properties_jira</code> - Connector request properties for a Jira connector</a></li>
10061007
<li><a href="#config_properties_opsgenie"><code>config_properties_opsgenie</code> - Connector request properties for an Opsgenie connector</a></li>
@@ -1030,6 +1031,7 @@ Any modifications made to this file will be overwritten.
10301031
<li><a href="#connector_types"><code>connector_types</code> - Connector types</a></li>
10311032
<li><a href="#create_connector_request_cases_webhook"><code>create_connector_request_cases_webhook</code> - Create Webhook - Case Managment connector request</a></li>
10321033
<li><a href="#create_connector_request_email"><code>create_connector_request_email</code> - Create email connector request</a></li>
1034+
<li><a href="#create_connector_request_genai"><code>create_connector_request_genai</code> - Create generative AI connector request</a></li>
10331035
<li><a href="#create_connector_request_index"><code>create_connector_request_index</code> - Create index connector request</a></li>
10341036
<li><a href="#create_connector_request_jira"><code>create_connector_request_jira</code> - Create Jira connector request</a></li>
10351037
<li><a href="#create_connector_request_opsgenie"><code>create_connector_request_opsgenie</code> - Create Opsgenie connector request</a></li>
@@ -1082,6 +1084,7 @@ Any modifications made to this file will be overwritten.
10821084
<li><a href="#run_connector_subaction_pushtoservice_subActionParams_incident_malware_url"><code>run_connector_subaction_pushtoservice_subActionParams_incident_malware_url</code> - </a></li>
10831085
<li><a href="#run_connector_subaction_pushtoservice_subActionParams_incident_source_ip"><code>run_connector_subaction_pushtoservice_subActionParams_incident_source_ip</code> - </a></li>
10841086
<li><a href="#secrets_properties_cases_webhook"><code>secrets_properties_cases_webhook</code> - Connector secrets properties for Webhook - Case Management connector</a></li>
1087+
<li><a href="#secrets_properties_genai"><code>secrets_properties_genai</code> - Connector secrets properties for a generative AI connector</a></li>
10851088
<li><a href="#secrets_properties_jira"><code>secrets_properties_jira</code> - Connector secrets properties for a Jira connector</a></li>
10861089
<li><a href="#secrets_properties_opsgenie"><code>secrets_properties_opsgenie</code> - Connector secrets properties for an Opsgenie connector</a></li>
10871090
<li><a href="#secrets_properties_resilient"><code>secrets_properties_resilient</code> - Connector secrets properties for IBM Resilient connector</a></li>
@@ -1370,6 +1373,14 @@ Any modifications made to this file will be overwritten.
13701373
<div class="param">viewIncidentUrl </div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The URL to view the case in the external system. You can use variables to add the external system ID or external system title to the URL. </div>
13711374
</div> <!-- field-items -->
13721375
</div>
1376+
<div class="model">
1377+
<h3><a name="config_properties_genai"><code>config_properties_genai</code> - Connector request properties for a generative AI connector</a> <a class="up" href="#__Models">Up</a></h3>
1378+
<div class='model-description'>Defines properties for connectors when type is <code>.gen-ai</code>.</div>
1379+
<div class="field-items">
1380+
<div class="param">apiProvider (optional)</div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The OpenAI API provider. </div>
1381+
<div class="param">apiUrl (optional)</div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The OpenAI API endpoint. </div>
1382+
</div> <!-- field-items -->
1383+
</div>
13731384
<div class="model">
13741385
<h3><a name="config_properties_index"><code>config_properties_index</code> - Connector request properties for an index connector</a> <a class="up" href="#__Models">Up</a></h3>
13751386
<div class='model-description'>Defines properties for connectors when type is <code>.index</code>.</div>
@@ -1749,6 +1760,18 @@ Any modifications made to this file will be overwritten.
17491760
<div class="param">secrets </div><div class="param-desc"><span class="param-type"><a href="#AnyType">map[String, oas_any_type_not_mapped]</a></span> Defines secrets for connectors when type is <code>.email</code>. </div>
17501761
</div> <!-- field-items -->
17511762
</div>
1763+
<div class="model">
1764+
<h3><a name="create_connector_request_genai"><code>create_connector_request_genai</code> - Create generative AI connector request</a> <a class="up" href="#__Models">Up</a></h3>
1765+
<div class='model-description'>The generative AI connector uses axios to send a POST request to either OpenAI or Azure OpenAPI.</div>
1766+
<div class="field-items">
1767+
<div class="param">config </div><div class="param-desc"><span class="param-type"><a href="#config_properties_genai">config_properties_genai</a></span> </div>
1768+
<div class="param">connector_type_id </div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The type of connector. </div>
1769+
<div class="param-enum-header">Enum:</div>
1770+
<div class="param-enum">.gen-ai</div>
1771+
<div class="param">name </div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The display name for the connector. </div>
1772+
<div class="param">secrets </div><div class="param-desc"><span class="param-type"><a href="#secrets_properties_genai">secrets_properties_genai</a></span> </div>
1773+
</div> <!-- field-items -->
1774+
</div>
17521775
<div class="model">
17531776
<h3><a name="create_connector_request_index"><code>create_connector_request_index</code> - Create index connector request</a> <a class="up" href="#__Models">Up</a></h3>
17541777
<div class='model-description'>The index connector indexes a document into Elasticsearch.</div>
@@ -2286,6 +2309,13 @@ Any modifications made to this file will be overwritten.
22862309
<div class="param">user (optional)</div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The username for HTTP basic authentication. If <code>hasAuth</code> is set to <code>true</code>, this property is required. </div>
22872310
</div> <!-- field-items -->
22882311
</div>
2312+
<div class="model">
2313+
<h3><a name="secrets_properties_genai"><code>secrets_properties_genai</code> - Connector secrets properties for a generative AI connector</a> <a class="up" href="#__Models">Up</a></h3>
2314+
<div class='model-description'>Defines secrets for connectors when type is <code>.gen-ai</code>.</div>
2315+
<div class="field-items">
2316+
<div class="param">apiKey (optional)</div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The OpenAI API key. </div>
2317+
</div> <!-- field-items -->
2318+
</div>
22892319
<div class="model">
22902320
<h3><a name="secrets_properties_jira"><code>secrets_properties_jira</code> - Connector secrets properties for a Jira connector</a> <a class="up" href="#__Models">Up</a></h3>
22912321
<div class='model-description'>Defines secrets for connectors when type is <code>.jira</code>.</div>

‎test/functional/apps/visualize/group5/_tsvb_time_series.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
2828
const browser = getService('browser');
2929
const kibanaServer = getService('kibanaServer');
3030

31-
describe('visual builder', function describeIndexTests() {
31+
// Failing: See https://github.com/elastic/kibana/issues/158972
32+
describe.skip('visual builder', function describeIndexTests() {
3233
before(async () => {
3334
await security.testUser.setRoles([
3435
'kibana_admin',

‎x-pack/plugins/actions/docs/openapi/bundled.json‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@
5555
{
5656
"$ref": "#/components/schemas/create_connector_request_email"
5757
},
58+
{
59+
"$ref": "#/components/schemas/create_connector_request_genai"
60+
},
5861
{
5962
"$ref": "#/components/schemas/create_connector_request_index"
6063
},
@@ -309,6 +312,9 @@
309312
{
310313
"$ref": "#/components/schemas/create_connector_request_email"
311314
},
315+
{
316+
"$ref": "#/components/schemas/create_connector_request_genai"
317+
},
312318
{
313319
"$ref": "#/components/schemas/create_connector_request_index"
314320
},
@@ -1569,6 +1575,64 @@
15691575
}
15701576
}
15711577
},
1578+
"config_properties_genai": {
1579+
"title": "Connector request properties for a generative AI connector",
1580+
"description": "Defines properties for connectors when type is `.gen-ai`.",
1581+
"type": "object",
1582+
"properties": {
1583+
"apiProvider": {
1584+
"type": "string",
1585+
"description": "The OpenAI API provider."
1586+
},
1587+
"apiUrl": {
1588+
"type": "string",
1589+
"description": "The OpenAI API endpoint."
1590+
}
1591+
}
1592+
},
1593+
"secrets_properties_genai": {
1594+
"title": "Connector secrets properties for a generative AI connector",
1595+
"description": "Defines secrets for connectors when type is `.gen-ai`.",
1596+
"type": "object",
1597+
"properties": {
1598+
"apiKey": {
1599+
"type": "string",
1600+
"description": "The OpenAI API key."
1601+
}
1602+
}
1603+
},
1604+
"create_connector_request_genai": {
1605+
"title": "Create generative AI connector request",
1606+
"description": "The generative AI connector uses axios to send a POST request to either OpenAI or Azure OpenAPI.\n",
1607+
"type": "object",
1608+
"required": [
1609+
"config",
1610+
"connector_type_id",
1611+
"name",
1612+
"secrets"
1613+
],
1614+
"properties": {
1615+
"config": {
1616+
"$ref": "#/components/schemas/config_properties_genai"
1617+
},
1618+
"connector_type_id": {
1619+
"type": "string",
1620+
"description": "The type of connector.",
1621+
"enum": [
1622+
".gen-ai"
1623+
],
1624+
"example": ".gen-ai"
1625+
},
1626+
"name": {
1627+
"type": "string",
1628+
"description": "The display name for the connector.",
1629+
"example": "my-connector"
1630+
},
1631+
"secrets": {
1632+
"$ref": "#/components/schemas/secrets_properties_genai"
1633+
}
1634+
}
1635+
},
15721636
"config_properties_index": {
15731637
"title": "Connector request properties for an index connector",
15741638
"required": [
@@ -3640,6 +3704,7 @@
36403704
"enum": [
36413705
".cases-webhook",
36423706
".email",
3707+
".gen-ai",
36433708
".index",
36443709
".jira",
36453710
".opsgenie",

‎x-pack/plugins/actions/docs/openapi/bundled.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ paths:
3636
oneOf:
3737
- $ref: '#/components/schemas/create_connector_request_cases_webhook'
3838
- $ref: '#/components/schemas/create_connector_request_email'
39+
- $ref: '#/components/schemas/create_connector_request_genai'
3940
- $ref: '#/components/schemas/create_connector_request_index'
4041
- $ref: '#/components/schemas/create_connector_request_jira'
4142
- $ref: '#/components/schemas/create_connector_request_opsgenie'
@@ -175,6 +176,7 @@ paths:
175176
oneOf:
176177
- $ref: '#/components/schemas/create_connector_request_cases_webhook'
177178
- $ref: '#/components/schemas/create_connector_request_email'
179+
- $ref: '#/components/schemas/create_connector_request_genai'
178180
- $ref: '#/components/schemas/create_connector_request_index'
179181
- $ref: '#/components/schemas/create_connector_request_jira'
180182
- $ref: '#/components/schemas/create_connector_request_opsgenie'
@@ -965,6 +967,50 @@ components:
965967
example: my-connector
966968
secrets:
967969
$ref: '#/components/schemas/secrets_properties_email'
970+
config_properties_genai:
971+
title: Connector request properties for a generative AI connector
972+
description: Defines properties for connectors when type is `.gen-ai`.
973+
type: object
974+
properties:
975+
apiProvider:
976+
type: string
977+
description: The OpenAI API provider.
978+
apiUrl:
979+
type: string
980+
description: The OpenAI API endpoint.
981+
secrets_properties_genai:
982+
title: Connector secrets properties for a generative AI connector
983+
description: Defines secrets for connectors when type is `.gen-ai`.
984+
type: object
985+
properties:
986+
apiKey:
987+
type: string
988+
description: The OpenAI API key.
989+
create_connector_request_genai:
990+
title: Create generative AI connector request
991+
description: |
992+
The generative AI connector uses axios to send a POST request to either OpenAI or Azure OpenAPI.
993+
type: object
994+
required:
995+
- config
996+
- connector_type_id
997+
- name
998+
- secrets
999+
properties:
1000+
config:
1001+
$ref: '#/components/schemas/config_properties_genai'
1002+
connector_type_id:
1003+
type: string
1004+
description: The type of connector.
1005+
enum:
1006+
- .gen-ai
1007+
example: .gen-ai
1008+
name:
1009+
type: string
1010+
description: The display name for the connector.
1011+
example: my-connector
1012+
secrets:
1013+
$ref: '#/components/schemas/secrets_properties_genai'
9681014
config_properties_index:
9691015
title: Connector request properties for an index connector
9701016
required:
@@ -2498,6 +2544,7 @@ components:
24982544
enum:
24992545
- .cases-webhook
25002546
- .email
2547+
- .gen-ai
25012548
- .index
25022549
- .jira
25032550
- .opsgenie

‎x-pack/plugins/actions/docs/openapi/components/schemas/config_properties_genai.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
title: Connector request properties for a generative AI connector
2+
description: Defines properties for connectors when type is `.gen-ai`.
3+
type: object
4+
properties:
5+
apiProvider:
6+
type: string
7+
description: The OpenAI API provider.
8+
apiUrl:
9+
type: string
10+
description: The OpenAI API endpoint.

‎x-pack/plugins/actions/docs/openapi/components/schemas/connector_response_properties_genai.yaml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
title: Connector response properties for a generative AI connector
2+
type: object
3+
required:
4+
- config
5+
- connector_type_id
6+
- id
7+
- is_deprecated
8+
- is_preconfigured
9+
- name
10+
properties:
11+
config:
12+
$ref: 'config_properties_genai.yaml'
13+
connector_type_id:
14+
type: string
15+
description: The type of connector.
16+
enum:
17+
- .gen-ai
18+
id:
19+
type: string
20+
description: The identifier for the connector.
21+
is_deprecated:
22+
$ref: 'is_deprecated.yaml'
23+
is_missing_secrets:
24+
$ref: 'is_missing_secrets.yaml'
25+
is_preconfigured:
26+
$ref: 'is_preconfigured.yaml'
27+
name:
28+
type: string
29+
description: The display name for the connector.

‎x-pack/plugins/actions/docs/openapi/components/schemas/connector_types.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ description: The type of connector. For example, `.email`, `.index`, `.jira`, `.
44
enum:
55
- .cases-webhook
66
- .email
7+
- .gen-ai
78
- .index
89
- .jira
910
- .opsgenie

‎x-pack/plugins/actions/docs/openapi/components/schemas/create_connector_request_genai.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
title: Create generative AI connector request
2+
description: >
3+
The generative AI connector uses axios to send a POST request to either
4+
OpenAI or Azure OpenAPI.
5+
type: object
6+
required:
7+
- config
8+
- connector_type_id
9+
- name
10+
- secrets
11+
properties:
12+
config:
13+
$ref: 'config_properties_genai.yaml'
14+
connector_type_id:
15+
type: string
16+
description: The type of connector.
17+
enum:
18+
- .gen-ai
19+
example: .gen-ai
20+
name:
21+
type: string
22+
description: The display name for the connector.
23+
example: my-connector
24+
secrets:
25+
$ref: 'secrets_properties_genai.yaml'

‎x-pack/plugins/actions/docs/openapi/components/schemas/secrets_properties_genai.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
title: Connector secrets properties for a generative AI connector
2+
description: Defines secrets for connectors when type is `.gen-ai`.
3+
type: object
4+
properties:
5+
apiKey:
6+
type: string
7+
description: The OpenAI API key.

‎x-pack/plugins/actions/docs/openapi/paths/s@{spaceid}@api@actions@connector.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ post:
1818
oneOf:
1919
- $ref: '../components/schemas/create_connector_request_cases_webhook.yaml'
2020
- $ref: '../components/schemas/create_connector_request_email.yaml'
21+
- $ref: '../components/schemas/create_connector_request_genai.yaml'
2122
- $ref: '../components/schemas/create_connector_request_index.yaml'
2223
- $ref: '../components/schemas/create_connector_request_jira.yaml'
2324
- $ref: '../components/schemas/create_connector_request_opsgenie.yaml'

0 commit comments

Comments
 (0)