Skip to content

Commit 2b240c8

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into tsvb-colors
2 parents ef41763 + 3623875 commit 2b240c8

1,801 files changed

Lines changed: 39575 additions & 32452 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 & 20 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: {

‎.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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
"src/legacy/core_plugins/management",
2525
"src/plugins/management"
2626
],
27+
"maps_legacy": "src/plugins/maps_legacy",
28+
"indexPatternManagement": "src/plugins/index_pattern_management",
2729
"advancedSettings": "src/plugins/advanced_settings",
2830
"kibana_legacy": "src/plugins/kibana_legacy",
2931
"kibana_react": "src/legacy/core_plugins/kibana_react",
@@ -43,7 +45,7 @@
4345
"tileMap": "src/legacy/core_plugins/tile_map",
4446
"timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],
4547
"uiActions": "src/plugins/ui_actions",
46-
"visDefaultEditor": "src/legacy/core_plugins/vis_default_editor",
48+
"visDefaultEditor": "src/plugins/vis_default_editor",
4749
"visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
4850
"visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
4951
"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/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

‎docs/apm/spans.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ which indicates the next transaction in the trace.
3434
These transactions can be expanded and viewed in detail by clicking on them.
3535

3636
After exploring these traces,
37-
you can return to the full trace by clicking *View full trace* in the upper right hand corner of the page.
37+
you can return to the full trace by clicking *View full trace*.

‎docs/apm/transactions.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ image::apm/images/apm-transaction-duration-dist.png[Example view of transactions
105105

106106
This graph shows a typical distribution, and indicates most of our requests were served quickly - awesome!
107107
It's the requests on the right, the ones taking longer than average, that we probably want to focus on.
108+
108109
When you select one of these buckets,
109110
you're presented with up to ten trace samples.
110111
Each sample has a span timeline waterfall that shows what a typical request in that bucket was doing.

‎docs/apm/using-the-apm-ui.asciidoc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ APM is available via the navigation sidebar in {Kib}.
1515
* <<spans>>
1616
* <<errors>>
1717
* <<metrics>>
18+
* <<apm-alerts>>
1819
* <<machine-learning-integration>>
1920
* <<agent-configuration>>
2021
* <<advanced-queries>>
@@ -37,6 +38,8 @@ include::errors.asciidoc[]
3738

3839
include::metrics.asciidoc[]
3940

41+
include::apm-alerts.asciidoc[]
42+
4043
include::agent-configuration.asciidoc[]
4144

4245
include::custom-links.asciidoc[]

‎docs/canvas/canvas-share-workpad.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ After you've added the workpad to your website, you can change the autoplay and
7676

7777
To change the autoplay settings:
7878

79-
. In the lower right corner of the shareable workpad, click the settings icon.
79+
. Click the settings icon.
8080

8181
. Click *Auto Play*, then change the settings.
8282
+
@@ -85,7 +85,7 @@ image::images/canvas_share_autoplay_480.gif[Autoplay settings]
8585

8686
To change the toolbar settings:
8787

88-
. In the lower right corner, click the settings icon.
88+
. Click the settings icon.
8989

9090
. Click *Toolbar*, then change the settings.
9191
+

0 commit comments

Comments
 (0)