Skip to content

Commit b7684cc

Browse files
authored
Merge branch 'main' into eui-88.2.x
2 parents 2e64389 + d7573c7 commit b7684cc

235 files changed

Lines changed: 7922 additions & 429 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.

.github/CODEOWNERS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,13 @@ packages/kbn-managed-vscode-config @elastic/kibana-operations
480480
packages/kbn-managed-vscode-config-cli @elastic/kibana-operations
481481
packages/kbn-management/cards_navigation @elastic/platform-deployment-management
482482
src/plugins/management @elastic/platform-deployment-management
483+
packages/kbn-management/settings/components/field_input @elastic/platform-deployment-management @elastic/appex-sharedux
484+
packages/kbn-management/settings/components/field_row @elastic/platform-deployment-management @elastic/appex-sharedux
485+
packages/kbn-management/settings/field_definition @elastic/platform-deployment-management @elastic/appex-sharedux
486+
packages/kbn-management/settings/setting_ids @elastic/appex-sharedux @elastic/platform-deployment-management
483487
packages/kbn-management/settings/section_registry @elastic/appex-sharedux @elastic/platform-deployment-management
488+
packages/kbn-management/settings/types @elastic/platform-deployment-management @elastic/appex-sharedux
489+
packages/kbn-management/settings/utilities @elastic/platform-deployment-management @elastic/appex-sharedux
484490
packages/kbn-management/storybook/config @elastic/platform-deployment-management
485491
test/plugin_functional/plugins/management_test_plugin @elastic/kibana-app-services
486492
packages/kbn-mapbox-gl @elastic/kibana-gis
@@ -633,9 +639,13 @@ packages/kbn-securitysolution-utils @elastic/security-detection-engine
633639
packages/kbn-server-http-tools @elastic/kibana-core
634640
packages/kbn-server-route-repository @elastic/apm-ui
635641
x-pack/plugins/serverless @elastic/appex-sharedux
642+
packages/serverless/settings/common @elastic/appex-sharedux @elastic/platform-deployment-management
636643
x-pack/plugins/serverless_observability @elastic/appex-sharedux @elastic/apm-ui
644+
packages/serverless/settings/observability_project @elastic/appex-sharedux @elastic/apm-ui @elastic/platform-deployment-management
637645
packages/serverless/project_switcher @elastic/appex-sharedux
638646
x-pack/plugins/serverless_search @elastic/enterprise-search-frontend
647+
packages/serverless/settings/search_project @elastic/enterprise-search-frontend @elastic/platform-deployment-management
648+
packages/serverless/settings/security_project @elastic/security-solution @elastic/platform-deployment-management
639649
packages/serverless/storybook/config @elastic/appex-sharedux
640650
packages/serverless/types @elastic/appex-sharedux
641651
test/plugin_functional/plugins/session_notifications @elastic/kibana-core

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

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

docs/management/connectors/action-types/teams.asciidoc

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
++++
44
<titleabbrev>Microsoft Teams</titleabbrev>
55
++++
6+
:frontmatter-description: Add a connector that can send messages to a Microsoft Teams channel.
7+
:frontmatter-tags-products: [kibana]
8+
:frontmatter-tags-content-type: [how-to]
9+
:frontmatter-tags-user-goals: [configure]
610

711
The Microsoft Teams connector uses https://docs.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/add-incoming-webhook[Incoming Webhooks].
812

@@ -25,28 +29,6 @@ Microsoft Teams connectors have the following configuration properties:
2529
Name:: The name of the connector.
2630
Webhook URL:: The URL of the incoming webhook. See https://docs.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/add-incoming-webhook#add-an-incoming-webhook-to-a-teams-channel[Add Incoming Webhooks] for instructions on generating this URL. If you are using the <<action-settings, `xpack.actions.allowedHosts`>> setting, make sure the hostname is added to the allowed hosts.
2731

28-
[float]
29-
[[preconfigured-teams-configuration]]
30-
=== Create preconfigured connectors
31-
32-
If you are running {kib} on-prem, you can define connectors by
33-
adding `xpack.actions.preconfigured` settings to your `kibana.yml` file.
34-
For example:
35-
36-
[source,text]
37-
--
38-
xpack.actions.preconfigured:
39-
my-teams:
40-
name: preconfigured-teams-connector-type
41-
actionTypeId: .teams
42-
secrets:
43-
webhookUrl: 'https://outlook.office.com/webhook/abcd@0123456/IncomingWebhook/abcdefgh/ijklmnopqrstuvwxyz'
44-
--
45-
46-
Secrets defines sensitive information for the connector type.
47-
48-
`webhookUrl`:: A string that corresponds to *Webhook URL*.
49-
5032
[float]
5133
[[teams-action-configuration]]
5234
=== Test connectors

docs/management/connectors/action-types/xmatters.asciidoc

Lines changed: 7 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -33,59 +33,12 @@ xMatters connectors have the following configuration properties:
3333

3434
Name:: The name of the connector.
3535
Authentication Type:: The type of authentication used in the request made to xMatters.
36-
URL:: The request URL for the Elastic Alerts trigger in xMatters. If you are using the <<action-settings, `xpack.actions.allowedHosts`>> setting, make sure the hostname is added to the allowed hosts.
37-
Username:: Username for HTTP Basic Authentication.
38-
Password:: Password for HTTP Basic Authentication.
39-
40-
[float]
41-
[[preconfigured-xmatters-configuration]]
42-
=== Create preconfigured connectors
43-
44-
If you are running {kib} on-prem, you can define connectors by
45-
adding `xpack.actions.preconfigured` settings to your `kibana.yml` file.
46-
For example:
47-
48-
Connector using Basic Authentication
49-
[source,text]
50-
--
51-
xpack.actions.preconfigured:
52-
my-xmatters:
53-
name: preconfigured-xmatters-connector-type
54-
actionTypeId: .xmatters
55-
config:
56-
configUrl: https://test.host
57-
usesBasic: true
58-
secrets:
59-
user: testuser
60-
password: passwordkeystorevalue
61-
--
62-
63-
Connector using URL Authentication
64-
[source,text]
65-
--
66-
xpack.actions.preconfigured:
67-
my-xmatters:
68-
name: preconfigured-xmatters-connector-type
69-
actionTypeId: .xmatters
70-
config:
71-
usesBasic: false
72-
secrets:
73-
secretsUrl: https://test.host?apiKey=1234-abcd
74-
--
75-
76-
Config defines information for the connector type:
77-
78-
`configUrl`:: A URL string that corresponds to *URL*. Only used if `usesBasic` is true.
79-
80-
`usesBasic`:: A boolean that corresponds to *Authentication Type*. If `true`, this connector will require values for `user` and `password` inside the secrets configuration. Defaults to `true`.
81-
82-
Secrets defines sensitive information for the connector type:
83-
84-
`user`:: A string that corresponds to *User*. Required if `usesBasic` is set to `true`.
85-
86-
`password`:: A string that corresponds to *Password*. Should be stored in the <<creating-keystore, {kib} keystore>>. Required if `usesBasic` is set to `true`.
87-
88-
`secretsUrl`:: A URL string that corresponds to *URL*. Only used if `usesBasic` is false, indicating the API key is included in the URL.
36+
URL::
37+
The request URL for the Elastic Alerts trigger in xMatters.
38+
If you are using URL authentication, include the API key in the URL. For example, `https://example.com?apiKey=1234-abcd`.
39+
If you are using the <<action-settings,`xpack.actions.allowedHosts`>> setting, make sure the hostname is added to the allowed hosts.
40+
Username:: Username for HTTP basic authentication.
41+
Password:: Password for HTTP basic authentication.
8942

9043
[float]
9144
[[xmatters-action-configuration]]
@@ -100,7 +53,7 @@ image::management/connectors/images/xmatters-params-test.png[xMatters params tes
10053

10154
xMatters rules have the following properties:
10255

103-
Severity:: Severity of the rule.
56+
Severity:: Severity of the rule.
10457
Tags:: Comma-separated list of tags for the rule as provided by the user in Elastic.
10558

10659
[float]

docs/management/connectors/pre-configured-connectors.asciidoc

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ Index names must start with `kibana-alert-history-` to take advantage of the pre
113113
* <<preconfigured-server-log-configuration>>
114114
* <<preconfigured-webhook-configuration>>
115115
* <<preconfigured-cases-webhook-configuration>>
116+
* <<preconfigured-xmatters-configuration>>
116117

117118
[float]
118119
[[preconfigured-index-configuration]]
@@ -157,6 +158,23 @@ xpack.actions.preconfigured:
157158
<3> The account email for HTTP basic authentication.
158159
<4> The API authentication token for HTTP basic authentication. NOTE: This value should be stored in the <<creating-keystore,{kib} keystore>>.
159160

161+
[float]
162+
[[preconfigured-teams-configuration]]
163+
==== Microsoft Teams connectors
164+
165+
The following example creates a <<teams-action-type,Microsoft Teams connector>>:
166+
167+
[source,text]
168+
--
169+
xpack.actions.preconfigured:
170+
my-teams:
171+
name: preconfigured-teams-connector-type
172+
actionTypeId: .teams
173+
secrets:
174+
webhookUrl: 'https://outlook.office.com/webhook/abcd@0123456/IncomingWebhook/abcdefgh/ijklmnopqrstuvwxyz' <1>
175+
--
176+
<1> The URL of the incoming webhook.
177+
160178
[float]
161179
[[preconfigured-opsgenie-configuration]]
162180
==== {opsgenie} connectors
@@ -292,3 +310,43 @@ xpack.actions.preconfigured:
292310
<14> A stringified JSON payload with Mustache variables that is sent to the create comment URL to create a case comment.
293311
<15> A user name, which is required when `hasAuth` is `true`.
294312
<16> A password, which is required when `hasAuth` is `true`.
313+
314+
[float]
315+
[[preconfigured-xmatters-configuration]]
316+
==== xMatters connectors
317+
318+
The following example creates an <<xmatters-action-type,xMatters connector>> with basic authentication:
319+
320+
[source,text]
321+
--
322+
xpack.actions.preconfigured:
323+
my-xmatters:
324+
name: preconfigured-xmatters-connector-type
325+
actionTypeId: .xmatters
326+
config:
327+
configUrl: https://test.host <1>
328+
usesBasic: true <2>
329+
secrets:
330+
user: testuser <3>
331+
password: passwordkeystorevalue <4>
332+
--
333+
<1> The request URL for the Elastic Alerts trigger in xMatters.
334+
<2> Indicates whether the connector uses HTTP basic authentication. If `true`, you must provide `user` and `password` values. Defaults to `true`.
335+
<3> A user name for authentication, which is required when `usesBasic` is `true`.
336+
<4> A password for authentication, which is required when `usesBasic` is `true`. NOTE: This value should be stored in the <<creating-keystore,{kib} keystore>>.
337+
338+
The following example creates an xMatters connector with URL authentication:
339+
340+
[source,text]
341+
--
342+
xpack.actions.preconfigured:
343+
my-xmatters:
344+
name: preconfigured-xmatters-connector-type
345+
actionTypeId: .xmatters
346+
config:
347+
usesBasic: false <1>
348+
secrets:
349+
secretsUrl: https://test.host?apiKey=1234-abcd <2>
350+
--
351+
<1> Indicates whether the connector uses HTTP basic authentication. Set to `false` to use URL authentication. Defaults to `true`.
352+
<2> The request URL for the Elastic Alerts trigger in xMatters with the API key included in the URL.

docs/settings/alert-action-settings.asciidoc

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,9 @@ A configuration URL that varies by connector:
269269
NOTE: If you are using the `xpack.actions.allowedHosts` setting, make sure the hostname in the URL is added to the allowed hosts.
270270
--
271271

272+
`xpack.actions.preconfigured.<connector-id>.config.configUrl`::
273+
For an <<xmatters-action-type,xMatters connector>> with basic authentication, specifies the request URL for the Elastic Alerts trigger in xMatters.
274+
272275
`xpack.actions.preconfigured.<connector-id>.config.createCommentJson`::
273276
For a <<cases-webhook-action-type,{webhook-cm} connector>>, specifies a stringified JSON payload with Mustache variables that is sent to the create comment URL to create a case comment. The required variable is `case.description`.
274277
+
@@ -336,6 +339,9 @@ For a <<cases-webhook-action-type,{webhook-cm} connector>>, specifies the REST A
336339
+
337340
NOTE: If you are using the `xpack.actions.allowedHosts` setting, make sure the hostname in the URL is added to the allowed hosts.
338341

342+
`xpack.actions.preconfigured.<connector-id>.config.usesBasic`::
343+
For an <<xmatters-action-type,xMatters connector>>, specifies whether it uses HTTP basic authentication. Defaults to `true`.
344+
339345
`xpack.actions.preconfigured.<connector-id>.config.viewIncidentUrl`::
340346
For a <<cases-webhook-action-type,{webhook-cm} connector>>, specifies a URL string with either the external service ID or external service title Mustache variable to view a case in the external system.
341347

@@ -365,17 +371,30 @@ A password secret that varies by connector:
365371
+
366372
--
367373
* For a <<cases-webhook-action-type,{webhook-cm} connector>>, specifies a password that is required when `xpack.actions.preconfigured.<connector-id>.config.hasAuth` is `true`.
374+
* For an <<xmatters-action-type,xMatters connector>>, specifies a password that is required when `xpack.actions.preconfigured.<connector-id>.config.usesBasic` is `true`.
368375
--
369376

370377
`xpack.actions.preconfigured.<connector-id>.secrets.routingKey`::
371378
For a <<pagerduty-action-type,PagerDuty connector>>, specifies the 32 character PagerDuty Integration Key for an integration on a service, also referred to as the routing key.
372379

380+
`xpack.actions.preconfigured.<connector-id>.secrets.secretsUrl`::
381+
For an <<xmatters-action-type,xMatters connector>> with URL authentication, specifies the request URL for the Elastic Alerts trigger in xMatters with the API key included in the URL.
382+
It is used only when `xpack.actions.preconfigured.<connector-id>.config.usesBasic` is `false`.
383+
+
384+
NOTE: If you are using the `xpack.actions.allowedHosts` setting, make sure this hostname is added to the allowed hosts.
385+
373386
`xpack.actions.preconfigured.<connector-id>.secrets.user`::
374387
A user name secret that varies by connector:
375388
+
376389
--
377390
* For a <<cases-webhook-action-type,{webhook-cm} connector>>, specifies a user name that is required when `xpack.actions.preconfigured.<connector-id>.config.hasAuth` is `true`.
391+
* For an <<xmatters-action-type,xMatters connector>>, specifies a user name that is required when `xpack.actions.preconfigured.<connector-id>.config.usesBasic` is `true`.
378392
--
393+
`xpack.actions.preconfigured.<connector-id>.secrets.webhookUrl`::
394+
For a <<teams-action-type,Microsoft Teams>>, specifies the URL of the incoming webhook.
395+
+
396+
NOTE: If you are using the `xpack.actions.allowedHosts` setting, make sure the hostname is added to the allowed hosts.
397+
379398

380399
[float]
381400
[[alert-settings]]

package.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,13 @@
500500
"@kbn/logstash-plugin": "link:x-pack/plugins/logstash",
501501
"@kbn/management-cards-navigation": "link:packages/kbn-management/cards_navigation",
502502
"@kbn/management-plugin": "link:src/plugins/management",
503+
"@kbn/management-settings-components-field-input": "link:packages/kbn-management/settings/components/field_input",
504+
"@kbn/management-settings-components-field-row": "link:packages/kbn-management/settings/components/field_row",
505+
"@kbn/management-settings-field-definition": "link:packages/kbn-management/settings/field_definition",
506+
"@kbn/management-settings-ids": "link:packages/kbn-management/settings/setting_ids",
503507
"@kbn/management-settings-section-registry": "link:packages/kbn-management/settings/section_registry",
508+
"@kbn/management-settings-types": "link:packages/kbn-management/settings/types",
509+
"@kbn/management-settings-utilities": "link:packages/kbn-management/settings/utilities",
504510
"@kbn/management-test-plugin": "link:test/plugin_functional/plugins/management_test_plugin",
505511
"@kbn/mapbox-gl": "link:packages/kbn-mapbox-gl",
506512
"@kbn/maps-custom-raster-source-plugin": "link:x-pack/examples/third_party_maps_source_example",
@@ -638,9 +644,13 @@
638644
"@kbn/server-http-tools": "link:packages/kbn-server-http-tools",
639645
"@kbn/server-route-repository": "link:packages/kbn-server-route-repository",
640646
"@kbn/serverless": "link:x-pack/plugins/serverless",
647+
"@kbn/serverless-common-settings": "link:packages/serverless/settings/common",
641648
"@kbn/serverless-observability": "link:x-pack/plugins/serverless_observability",
649+
"@kbn/serverless-observability-settings": "link:packages/serverless/settings/observability_project",
642650
"@kbn/serverless-project-switcher": "link:packages/serverless/project_switcher",
643651
"@kbn/serverless-search": "link:x-pack/plugins/serverless_search",
652+
"@kbn/serverless-search-settings": "link:packages/serverless/settings/search_project",
653+
"@kbn/serverless-security-settings": "link:packages/serverless/settings/security_project",
644654
"@kbn/serverless-types": "link:packages/serverless/types",
645655
"@kbn/session-notifications-plugin": "link:test/plugin_functional/plugins/session_notifications",
646656
"@kbn/session-view-plugin": "link:x-pack/plugins/session_view",

packages/core/lifecycle/core-lifecycle-server-mocks/src/core_setup.mock.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ export function createCoreSetupMock({
4848
const uiSettingsMock = {
4949
register: uiSettingsServiceMock.createSetupContract().register,
5050
registerGlobal: uiSettingsServiceMock.createSetupContract().registerGlobal,
51+
setAllowlist: uiSettingsServiceMock.createSetupContract().setAllowlist,
5152
};
5253

5354
const mock: CoreSetupMockType = {

packages/core/plugins/core-plugins-server-internal/src/plugin_context.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
258258
uiSettings: {
259259
register: deps.uiSettings.register,
260260
registerGlobal: deps.uiSettings.registerGlobal,
261+
setAllowlist: deps.uiSettings.setAllowlist,
261262
},
262263
userSettings: {
263264
setUserProfileSettings: deps.userSettings.setUserProfileSettings,

packages/core/test-helpers/core-test-helpers-kbn-server/src/create_serverless_root.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ function createServerlessES() {
8686
clean: true,
8787
kill: true,
8888
waitForReady: true,
89+
// security is enabled by default, if needed kibana requires serviceAccountToken
90+
esArgs: ['xpack.security.enabled=false'],
8991
});
9092
const client = getServerlessESClient({ port: esPort });
9193

0 commit comments

Comments
 (0)