Skip to content

Commit 02541b9

Browse files
Merge branch 'master' into ml-fix-job-list-error-if-notif-index-wrong
2 parents dc1daf9 + 1cefc8e commit 02541b9

File tree

316 files changed

+8863
-2987
lines changed

Some content is hidden

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

316 files changed

+8863
-2987
lines changed

.backportrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"targetBranchChoices": [
44
{ "name": "master", "checked": true },
55
{ "name": "7.x", "checked": true },
6+
"7.10",
67
"7.9",
78
"7.8",
89
"7.7",
@@ -27,7 +28,7 @@
2728
"targetPRLabels": ["backport"],
2829
"branchLabelMapping": {
2930
"^v8.0.0$": "master",
30-
"^v7.10.0$": "7.x",
31+
"^v7.11.0$": "7.x",
3132
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
3233
}
3334
}

docs/developer/contributing/index.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The Release Notes summarize what the PRs accomplish in language that is meaningf
4949

5050
The text that appears in the Release Notes is pulled directly from your PR title, or a single paragraph of text that you specify in the PR description.
5151

52-
To use a single paragraph of text, enter `Release note:` or a `## Release note` header in the PR description, followed by your text. For example, refer to this https://github.com/elastic/kibana/pull/65796[PR] that uses the `## Release note` header.
52+
To use a single paragraph of text, enter a `Release note:` or `## Release note` header in the PR description ("dev docs" works too), followed by your text. For example, refer to this https://github.com/elastic/kibana/pull/65796[PR] that uses the `## Release note` header.
5353

5454
When you create the Release Notes text, use the following best practices:
5555

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<b>Signature:</b>
88

99
```typescript
10-
export declare type IndexPatternSelectProps = Required<Omit<EuiComboBoxProps<any>, 'isLoading' | 'onSearchChange' | 'options' | 'selectedOptions'>, 'onChange' | 'placeholder'> & {
10+
export declare type IndexPatternSelectProps = Required<Omit<EuiComboBoxProps<any>, 'isLoading' | 'onSearchChange' | 'options' | 'selectedOptions' | 'onChange'>, 'placeholder'> & {
11+
onChange: (indexPatternId?: string) => void;
1112
indexPatternId: string;
1213
fieldTypes?: string[];
1314
onNoIndexPatterns?: () => void;
14-
savedObjectsClient: SavedObjectsClientContract;
1515
};
1616
```
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[chapter]
22
[role="xpack"]
3-
[[ingest-manager]]
4-
= {ingest-manager}
3+
[[fleet]]
4+
= {fleet}
55

66
experimental[]
77

8-
{ingest-manager} in {kib} enables you to add and manage integrations for popular
8+
{fleet} in {kib} enables you to add and manage integrations for popular
99
services and platforms, as well as manage {elastic-agent} installations in
1010
standalone or {fleet} mode.
1111

@@ -17,11 +17,13 @@ Standalone mode requires you to manually configure and manage the agent locally.
1717
* An overview of the data ingest in your {es} cluster.
1818
* Multiple integrations to collect and transform data.
1919

20+
//TODO: Redo screen capture.
21+
2022
[role="screenshot"]
21-
image::ingest_manager/images/ingest-manager-start.png[{ingest-manager} app in {kib}]
23+
image::fleet/images/fleet-start.png[{fleet} app in {kib}]
2224

2325
[float]
2426
== Get started
2527

26-
To get started with {ingest-management}, refer to the
28+
To get started with {fleet}, refer to the
2729
{ingest-guide}/index.html[Ingest Management Guide].

docs/fleet/images/fleet-start.png

90.1 KB
Loading
-73.4 KB
Binary file not shown.

docs/management/advanced-options.asciidoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,6 @@ The opacity of the chart items that are dimmed when highlighting another element
454454
of the chart. The lower this number, the more the highlighted element stands out.
455455
This must be a number between 0 and 1.
456456

457-
[[visualization-loadingdelay]]`visualization:loadingDelay`::
458-
The time to wait before dimming visualizations during a query.
459-
460457
[[visualization-regionmap-showwarnings]]`visualization:regionmap:showWarnings`::
461458
Shows a warning in a region map when terms cannot be joined to a shape.
462459

docs/settings/ingest-manager-settings.asciidoc renamed to docs/settings/fleet-settings.asciidoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
[role="xpack"]
2-
[[ingest-manager-settings-kb]]
3-
=== {ingest-manager} settings in {kib}
2+
[[fleet-settings-kb]]
3+
=== {fleet} settings in {kib}
44
++++
5-
<titleabbrev>{ingest-manager} settings</titleabbrev>
5+
<titleabbrev>{fleet} settings</titleabbrev>
66
++++
77

88
experimental[]
99

1010
You can configure `xpack.fleet` settings in your `kibana.yml`.
11-
By default, {ingest-manager} is enabled. To use {fleet}, you also need to configure {kib} and {es} hosts.
11+
By default, {fleet} is enabled. To use {fleet}, you also need to configure {kib} and {es} hosts.
1212

1313
See the {ingest-guide}/index.html[Ingest Management] docs for more information.
1414

15-
[[general-ingest-manager-settings-kb]]
16-
==== General {ingest-manager} settings
15+
[[general-fleet-settings-kb]]
16+
==== General {fleet} settings
1717

1818
[cols="2*<"]
1919
|===
2020
| `xpack.fleet.enabled` {ess-icon}
21-
| Set to `true` (default) to enable {ingest-manager}.
21+
| Set to `true` (default) to enable {fleet}.
2222
| `xpack.fleet.agents.enabled` {ess-icon}
2323
| Set to `true` (default) to enable {fleet}.
2424
|===
2525

26-
[[ingest-manager-data-visualizer-settings]]
26+
[[fleet-data-visualizer-settings]]
2727

2828
==== {package-manager} settings
2929

docs/settings/settings-xkb.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ include::ml-settings.asciidoc[]
2020
include::reporting-settings.asciidoc[]
2121
include::spaces-settings.asciidoc[]
2222
include::i18n-settings.asciidoc[]
23-
include::ingest-manager-settings.asciidoc[]
23+
include::fleet-settings.asciidoc[]

docs/setup/settings.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ include::{kib-repo-dir}/settings/alert-action-settings.asciidoc[]
638638
include::{kib-repo-dir}/settings/apm-settings.asciidoc[]
639639
include::{kib-repo-dir}/settings/dev-settings.asciidoc[]
640640
include::{kib-repo-dir}/settings/graph-settings.asciidoc[]
641-
include::{kib-repo-dir}/settings/ingest-manager-settings.asciidoc[]
641+
include::{kib-repo-dir}/settings/fleet-settings.asciidoc[]
642642
include::{kib-repo-dir}/settings/i18n-settings.asciidoc[]
643643
include::{kib-repo-dir}/settings/logs-ui-settings.asciidoc[]
644644
include::{kib-repo-dir}/settings/infrastructure-ui-settings.asciidoc[]

0 commit comments

Comments
 (0)