Skip to content

Commit 30986fd

Browse files
Merge branch 'master' into canvas-embeddable-plugin
2 parents fb464c7 + 52747c9 commit 30986fd

File tree

2,271 files changed

+92264
-53206
lines changed

Some content is hidden

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

2,271 files changed

+92264
-53206
lines changed

.eslintrc.js

Lines changed: 5 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -69,26 +69,6 @@ module.exports = {
6969
'jsx-a11y/no-onchange': 'off',
7070
},
7171
},
72-
{
73-
files: ['src/legacy/core_plugins/expressions/**/*.{js,ts,tsx}'],
74-
rules: {
75-
'react-hooks/exhaustive-deps': 'off',
76-
},
77-
},
78-
{
79-
files: [
80-
'src/legacy/core_plugins/vis_default_editor/public/components/controls/**/*.{ts,tsx}',
81-
],
82-
rules: {
83-
'react-hooks/exhaustive-deps': 'off',
84-
},
85-
},
86-
{
87-
files: ['src/legacy/ui/public/vis/**/*.{js,ts,tsx}'],
88-
rules: {
89-
'react-hooks/exhaustive-deps': 'off',
90-
},
91-
},
9272
{
9373
files: ['src/plugins/es_ui_shared/**/*.{js,ts,tsx}'],
9474
rules: {
@@ -552,29 +532,6 @@ module.exports = {
552532
},
553533
},
554534

555-
/**
556-
* Graph overrides
557-
*/
558-
{
559-
files: ['x-pack/legacy/plugins/graph/**/*.js'],
560-
globals: {
561-
angular: true,
562-
$: true,
563-
},
564-
rules: {
565-
'block-scoped-var': 'off',
566-
camelcase: 'off',
567-
eqeqeq: 'off',
568-
'guard-for-in': 'off',
569-
'new-cap': 'off',
570-
'no-loop-func': 'off',
571-
'no-redeclare': 'off',
572-
'no-shadow': 'off',
573-
'no-unused-vars': 'off',
574-
'one-var': 'off',
575-
},
576-
},
577-
578535
/**
579536
* ML overrides
580537
*/
@@ -771,7 +728,7 @@ module.exports = {
771728
* Lens overrides
772729
*/
773730
{
774-
files: ['x-pack/legacy/plugins/lens/**/*.ts', 'x-pack/legacy/plugins/lens/**/*.tsx'],
731+
files: ['x-pack/legacy/plugins/lens/**/*.{ts,tsx}', 'x-pack/plugins/lens/**/*.{ts,tsx}'],
775732
rules: {
776733
'@typescript-eslint/no-explicit-any': 'error',
777734
},
@@ -885,8 +842,10 @@ module.exports = {
885842
* TSVB overrides
886843
*/
887844
{
888-
files: ['src/legacy/core_plugins/metrics/**/*.js'],
889-
excludedFiles: 'src/legacy/core_plugins/metrics/index.js',
845+
files: [
846+
'src/plugins/vis_type_timeseries/**/*.{js,ts,tsx}',
847+
'src/legacy/core_plugins/vis_type_timeseries/**/*.{js,ts,tsx}',
848+
],
890849
rules: {
891850
'import/no-default-export': 'error',
892851
},

.github/CODEOWNERS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
/src/plugins/console/ @elastic/es-ui
181181
/src/plugins/es_ui_shared/ @elastic/es-ui
182182
/x-pack/legacy/plugins/cross_cluster_replication/ @elastic/es-ui
183-
/x-pack/legacy/plugins/index_lifecycle_management/ @elastic/es-ui
183+
/x-pack/plugins/index_lifecycle_management/ @elastic/es-ui
184184
/x-pack/legacy/plugins/index_management/ @elastic/es-ui
185185
/x-pack/legacy/plugins/license_management/ @elastic/es-ui
186186
/x-pack/legacy/plugins/rollup/ @elastic/es-ui
@@ -202,7 +202,8 @@
202202
# Endpoint
203203
/x-pack/plugins/endpoint/ @elastic/endpoint-app-team
204204
/x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team
205-
/x-pack/test/functional/apps/endpoint/ @elastic/endpoint-app-team
205+
/x-pack/test/functional_endpoint/ @elastic/endpoint-app-team
206+
/x-pack/test/functional_endpoint_ingest_failure/ @elastic/endpoint-app-team
206207
/x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team
207208

208209
# SIEM

.i18nrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"src/legacy/core_plugins/management",
2525
"src/plugins/management"
2626
],
27+
"indexPatternManagement": "src/plugins/index_pattern_management",
2728
"advancedSettings": "src/plugins/advanced_settings",
2829
"kibana_legacy": "src/plugins/kibana_legacy",
2930
"kibana_react": "src/legacy/core_plugins/kibana_react",
@@ -43,7 +44,7 @@
4344
"tileMap": "src/legacy/core_plugins/tile_map",
4445
"timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],
4546
"uiActions": "src/plugins/ui_actions",
46-
"visDefaultEditor": "src/legacy/core_plugins/vis_default_editor",
47+
"visDefaultEditor": "src/plugins/vis_default_editor",
4748
"visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
4849
"visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
4950
"visTypeTable": "src/legacy/core_plugins/vis_type_table",

docs/api/saved-objects/bulk_create.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ The API returns the following:
104104
"type": "dashboard",
105105
"error": {
106106
"statusCode": 409,
107-
"message": "version conflict, document already exists"
107+
"message": "Saved object [dashboard/be3733a0-9efe-11e7-acb3-3dab96693fab] conflict"
108108
}
109109
}
110110
]

docs/api/spaces-management/resolve_copy_saved_objects_conflicts.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Execute the <<spaces-api-copy-saved-objects,copy saved objects to space API>>, w
103103
.Properties of `error`
104104
[%collapsible%open]
105105
=======
106-
`type`:::::
106+
`type`::::
107107
(string) The type of error. For example, `unsupported_type`, `missing_references`, or `unknown`.
108108
=======
109109
======

docs/apm/api.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The following Agent configuration APIs are available:
4444

4545
`service`::
4646
(required, object) Service identifying the configuration to create or update.
47-
47+
+
4848
.Properties of `service`
4949
[%collapsible%open]
5050
======
@@ -100,7 +100,7 @@ PUT /api/apm/settings/agent-configuration
100100
===== Request body
101101
`service`::
102102
(required, object) Service identifying the configuration to delete
103-
103+
+
104104
.Properties of `service`
105105
[%collapsible%open]
106106
======
@@ -217,7 +217,7 @@ GET /api/apm/settings/agent-configuration
217217

218218
`service`::
219219
(required, object) Service identifying the configuration.
220-
220+
+
221221
.Properties of `service`
222222
[%collapsible%open]
223223
======

docs/apm/apm-alerts.asciidoc

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
[role="xpack"]
2+
[[apm-alerts]]
3+
=== Create an alert
4+
5+
beta::[]
6+
7+
The APM app is integrated with Kibana's {kibana-ref}/alerting-getting-started.html[alerting and actions] feature.
8+
It provides a set of built-in **actions** and APM specific threshold **alerts** for you to use,
9+
and allows all alerts to be centrally managed from <<management,Kibana Management>>.
10+
11+
[role="screenshot"]
12+
image::apm/images/apm-alert.png[Create an alert in the APM app]
13+
14+
There are two different types of threshold alerts: transaction duration, and error rate.
15+
Below, we'll create one of each.
16+
17+
[float]
18+
[[apm-create-transaction-alert]]
19+
=== Create a transaction duration alert
20+
21+
This guide creates an alert for the `opbeans-java` service based on the following criteria:
22+
23+
* Transaction type: `transaction.type:request`
24+
* Average request is above `1500ms` for the last 5 minutes
25+
* Check every 10 minutes, and repeat the alert every 30 minutes
26+
* Send the alert via Slack
27+
28+
From the APM app, navigate to the `opbeans-java` service and select
29+
**Alerts** > **Create threshold alert** > **Transaction duration**.
30+
31+
The name of your alert will automatically be set as `Transaction duration | opbeans-java`,
32+
and the alert will be tagged with `apm` and `service.name:opbeans-java`.
33+
Feel free to edit either of these defaults.
34+
35+
Based on the alert criteria, define the following alert details:
36+
37+
* **Check every** - `10 minutes`
38+
* **Notify every** - `30 minutes`
39+
* **TYPE** - `request`
40+
* **WHEN** - `avg`
41+
* **IS ABOVE** - `1500ms`
42+
* **FOR THE LAST** - `5 minutes`
43+
44+
Select an action type.
45+
Multiple action types can be selected, but in this example we want to post to a slack channel.
46+
Select **Slack** > **Create a connector**.
47+
Enter a name for the connector,
48+
and paste the webhook URL.
49+
See Slack's webhook documentation if you need to create one.
50+
51+
Select **Save**. The alert has been created and is now active!
52+
53+
[float]
54+
[[apm-create-error-alert]]
55+
=== Create an error rate alert
56+
57+
This guide creates an alert for the `opbeans-python` service based on the following criteria:
58+
59+
* Error rate is above 25 for the last minute
60+
* Check every 1 minute, and repeat the alert every 10 minutes
61+
* Send the alert via email to the `opbeans-python` team
62+
63+
From the APM app, navigate to the `opbeans-python` service and select
64+
**Alerts** > **Create threshold alert** > **Error rate**.
65+
66+
The name of your alert will automatically be set as `Error rate | opbeans-python`,
67+
and the alert will be tagged with `apm` and `service.name:opbeans-python`.
68+
Feel free to edit either of these defaults.
69+
70+
Based on the alert criteria, define the following alert details:
71+
72+
* **Check every** - `1 minute`
73+
* **Notify every** - `10 minutes`
74+
* **IS ABOVE** - `25 errors`
75+
* **FOR THE LAST** - `1 minute`
76+
77+
Select the **Email** action type and click **Create a connector**.
78+
Fill out the required details: sender, host, port, etc., and click **save**.
79+
80+
Select **Save**. The alert has been created and is now active!
81+
82+
[float]
83+
[[apm-alert-manage]]
84+
=== Manage alerts and actions
85+
86+
From the APM app, select **Alerts** > **View active alerts** to be taken to the Kibana alerts and actions management page.
87+
From this page, you can create, edit, disable, mute, and delete alerts, and create, edit, and disable connectors.
88+
89+
[float]
90+
[[apm-alert-more-info]]
91+
=== More information
92+
93+
See {kibana-ref}/alerting-getting-started.html[alerting and actions] for more information.
94+
95+
NOTE: If you are using an **on-premise** Elastic Stack deployment with security,
96+
TLS must be configured for communication between Elasticsearch and Kibana.
97+
More information is in the alerting {kibana-ref}/alerting-getting-started.html#alerting-setup-prerequisites[prerequisites].

docs/apm/images/apm-alert.png

643 KB
Loading
524 KB
Loading

docs/apm/images/service-maps.png

483 KB
Loading

0 commit comments

Comments
 (0)