Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into deangularize-context-3
Browse files Browse the repository at this point in the history
kibanamachine authored Nov 2, 2020
2 parents bd9caf1 + 89e2af8 commit 72d58f6
Showing 279 changed files with 1,953 additions and 2,684 deletions.
6 changes: 1 addition & 5 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -39,10 +39,6 @@
#CC# /src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
#CC# /src/legacy/server/url_shortening/ @elastic/kibana-app
#CC# /src/legacy/ui/public/state_management @elastic/kibana-app
#CC# /src/plugins/advanced_settings/ @elastic/kibana-app
#CC# /src/plugins/charts/ @elastic/kibana-app
#CC# /src/plugins/index_pattern_management/public @elastic/kibana-app
#CC# /src/plugins/vis_default_editor @elastic/kibana-app

# App Architecture
/examples/bfetch_explorer/ @elastic/kibana-app-arch
@@ -74,7 +70,7 @@
/x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-arch
/x-pack/plugins/ui_actions_enhanced/ @elastic/kibana-app-arch
#CC# /src/plugins/bfetch/ @elastic/kibana-app-arch
#CC# /src/plugins/index_pattern_management/public/service @elastic/kibana-app-arch
#CC# /src/plugins/index_pattern_management/ @elastic/kibana-app-arch
#CC# /src/plugins/inspector/ @elastic/kibana-app-arch
#CC# /src/plugins/share/ @elastic/kibana-app-arch
#CC# /x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch
4 changes: 2 additions & 2 deletions docs/api/saved-objects/rotate_encryption_key.asciidoc
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ Bulk key rotation can consume a considerable amount of resources and hence only
`type`::
(Optional, string) Limits encryption key rotation only to the saved objects with the specified type. By default, {kib} tries to rotate the encryption key for all saved object types that may contain encrypted attributes.

`batchSize`::
`batch_size`::
(Optional, number) Specifies a maximum number of saved objects that {kib} can process in a single batch. Bulk key rotation is an iterative process since {kib} may not be able to fetch and process all required saved objects in one go and splits processing into consequent batches. By default, the batch size is 10000, which is also a maximum allowed value.

[[saved-objects-api-rotate-encryption-key-response-body]]
@@ -91,7 +91,7 @@ In this example, key rotation is performed for all saved objects with the `alert

[source,sh]
--------------------------------------------------
$ curl -X POST /api/encrypted_saved_objects/_rotate_key?type=alert&batchSize=5000
$ curl -X POST /api/encrypted_saved_objects/_rotate_key?type=alert&batch_size=5000
--------------------------------------------------
// KIBANA

12 changes: 8 additions & 4 deletions docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
@@ -22,8 +22,10 @@ NOTE:
|Description
|{kib-repo}blob/{branch}/src/plugins/advanced_settings[advancedSettings]
|WARNING: Missing README.
|{kib-repo}blob/{branch}/src/plugins/advanced_settings/README.md[advancedSettings]
|This plugin contains the advanced settings management section
allowing users to configure their advanced settings, also known
as uiSettings within the code.
|{kib-repo}blob/{branch}/src/plugins/apm_oss[apmOss]
@@ -130,8 +132,10 @@ in Kibana, e.g. visualizations. It has the form of a flyout panel.
|WARNING: Missing README.
|{kib-repo}blob/{branch}/src/plugins/management[management]
|WARNING: Missing README.
|{kib-repo}blob/{branch}/src/plugins/management/README.md[management]
|This plugins contains the "Stack Management" page framework. It offers navigation and an API
to link individual managment section into it. This plugin does not contain any individual
management section itself.
|{kib-repo}blob/{branch}/src/plugins/maps_legacy/README.md[mapsLegacy]
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed docs/management/images/management_index_labels.png
Binary file not shown.
258 changes: 0 additions & 258 deletions docs/management/managing-indices.asciidoc

This file was deleted.

2 changes: 1 addition & 1 deletion docs/management/watcher-ui/index.asciidoc
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ To manage roles, open then main menu, then click *Stack Management > Roles*, or
all users with the same role.

NOTE: If you are creating a threshold watch, you must also have the `view_index_metadata` index privilege. See
<<managing-indices, Managing Indices>> for detailed information.
{ref}/index-mgmt.html[Index management] for detailed information.

[float]
[[watcher-create-threshold-alert]]
5 changes: 5 additions & 0 deletions docs/redirects.asciidoc
Original file line number Diff line number Diff line change
@@ -143,3 +143,8 @@ This content has moved. See
This content has moved. See
<<get-started, Quick start>>.

[role="exclude",id="managing-indices"]
== Index management

This content has moved. See {ref}/index-mgmt.html[Index management].

Loading

0 comments on commit 72d58f6

Please sign in to comment.