Skip to content

Commit 22eda80

Browse files
committed
Merge remote-tracking branch 'upstream/master' into task/hostlist-pagination
2 parents 971352a + 54ca7ed commit 22eda80

File tree

463 files changed

+10444
-4949
lines changed

Some content is hidden

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

463 files changed

+10444
-4949
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ module.exports = {
9696
},
9797
},
9898
{
99-
files: ['x-pack/legacy/plugins/cross_cluster_replication/**/*.{js,ts,tsx}'],
99+
files: ['x-pack/plugins/cross_cluster_replication/**/*.{js,ts,tsx}'],
100100
rules: {
101101
'jsx-a11y/click-events-have-key-events': 'off',
102102
},

.sass-lint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ files:
99
- 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
1010
- 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'
1111
- 'x-pack/plugins/lens/**/*.s+(a|c)ss'
12+
- 'x-pack/plugins/cross_cluster_replication/**/*.s+(a|c)ss'
1213
- 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
1314
- 'x-pack/plugins/maps/**/*.s+(a|c)ss'
1415
ignore:

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginstart.actions.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
```typescript
1010
actions: {
11-
createFiltersFromEvent: typeof createFiltersFromEvent;
11+
createFiltersFromValueClickAction: typeof createFiltersFromValueClickAction;
12+
createFiltersFromRangeSelectAction: typeof createFiltersFromRangeSelectAction;
1213
};
1314
```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export interface DataPublicPluginStart
1414

1515
| Property | Type | Description |
1616
| --- | --- | --- |
17-
| [actions](./kibana-plugin-plugins-data-public.datapublicpluginstart.actions.md) | <code>{</code><br/><code> createFiltersFromEvent: typeof createFiltersFromEvent;</code><br/><code> }</code> | |
17+
| [actions](./kibana-plugin-plugins-data-public.datapublicpluginstart.actions.md) | <code>{</code><br/><code> createFiltersFromValueClickAction: typeof createFiltersFromValueClickAction;</code><br/><code> createFiltersFromRangeSelectAction: typeof createFiltersFromRangeSelectAction;</code><br/><code> }</code> | |
1818
| [autocomplete](./kibana-plugin-plugins-data-public.datapublicpluginstart.autocomplete.md) | <code>AutocompleteStart</code> | |
1919
| [fieldFormats](./kibana-plugin-plugins-data-public.datapublicpluginstart.fieldformats.md) | <code>FieldFormatsStart</code> | |
2020
| [indexPatterns](./kibana-plugin-plugins-data-public.datapublicpluginstart.indexpatterns.md) | <code>IndexPatternsContract</code> | |

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformats.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
fieldFormats: {
1111
FieldFormat: typeof FieldFormat;
1212
FieldFormatsRegistry: typeof FieldFormatsRegistry;
13-
serialize: (agg: import("./search").AggConfig) => import("../../expressions/common").SerializedFieldFormat<object>;
13+
serialize: (agg: import("./search").AggConfig) => import("../../expressions").SerializedFieldFormat<object>;
1414
DEFAULT_CONVERTER_COLOR: {
1515
range: string;
1616
regex: string;

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformats.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
fieldFormats: {
1111
FieldFormatsRegistry: typeof FieldFormatsRegistry;
1212
FieldFormat: typeof FieldFormat;
13-
serializeFieldFormat: (agg: import("../public/search").AggConfig) => import("../../expressions/common").SerializedFieldFormat<object>;
13+
serializeFieldFormat: (agg: import("../public/search").AggConfig) => import("../../expressions").SerializedFieldFormat<object>;
1414
BoolFormat: typeof BoolFormat;
1515
BytesFormat: typeof BytesFormat;
1616
ColorFormat: typeof ColorFormat;

docs/user/alerting/action-types/email.asciidoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[role="xpack"]
22
[[email-action-type]]
3-
== Email action type
3+
=== Email action
44

55
The email action type uses the SMTP protocol to send mail message, using an integration of https://nodemailer.com/[Nodemailer]. Email message text is sent as both plain text and html text.
66

@@ -10,11 +10,11 @@ The email action type uses the SMTP protocol to send mail message, using an inte
1010

1111
Email connectors have the following configuration properties:
1212

13-
Name:: The name of the connector. The name is used to identify a connector in the management UI connector listing, or in the connector list when configuring an action.
13+
Name:: The name of the connector. The name is used to identify a connector in the management UI connector listing, or in the connector list when configuring an action.
1414
Sender:: The from address for all emails sent with this connector, specified in `user@host-name` format.
15-
Host:: Host name of the service provider. If you are using the <<action-settings, `xpack.actions.whitelistedHosts`>> setting, make sure this hostname is whitelisted.
15+
Host:: Host name of the service provider. If you are using the <<action-settings, `xpack.actions.whitelistedHosts`>> setting, make sure this hostname is whitelisted.
1616
Port:: The port to connect to on the service provider.
17-
Secure:: If true the connection will use TLS when connecting to the service provider. See https://nodemailer.com/smtp/#tls-options[nodemailer TLS documentation] for more information.
17+
Secure:: If true the connection will use TLS when connecting to the service provider. See https://nodemailer.com/smtp/#tls-options[nodemailer TLS documentation] for more information.
1818
Username:: username for 'login' type authentication.
1919
Password:: password for 'login' type authentication.
2020

@@ -26,4 +26,4 @@ Email actions have the following configuration properties:
2626

2727
To, CC, BCC:: Each is a list of addresses. Addresses can be specified in `user@host-name` format, or in `name <user@host-name>` format. One of To, CC, or BCC must contain an entry.
2828
Subject:: The subject line of the email.
29-
Message:: The message text of the email. Markdown format is supported.
29+
Message:: The message text of the email. Markdown format is supported.

docs/user/alerting/action-types/index.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[role="xpack"]
22
[[index-action-type]]
3-
== Index action type
3+
=== Index action
44

55
The index action type will index a document into {es}.
66

@@ -21,4 +21,4 @@ Execution time field:: This field will be automatically set to the time the ale
2121

2222
Index actions have the following properties:
2323

24-
Document:: The document to index in json format.
24+
Document:: The document to index in json format.

docs/user/alerting/action-types/pagerduty.asciidoc

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[role="xpack"]
22
[[pagerduty-action-type]]
3-
== PagerDuty action type
3+
=== PagerDuty action
44

55
The PagerDuty action type uses the https://v2.developer.pagerduty.com/docs/events-api-v2[v2 Events API] to trigger, acknowledge, and resolve PagerDuty alerts.
66

@@ -10,7 +10,7 @@ The PagerDuty action type uses the https://v2.developer.pagerduty.com/docs/event
1010

1111
[float]
1212
[[pagerduty-benefits]]
13-
=== PagerDuty + Elastic integration benefits
13+
==== PagerDuty + Elastic integration benefits
1414

1515
By integrating PagerDuty with alerts, you can:
1616

@@ -20,15 +20,15 @@ By integrating PagerDuty with alerts, you can:
2020

2121
[float]
2222
[[pagerduty-how-it-works]]
23-
==== How it works
23+
===== How it works
2424

2525
{kib} allows you to create alerts to notify you of a significant move
2626
in your dataset.
2727
You can create alerts for all your Observability, Security, and Elastic Stack use cases.
2828
Alerts will trigger a new incident on the corresponding PagerDuty service.
2929

3030
[float]
31-
==== Requirements
31+
===== Requirements
3232

3333
In the `kibana.yml` configuration file, you must add the <<general-alert-action-settings, saved objects encryption setting>>.
3434
This is required to encrypt parameters that must be secured, for example PagerDuty’s integration key.
@@ -47,18 +47,17 @@ review the <<action-settings, Actions settings>> that are available to you.
4747

4848
[float]
4949
[[pagerduty-support]]
50-
==== Support
50+
===== Support
5151
If you need help with this integration, get in touch with the {kib} team by visiting
5252
https://support.elastic.co[support.elastic.co] or by using the *Ask Elastic* option in the {kib} Help menu.
5353
You can also select the {kib} category at https://discuss.elastic.co/[discuss.elastic.co].
5454

5555
[float]
5656
[[pagerduty-integration-walkthrough]]
57-
==== Integration with PagerDuty walkthrough
57+
===== Integration with PagerDuty walkthrough
5858

59-
[float]
6059
[[pagerduty-in-pagerduty]]
61-
===== In PagerDuty
60+
*In PagerDuty*
6261

6362
. From the *Configuration* menu, select *Services*.
6463
. Add an integration to a service:
@@ -83,9 +82,8 @@ image::user/alerting/images/pagerduty-integration.png[PagerDuty Integrations tab
8382

8483
. Save this key, as you will use it when you configure the integration with Elastic in the next section.
8584

86-
[float]
8785
[[pagerduty-in-elastic]]
88-
===== In Elastic
86+
*In Elastic*
8987

9088
. Create a PagerDuty Connector in Kibana. You can:
9189
+
@@ -117,7 +115,7 @@ https://v2.developer.pagerduty.com/v2/docs/send-an-event-events-api-v2[API v2 do
117115

118116
[float]
119117
[[pagerduty-uninstall]]
120-
==== How to uninstall
118+
===== How to uninstall
121119
To remove a PagerDuty connector from an alert, simply remove it
122120
from the *Actions* section of that alert, using the remove (x) icon.
123121
This will disable the integration for the particular alert.
@@ -129,7 +127,7 @@ This is an irreversible action and impacts all alerts that use this connector.
129127

130128
[float]
131129
[[pagerduty-connector-configuration]]
132-
=== Connector configuration
130+
==== Connector configuration
133131

134132
PagerDuty connectors have the following configuration properties:
135133

@@ -139,7 +137,7 @@ Routing Key:: A 32 character PagerDuty Integration Key for an integration on a
139137

140138
[float]
141139
[[pagerduty-action-configuration]]
142-
=== Action configuration
140+
==== Action configuration
143141

144142
PagerDuty actions have the following properties:
145143

docs/user/alerting/action-types/server-log.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[role="xpack"]
22
[[server-log-action-type]]
3-
== Server log action type
3+
=== Server log action
44

55
This action type writes and entry to the {kib} server log.
66

@@ -18,4 +18,4 @@ Name:: The name of the connector. The name is used to identify a connector
1818

1919
Server log actions have the following properties:
2020

21-
Message:: The message to log.
21+
Message:: The message to log.

0 commit comments

Comments
 (0)