Skip to content

Commit e90a928

Browse files
committed
Merge remote-tracking branch 'origin/master' into feature/merge-code
2 parents 9aaf4ed + 7ff4134 commit e90a928

File tree

7 files changed

+696
-5
lines changed

7 files changed

+696
-5
lines changed

docs/ml/creating-jobs.asciidoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ An _advanced job_ can contain multiple detectors and enables you to configure al
2626
job settings.
2727

2828
{kib} can also recognize certain types of data and provide specialized wizards
29-
for that context. For example, if you use {filebeat-ref}/index.html[{filebeat}]
29+
for that context. For example, if you use {filebeat-ref}/index.html[{filebeat}]
3030
to ship access logs from your
3131
http://nginx.org/[Nginx] and https://httpd.apache.org/[Apache] HTTP servers to
32-
{es}, the following wizards appear:
32+
{es} and store it using fields and datatypes from the
33+
{ecs-ref}/ecs-reference.html[Elastic Common Schema (ECS)], the following wizards
34+
appear:
3335

3436
[role="screenshot"]
3537
image::ml/images/ml-data-recognizer-filebeat.jpg[A screenshot of the {filebeat} job creation wizards]
@@ -38,7 +40,7 @@ Likewise, if you use {auditbeat-ref}/index.html[{auditbeat}] to audit process
3840
activity on your systems, the following wizards appear:
3941

4042
[role="screenshot"]
41-
image::ml/images/ml-data-recognizer-auditbeat.jpg[A screenshot of the {auditbeat} job creation wizards]
43+
image::ml/images/ml-data-recognizer-auditbeat.jpg[A screenshot of the {auditbeat} job creation wizards]
4244

4345
These wizards create {ml} jobs, dashboards, searches, and visualizations that
4446
are customized to help you analyze your {auditbeat} and {filebeat} data.

docs/ml/images/ml-create-job.jpg

-221 KB
Loading
31 KB
Loading
20.9 KB
Loading

src/core/MIGRATION.md

Lines changed: 689 additions & 0 deletions
Large diffs are not rendered by default.

x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export const DropdownFilter: FunctionComponent<Props> = ({
5454
);
5555
});
5656

57-
/* tslint:disable:react-a11y-no-onchange */
57+
/* eslint-disable jsx-a11y/no-onchange */
5858
return (
5959
<div className="canvasDropdownFilter">
6060
<select className="canvasDropdownFilter__select" value={value} onChange={changeHandler}>

x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export const RemoteClusterTable = injectI18n(
140140
}),
141141
sortable: true,
142142
render: (isConnected) => <ConnectionStatus isConnected={isConnected} />,
143-
width: '160px',
143+
width: '240px',
144144
}, {
145145
field: 'connectedNodesCount',
146146
name: intl.formatMessage({

0 commit comments

Comments
 (0)