Skip to content

Commit ee0dd91

Browse files
kdelemmekdelemme
authored
Merge branch 'main' into slo/check-source-index-privileges
2 parents 6e344d9 + eea4a20 commit ee0dd91

374 files changed

Lines changed: 5219 additions & 6025 deletions

File tree

Some content is hidden

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

‎.eslintrc.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1995,9 +1995,6 @@ module.exports = {
19951995
// logsShared depends on o11y/private plugins, but platform plugins depend on it
19961996
'x-pack/plugins/observability_solution/logs_shared/**',
19971997

1998-
// this plugin depends on visTypeTimeseries plugin (for TSVB viz) which is platform/private ATM
1999-
'x-pack/plugins/observability_solution/infra/**',
2000-
20011998
// TODO @kibana/operations
20021999
'scripts/create_observability_rules.js', // is importing "@kbn/observability-alerting-test-data" (observability/private)
20032000
'src/cli_setup/**', // is importing "@kbn/interactive-setup-plugin" (platform/private)

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ packages/kbn-custom-icons @elastic/obs-ux-logs-team
324324
packages/kbn-custom-integrations @elastic/obs-ux-logs-team
325325
packages/kbn-cypress-config @elastic/kibana-operations
326326
packages/kbn-data-service @elastic/kibana-visualizations @elastic/kibana-data-discovery
327-
packages/kbn-data-stream-adapter @elastic/security-threat-hunting-explore
327+
packages/kbn-data-stream-adapter @elastic/security-threat-hunting
328328
packages/kbn-data-view-utils @elastic/kibana-data-discovery
329329
packages/kbn-datemath @elastic/kibana-data-discovery
330330
packages/kbn-dev-cli-errors @elastic/kibana-operations
@@ -380,6 +380,7 @@ packages/kbn-i18n @elastic/kibana-core
380380
packages/kbn-i18n-react @elastic/kibana-core
381381
packages/kbn-import-locator @elastic/kibana-operations
382382
packages/kbn-import-resolver @elastic/kibana-operations
383+
packages/kbn-index-adapter @elastic/security-threat-hunting
383384
packages/kbn-interpreter @elastic/kibana-visualizations
384385
packages/kbn-investigation-shared @elastic/obs-ux-management-team
385386
packages/kbn-io-ts-utils @elastic/obs-knowledge-team

‎api_docs/kbn_elastic_assistant_common.devdocs.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@
997997
"\nInterface for features available to the elastic assistant"
998998
],
999999
"signature": [
1000-
"{ readonly assistantKnowledgeBaseByDefault: boolean; readonly assistantModelEvaluation: boolean; }"
1000+
"{ readonly assistantModelEvaluation: boolean; }"
10011001
],
10021002
"path": "x-pack/packages/kbn-elastic-assistant-common/impl/capabilities/index.ts",
10031003
"deprecated": false,
@@ -2772,7 +2772,7 @@
27722772
"label": "GetCapabilitiesResponse",
27732773
"description": [],
27742774
"signature": [
2775-
"{ assistantKnowledgeBaseByDefault: boolean; assistantModelEvaluation: boolean; }"
2775+
"{ assistantModelEvaluation: boolean; }"
27762776
],
27772777
"path": "x-pack/packages/kbn-elastic-assistant-common/impl/schemas/capabilities/get_capabilities_route.gen.ts",
27782778
"deprecated": false,
@@ -4767,7 +4767,7 @@
47674767
"\nDefault features available to the elastic assistant"
47684768
],
47694769
"signature": [
4770-
"{ readonly assistantKnowledgeBaseByDefault: true; readonly assistantModelEvaluation: false; }"
4770+
"{ readonly assistantModelEvaluation: false; }"
47714771
],
47724772
"path": "x-pack/packages/kbn-elastic-assistant-common/impl/capabilities/index.ts",
47734773
"deprecated": false,
@@ -5232,7 +5232,7 @@
52325232
"label": "GetCapabilitiesResponse",
52335233
"description": [],
52345234
"signature": [
5235-
"Zod.ZodObject<{ assistantKnowledgeBaseByDefault: Zod.ZodBoolean; assistantModelEvaluation: Zod.ZodBoolean; }, \"strip\", Zod.ZodTypeAny, { assistantKnowledgeBaseByDefault: boolean; assistantModelEvaluation: boolean; }, { assistantKnowledgeBaseByDefault: boolean; assistantModelEvaluation: boolean; }>"
5235+
"Zod.ZodObject<{ assistantModelEvaluation: Zod.ZodBoolean; }, \"strip\", Zod.ZodTypeAny, { assistantModelEvaluation: boolean; }, { assistantModelEvaluation: boolean; }>"
52365236
],
52375237
"path": "x-pack/packages/kbn-elastic-assistant-common/impl/schemas/capabilities/get_capabilities_route.gen.ts",
52385238
"deprecated": false,
@@ -6201,4 +6201,4 @@
62016201
}
62026202
]
62036203
}
6204-
}
6204+
}

‎api_docs/security_solution.devdocs.json‎

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

‎docs/management/action-types.asciidoc‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ Actions are instantiations of a connector that are linked to rules and run as ba
88
[cols="2"]
99
|===
1010

11+
// ifeval::["featureAIConnector"=="true"]
12+
// a| <<inference-action-type,{infer}>>
13+
14+
// | Send a request to {infer}.
15+
// endif::[]
16+
1117
a| <<bedrock-action-type,{bedrock}>>
1218

1319
| Send a request to {bedrock}.
@@ -28,10 +34,6 @@ a| <<gemini-action-type,{gemini}>>
2834

2935
| Send a request to {gemini}.
3036

31-
a| <<inference-action-type,{infer}>>
32-
33-
| Send a request to {infer}.
34-
3537
a| <<email-action-type,Email>>
3638

3739
| Send email from your server.

‎docs/management/connectors/action-types/inference.asciidoc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
[[inference-action-type]]
2-
== {infer-cap} connector and action
2+
== AI connector and action
33
++++
4-
<titleabbrev>{infer-cap}</titleabbrev>
4+
<titleabbrev>AI</titleabbrev>
55
++++
66
:frontmatter-description: Add a connector that can send requests to {inference}.
77
:frontmatter-tags-products: [kibana]
88
:frontmatter-tags-content-type: [how-to]
99
:frontmatter-tags-user-goals: [configure]
1010

11+
coming::[]
1112

1213
The {infer} connector uses the {es} client to send requests to an {infer} service.
1314
The connector uses the <<execute-connector-api,run connector API>> to send the request.
@@ -16,6 +17,7 @@ The connector uses the <<execute-connector-api,run connector API>> to send the r
1617
[[define-inference-ui]]
1718
=== Create connectors in {kib}
1819

20+
// TBD After you set the `xpack.stack_connectors.enableExperimental` to include `inferenceConnectorOn`,
1921
You can create connectors in *{stack-manage-app} > {connectors-ui}*. For example:
2022

2123
[role="screenshot"]

‎docs/management/connectors/index.asciidoc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ include::action-types/crowdstrike.asciidoc[leveloffset=+1]
44
include::action-types/d3security.asciidoc[leveloffset=+1]
55
include::action-types/email.asciidoc[leveloffset=+1]
66
include::action-types/gemini.asciidoc[leveloffset=+1]
7-
include::action-types/inference.asciidoc[leveloffset=+1]
7+
// ifeval::["featureAIConnector"=="true"]
8+
// include::action-types/inference.asciidoc[leveloffset=+1]
9+
// endif::[]
810
include::action-types/resilient.asciidoc[leveloffset=+1]
911
include::action-types/index.asciidoc[leveloffset=+1]
1012
include::action-types/jira.asciidoc[leveloffset=+1]

‎docs/settings/alert-action-settings.asciidoc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,15 +269,16 @@ A configuration URL that varies by connector:
269269
--
270270
* For an <<bedrock-action-type,{bedrock} connector>>, specifies the {bedrock} request URL.
271271
* For an <<gemini-action-type,{gemini} connector>>, specifies the {gemini} request URL.
272-
* For an <<inference-action-type,{inference} connector>>, specifies the Elastic {inference} request.
273272
* For a <<openai-action-type,OpenAI connector>>, specifies the OpenAI request URL.
274273
* For a <<resilient-action-type,{ibm-r} connector>>, specifies the {ibm-r} instance URL.
275274
* For a <<jira-action-type,Jira connector>>, specifies the Jira instance URL.
276275
* For an <<opsgenie-action-type,{opsgenie} connector>>, specifies the {opsgenie} URL. For example, `https://api.opsgenie.com` or `https://api.eu.opsgenie.com`.
277276
* For a <<pagerduty-action-type,PagerDuty connector>>, specifies the PagerDuty event URL. Defaults to `https://events.pagerduty.com/v2/enqueue`.
278277
* For a <<servicenow-action-type,{sn-itsm}>>, <<servicenow-sir-action-type,{sn-sir}>>, or <<servicenow-itom-action-type,{sn-itom} connector>> specifies the ServiceNow instance URL.
279278
* For a <<swimlane-action-type,{swimlane} connector>>, specifies the {swimlane} instance URL.
280-
279+
// ifeval::["featureAIConnector"=="true"]
280+
// * For an <<inference-action-type,AI connector>>, specifies the Elastic {inference} request.
281+
// endif::[]
281282
NOTE: If you are using the `xpack.actions.allowedHosts` setting, make sure the hostname in the URL is added to the allowed hosts.
282283
--
283284

‎oas_docs/examples/get_connector_types_generativeai_response.yaml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,3 @@ value:
3131
supported_feature_ids:
3232
- generativeAIForSecurity
3333
is_system_action_type: false
34-
- id: .inference
35-
name: Inference API
36-
enabled: true
37-
enabled_in_config: true
38-
enabled_in_license: true
39-
minimum_license_required: enterprise
40-
supported_feature_ids:
41-
- generativeAIForSecurity
42-
- generativeAIForObservability
43-
- generativeAIForSearchPlayground
44-
is_system_action_type: false

‎oas_docs/output/kibana.serverless.yaml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39976,17 +39976,20 @@ components:
3997639976
type: object
3997739977
properties:
3997839978
unit:
39979-
enum:
39980-
- s
39981-
- m
39982-
- h
39983-
type: string
39979+
$ref: >-
39980+
#/components/schemas/Security_Detections_API_AlertSuppressionDurationUnit
3998439981
value:
3998539982
minimum: 1
3998639983
type: integer
3998739984
required:
3998839985
- value
3998939986
- unit
39987+
Security_Detections_API_AlertSuppressionDurationUnit:
39988+
enum:
39989+
- s
39990+
- m
39991+
- h
39992+
type: string
3999039993
Security_Detections_API_AlertSuppressionGroupBy:
3999139994
items:
3999239995
type: string

0 commit comments

Comments
 (0)