Skip to content

Commit d8a7eeb

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into contains-helper
2 parents b8efcc8 + 52a1b05 commit d8a7eeb

1,035 files changed

Lines changed: 34724 additions & 10850 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.

‎.ci/Jenkinsfile_baseline_trigger‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ kibanaLibrary.load()
1616

1717
withGithubCredentials {
1818
branches.each { branch ->
19+
if (branch == '6.8') {
20+
// skip 6.8, it is tracked but we don't need snapshots for it and haven't backported
21+
// the baseline capture scripts to it.
22+
return;
23+
}
24+
1925
stage(branch) {
2026
def commits = getCommits(branch, MAXIMUM_COMMITS_TO_CHECK, MAXIMUM_COMMITS_TO_BUILD)
2127

‎.ci/end2end.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ pipeline {
111111
}
112112
}
113113
cleanup {
114-
notifyBuildResult(notifyPRComment: false, analyzeFlakey: false, shouldNotify: false)
114+
notifyBuildResult(prComment: false, analyzeFlakey: false, shouldNotify: false)
115115
}
116116
}
117117
}

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
/src/dev/ @elastic/kibana-operations
116116
/src/setup_node_env/ @elastic/kibana-operations
117117
/src/optimize/ @elastic/kibana-operations
118-
/src/es_archiver/ @elastic/kibana-operations
119118
/packages/*eslint*/ @elastic/kibana-operations
120119
/packages/*babel*/ @elastic/kibana-operations
121120
/packages/kbn-dev-utils*/ @elastic/kibana-operations
@@ -124,6 +123,7 @@
124123
/packages/kbn-pm/ @elastic/kibana-operations
125124
/packages/kbn-test/ @elastic/kibana-operations
126125
/packages/kbn-ui-shared-deps/ @elastic/kibana-operations
126+
/packages/kbn-es-archiver/ @elastic/kibana-operations
127127
/src/legacy/server/keystore/ @elastic/kibana-operations
128128
/src/legacy/server/pid/ @elastic/kibana-operations
129129
/src/legacy/server/sass/ @elastic/kibana-operations

‎docs/developer/architecture/code-exploration.asciidoc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,6 @@ WARNING: Missing README.
186186
Replaces the legacy ui/share module for registering share context menus.
187187
188188
189-
- {kib-repo}blob/{branch}/src/plugins/status_page[statusPage]
190-
191-
WARNING: Missing README.
192-
193-
194189
- {kib-repo}blob/{branch}/src/plugins/telemetry/README.md[telemetry]
195190
196191
Telemetry allows Kibana features to have usage tracked in the wild. The general term "telemetry" refers to multiple things:

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,23 @@
44

55
beta[]
66

7-
The *Alerts and Actions* UI lets you <<alert-management, see and control all the alerts>> in a space, and provides tools to <<connector-management, create and manage connectors>> so that alerts can trigger actions like notification, indexing, and ticketing.
7+
The *Alerts and Actions* UI lets you <<alert-management, see and control all the alerts>> in a space, and provides tools to <<connector-management, create and manage connectors>> so that alerts can trigger actions like notification, indexing, and ticketing.
88

9-
To manage alerting and connectors, open the menu, then go to *Stack Management > {kib} > Alerts and Actions*.
9+
To manage alerting and connectors, open the menu,
10+
then go to *Stack Management > Alerts and Insights > Alerts and Actions*.
1011

1112
[role="screenshot"]
1213
image:management/alerting/images/alerts-and-actions-ui.png[Example alert listing in the Alerts and Actions UI]
1314

1415
[NOTE]
1516
============================================================================
1617
Similar to dashboards, alerts and connectors reside in a <<xpack-spaces, space>>.
17-
The *Alerts and Actions* UI only shows alerts and connectors for the current space.
18+
The *Alerts and Actions* UI only shows alerts and connectors for the current space.
1819
============================================================================
1920

2021
[NOTE]
2122
============================================================================
2223
{es} also offers alerting capabilities through Watcher, which
23-
can be managed through the <<watcher-ui, Watcher UI>>. See
24+
can be managed through the <<watcher-ui, Watcher UI>>. See
2425
<<alerting-concepts-differences>> for more information.
25-
============================================================================
26+
============================================================================

‎docs/management/index-lifecycle-policies/add-policy-to-index.asciidoc‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
[[adding-policy-to-index]]
33
=== Adding a policy to an index
44

5-
To add a lifecycle policy to an index and view the status for indices
6-
managed by a policy, open the menu, then go to *Stack Management > {es} > Index Management*. This page lists your
7-
{es} indices, which you can filter by lifecycle status and lifecycle phase.
5+
To add a lifecycle policy to an index and view the status for indices
6+
managed by a policy, open the menu, then go to *Stack Management > Data > Index Management*.
7+
This page lists your
8+
{es} indices, which you can filter by lifecycle status and lifecycle phase.
89

910
To add a policy, select the index name and then select *Manage Index > Add lifecycle policy*.
10-
You’ll see the policy name, the phase the index is in, the current
11-
action, and if any errors occurred performing that action.
11+
You’ll see the policy name, the phase the index is in, the current
12+
action, and if any errors occurred performing that action.
1213

1314
To remove a policy from an index, select *Manage Index > Remove lifecycle policy*.
1415

1516
[role="screenshot"]
1617
image::images/index_management_add_policy.png[][UI for adding a policy to an index]
17-
18-

‎docs/management/index-lifecycle-policies/example-index-lifecycle-policy.asciidoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[[example-using-index-lifecycle-policy]]
44
=== Tutorial: Use {ilm-init} to manage {filebeat} time-based indices
55

6-
With {ilm} ({ilm-init}), you can create policies that perform actions automatically
6+
With {ilm} ({ilm-init}), you can create policies that perform actions automatically
77
on indices as they age and grow. {ilm-init} policies help you to manage
88
performance, resilience, and retention of your data during its lifecycle. This tutorial shows
99
you how to use {kib}’s *Index Lifecycle Policies* to modify and create {ilm-init}
@@ -59,7 +59,7 @@ output as described in {filebeat-ref}/filebeat-getting-started.html[Getting Star
5959
{filebeat} includes a default {ilm-init} policy that enables rollover. {ilm-init}
6060
is enabled automatically if you’re using the default `filebeat.yml` and index template.
6161

62-
To view the default policy in {kib}, open the menu, go to * Stack Management > {es} > Index Lifecycle Policies*,
62+
To view the default policy in {kib}, open the menu, go to *Stack Management > Data > Index Lifecycle Policies*,
6363
search for _filebeat_, and choose the _filebeat-version_ policy.
6464

6565
This policy initiates the rollover action when the index size reaches 50GB or
@@ -114,7 +114,7 @@ If meeting a specific retention time period is most important, you can create a
114114
custom policy. For this option, you will use {filebeat} daily indices without
115115
rollover.
116116

117-
. To create a custom policy, open the menu, go to *Stack Management > {es} > Index Lifecycle Policies*, then click
117+
. To create a custom policy, open the menu, go to *Stack Management > Data > Index Lifecycle Policies*, then click
118118
*Create policy*.
119119

120120
. Activate the warm phase and configure it as follows:
@@ -156,7 +156,7 @@ image::images/tutorial-ilm-custom-policy.png["Modify the custom policy to add a
156156
[role="screenshot"]
157157
image::images/tutorial-ilm-delete-phase-creation.png["Delete phase"]
158158

159-
. To configure the index to use the new policy, open the menu, then go to *Stack Management > {es} > Index Lifecycle
159+
. To configure the index to use the new policy, open the menu, then go to *Stack Management > Data > Index Lifecycle
160160
Policies*.
161161

162162
.. Find your {ilm-init} policy.

‎docs/management/ingest-pipelines/ingest-pipelines.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pipelines that perform common transformations and
77
enrichments on your data. For example, you might remove a field,
88
rename an existing field, or set a new field.
99

10-
You’ll find *Ingest Node Pipelines* in *Management > Elasticsearch*. With this feature, you can:
10+
You’ll find *Ingest Node Pipelines* in *Stack Management > Ingest*. With this feature, you can:
1111

1212
* View a list of your pipelines and drill down into details.
1313
* Create a pipeline that defines a series of tasks, known as processors.
@@ -23,7 +23,7 @@ image:management/ingest-pipelines/images/ingest-pipeline-list.png["Ingest node p
2323
The minimum required permissions to access *Ingest Node Pipelines* are
2424
the `manage_pipeline` and `cluster:monitor/nodes/info` cluster privileges.
2525

26-
You can add these privileges in *Management > Security > Roles*.
26+
You can add these privileges in *Stack Management > Security > Roles*.
2727

2828
[role="screenshot"]
2929
image:management/ingest-pipelines/images/ingest-pipeline-privileges.png["Privileges required for Ingest Node Pipelines"]

‎docs/management/managing-beats.asciidoc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
include::{asciidoc-dir}/../../shared/discontinued.asciidoc[tag=cm-discontinued]
66

7-
To use the Central Management UI, open the menu, go to *Stack Management > {beats} > Central Management*, then define and
7+
To use {beats} Central Management UI, open the menu, go to *Stack Management > Ingest >
8+
{beats} Central Management*, then define and
89
manage configurations in a central location in {kib} and quickly deploy
910
configuration changes to all {beats} running across your enterprise. For more
1011
about central management, see the related {beats} documentation:
@@ -17,8 +18,8 @@ about central management, see the related {beats} documentation:
1718
This feature requires an Elastic license that includes {beats} central
1819
management.
1920
20-
Don't have a license? You can start a 30-day trial. Open the menu, go to
21-
*Stack Management > Elasticsearch > License Management*. At the end of the trial
21+
Don't have a license? You can start a 30-day trial. Open the menu,
22+
go to *Stack Management > Stack > License Management*. At the end of the trial
2223
period, you can purchase a subscription to keep using central management. For
2324
more information, see https://www.elastic.co/subscriptions and
2425
<<managing-licenses>>.

‎docs/management/managing-ccr.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ remote clusters on a local cluster. {ref}/xpack-ccr.html[Cross-cluster replicati
77
is commonly used to provide remote backups for disaster recovery and for
88
geo-proximite copies of data.
99

10-
To get started, open the menu, then go to *Stack Management > Elasticsearch > Cross-Cluster Replication*.
10+
To get started, open the menu, then go to *Stack Management > Data > Cross-Cluster Replication*.
1111

1212
[role="screenshot"]
1313
image::images/cross-cluster-replication-list-view.png[][Cross-cluster replication list view]

0 commit comments

Comments
 (0)