Skip to content

Commit 544525f

Browse files
committed
Merge branch 'master' into ml-move-validation-message-parsing-to-client
2 parents dcefb8e + 46253d6 commit 544525f

File tree

465 files changed

+2928
-1954
lines changed

Some content is hidden

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

465 files changed

+2928
-1954
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -794,6 +794,7 @@ module.exports = {
794794
{
795795
files: ['x-pack/plugins/fleet/**/*.{js,mjs,ts,tsx}'],
796796
rules: {
797+
'@typescript-eslint/consistent-type-imports': 'error',
797798
'import/order': [
798799
'warn',
799800
{

api_docs/ml.json

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5498,17 +5498,11 @@
54985498
"type": "Function",
54995499
"children": [
55005500
{
5501-
"type": "CompoundType",
5501+
"type": "Any",
55025502
"label": "error",
5503-
"isRequired": false,
5503+
"isRequired": true,
55045504
"signature": [
5505-
{
5506-
"pluginId": "ml",
5507-
"scope": "common",
5508-
"docId": "kibMlPluginApi",
5509-
"section": "def-common.ErrorType",
5510-
"text": "ErrorType"
5511-
}
5505+
"any"
55125506
],
55135507
"description": [],
55145508
"source": {
@@ -5518,9 +5512,7 @@
55185512
}
55195513
],
55205514
"signature": [
5521-
"(error: ",
5522-
"ErrorType",
5523-
") => string"
5515+
"(error: any) => string"
55245516
],
55255517
"description": [],
55265518
"label": "extractErrorMessage",

api_docs/monitoring.json

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,34 @@
4646
"signature": [
4747
"() => void"
4848
]
49+
},
50+
{
51+
"tags": [],
52+
"id": "def-server.IBulkUploader.start",
53+
"type": "Function",
54+
"label": "start",
55+
"description": [],
56+
"source": {
57+
"path": "x-pack/plugins/monitoring/server/types.ts",
58+
"lineNumber": 95
59+
},
60+
"signature": [
61+
"() => void"
62+
]
63+
},
64+
{
65+
"tags": [],
66+
"id": "def-server.IBulkUploader.handleNotEnabled",
67+
"type": "Function",
68+
"label": "handleNotEnabled",
69+
"description": [],
70+
"source": {
71+
"path": "x-pack/plugins/monitoring/server/types.ts",
72+
"lineNumber": 96
73+
},
74+
"signature": [
75+
"() => void"
76+
]
4977
}
5078
],
5179
"source": {
@@ -106,7 +134,7 @@
106134
"description": [],
107135
"source": {
108136
"path": "x-pack/plugins/monitoring/server/types.ts",
109-
"lineNumber": 98
137+
"lineNumber": 100
110138
},
111139
"signature": [
112140
"() => any"
@@ -115,7 +143,7 @@
115143
],
116144
"source": {
117145
"path": "x-pack/plugins/monitoring/server/types.ts",
118-
"lineNumber": 97
146+
"lineNumber": 99
119147
},
120148
"lifecycle": "setup",
121149
"initialIsOpen": true

docs/action-type-template.asciidoc

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[[<ACTION-TYPE>-action-type]]
2-
=== <ACTION-TYPE> action
2+
=== <ACTION-TYPE> connector and action
33
++++
44
<titleabbrev><ACTION-TYPE></titleabbrev>
55
++++
66

7-
Include a short description of the action type.
7+
Include a short description of the connector type.
88

99
[float]
1010
[[<ACTION-TYPE>-connector-configuration]]
@@ -13,24 +13,24 @@ Include a short description of the action type.
1313
<ACTION-TYPE> connectors have the following configuration properties.
1414

1515
////
16-
List of user-facing connector configurations. This should align with the fields available in the Create connector flyout form for this action type.
16+
List of user-facing connector configurations. This should align with the fields available in the Create connector flyout form for this connector type.
1717
////
1818

1919
Property1:: A short description of this property.
2020
Property2:: A short description of this property with format hints. This can be specified in `this specific format`.
2121

2222
[float]
2323
[[Preconfigured-<ACTION-TYPE>-configuration]]
24-
==== Preconfigured action type
24+
==== Preconfigured connector type
2525

2626
////
27-
Example preconfigured format for this action type
27+
Example preconfigured format for this connector type
2828
////
2929

3030
[source,text]
3131
--
3232
my-<ACTION-TYPE>:
33-
name: preconfigured-<ACTION-TYPE>-action-type
33+
name: preconfigured-<ACTION-TYPE>-connector-type
3434
actionTypeId: .<ACTION-TYPE>
3535
config:
3636
property1: value1
@@ -39,25 +39,23 @@ Example preconfigured format for this action type
3939
property3: value3
4040
--
4141

42-
[float]
43-
[[<ACTION-TYPE>-connector-config-properties]]
4442
////
4543
List of properties from the ConfigSchema and SecretsSchema for this action type.
4644
////
47-
Config defines information for the action type.
45+
Config defines information for the connector type.
4846

4947
`property1`:: A short description of this property.
5048
`property2`:: A short descriptionn of this property.
5149

52-
Secrets defines sensitive information for the action type.
50+
Secrets defines sensitive information for the connector type.
5351

5452
`property3`:: A short descriptionn of this property.
5553

5654
[float]
5755
[[<ACTION-TYPE>-action-configuration]]
5856
==== Action configuration
5957

60-
<ACTION-TYPE> actions have the following configuration properties.
58+
<ACTION-TYPE> actions have the following properties.
6159

6260
////
6361
List of user-facing action configurations. This should align with the fields available in the Action section of the Create/Update alert flyout.

docs/alert-type-template.asciidoc

Lines changed: 0 additions & 39 deletions
This file was deleted.

docs/developer/plugin-list.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@ to link individual managment section into it. This plugin does not contain any i
142142
management section itself.
143143
144144
145+
|{kib-repo}blob/{branch}/src/plugins/maps_ems/README.md[mapsEms]
146+
|Configuration of kibana-wide EMS settings and some higher level utilities.
147+
148+
145149
|{kib-repo}blob/{branch}/src/plugins/maps_legacy/README.md[mapsLegacy]
146150
|Internal objects used by the Coordinate, Region, and Vega visualizations.
147151

docs/management/alerting/alert-details.asciidoc

Lines changed: 0 additions & 33 deletions
This file was deleted.

docs/management/alerting/alert-management.asciidoc

Lines changed: 0 additions & 58 deletions
This file was deleted.

docs/management/alerting/alerts-and-actions-intro.asciidoc

Lines changed: 0 additions & 30 deletions
This file was deleted.

docs/management/alerting/connector-management.asciidoc

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
[[connector-management]]
33
=== Managing Connectors
44

5-
beta[]
6-
7-
Alerts use *Connectors* to route actions to different destinations like log files, ticketing systems, and messaging tools. While each {kib} app can offer their own types of alerts, they typically share connectors. The *Connectors* tab offers a central place to view and manage all the connectors in the current space.
5+
Rules use *Connectors* to route actions to different destinations like log files, ticketing systems, and messaging tools. While each {kib} app can offer their own types of rules, they typically share connectors. The *Connectors* tab offers a central place to view and manage all the connectors in the current space.
86

97
For more information on connectors and the types of actions available see <<action-types>>.
108

119
[role="screenshot"]
12-
image::images/connector-listing.png[Example connector listing in the Alerts and Actions UI]
10+
image::images/connector-listing.png[Example connector listing in the Rules and Connectors UI]
1311

1412

1513
[float]
@@ -21,15 +19,10 @@ The *Connectors* tab lists all connectors in the current space. The *search bar*
2119
image::images/connector-filter-by-search.png[Filtering the connector list using the search bar]
2220

2321

24-
The *type* dropdown also lets you filter to a subset of action types.
25-
26-
[role="screenshot"]
27-
image::images/connector-filter-by-type.png[Filtering the connector list by types of actions]
28-
29-
The *Actions* column indicates the number of actions that reference the connector. This count helps you confirm a connector is unused before you delete it, and tells you how many actions will be affected when a connector is modified.
22+
The *type* dropdown also lets you filter to a subset of connector types.
3023

3124
[role="screenshot"]
32-
image::images/connector-action-count.png[Filtering the connector list by types of actions]
25+
image::images/connector-filter-by-type.png[Filtering the connector list by types of connectors]
3326

3427
You can delete individual connectors using the trash icon. Connectors can also be deleted in bulk by multi-selecting them and clicking the *Delete* button to the left of the search box.
3528

@@ -44,4 +37,4 @@ When this happens the action will fail to execute, and appear as errors in the {
4437

4538
==== Creating a new connector
4639

47-
New connectors can be created by clicking the *Create connector* button, which will guide you to select the type of connector and configure it's properties. Refer to <<action-types>> for the types of connectors available and how to configure them. Once you create a connector it will be made available to you anytime you set up an action in the current space.
40+
New connectors can be created by clicking the *Create connector* button, which will guide you to select the type of connector and configure its properties. Refer to <<action-types>> for the types of connectors available and how to configure them. Once you create a connector it will be made available to you anytime you set up an action in the current space.

0 commit comments

Comments
 (0)