Skip to content

Commit b5aeb34

Browse files
committed
Merge branch 'master' into kpm/config-change
2 parents e42ac5e + c76519e commit b5aeb34

425 files changed

Lines changed: 8684 additions & 3719 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.

.github/workflows/pr-project-assigner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Assign a PR to project based on label
99
steps:
1010
- name: Assign to project
11-
uses: elastic/github-actions/project-assigner@v1.0.0
11+
uses: elastic/github-actions/project-assigner@v1.0.1
1212
id: project_assigner
1313
with:
1414
issue-mappings: |

.github/workflows/project-assigner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Assign issue or PR to project based on label
99
steps:
1010
- name: Assign to project
11-
uses: elastic/github-actions/project-assigner@v1.0.0
11+
uses: elastic/github-actions/project-assigner@v1.0.1
1212
id: project_assigner
1313
with:
1414
issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}, {"label": "Feature:Lens", "projectName": "Lens", "columnId": 6219363}, {"label": "Team:Canvas", "projectName": "canvas", "columnId": 6187593}]'

docs/management/watcher-ui/index.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ If the {es} {security-features} are enabled, you must have the
3434
{ref}/security-privileges.html[`manage_watcher` or `monitor_watcher`]
3535
cluster privileges to use Watcher in {kib}.
3636

37-
Alternately, you can have the built-in `kibana_user` role
37+
Alternately, you can have the built-in `kibana_admin` role
3838
and either of these watcher roles:
3939

4040
* `watcher_admin`. You can perform all Watcher actions, including create and edit watches.

docs/migration/migrate_8_0.asciidoc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,21 @@ specified explicitly.
8080

8181
*Impact:* Any workflow that involved manually clearing generated bundles will have to be updated with the new path.
8282

83+
[float]
84+
[[breaking_80_user_role_changes]]
85+
=== User role changes
86+
87+
[float]
88+
==== `kibana_user` role has been removed and `kibana_admin` has been added.
89+
90+
*Details:* The `kibana_user` role has been removed and `kibana_admin` has been added to better
91+
reflect its intended use. This role continues to grant all access to every
92+
{kib} feature. If you wish to restrict access to specific features, create
93+
custom roles with {kibana-ref}/kibana-privileges.html[{kib} privileges].
94+
95+
*Impact:* Any users currently assigned the `kibana_user` role will need to
96+
instead be assigned the `kibana_admin` role to maintain their current
97+
access level.
8398

8499
[float]
85100
[[breaking_80_reporting_changes]]

docs/plugins/known-plugins.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ This list of plugins is not guaranteed to work on your version of Kibana. Instea
2020
* https://github.com/johtani/analyze-api-ui-plugin[Analyze UI] (johtani) - UI for elasticsearch _analyze API
2121
* https://github.com/TrumanDu/cleaner[Cleaner] (TrumanDu)- Setting index ttl.
2222
* https://github.com/bitsensor/elastalert-kibana-plugin[ElastAlert Kibana Plugin] (BitSensor) - UI to create, test and edit ElastAlert rules
23+
* https://github.com/query-ai/queryai-kibana-plugin[AI Analyst] (Query.AI) - App providing: NLP queries, automation, ML visualizations and insights
2324

2425
[float]
2526
=== Timelion Extensions

docs/uptime-guide/security.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ PUT /_security/role/uptime
4242
=== Assign the role to a user
4343

4444
Next, you'll need to create a user with both the `uptime` role, and another role with sufficient {kibana-ref}/kibana-privileges.html[Kibana privileges],
45-
such as the `kibana_user` role.
45+
such as the `kibana_admin` role.
4646
You can do this with the following request:
4747

4848
["source","sh",subs="attributes,callouts"]
4949
---------------------------------------------------------------
5050
PUT /_security/user/jacknich
5151
{
5252
"password" : "j@rV1s",
53-
"roles" : [ "uptime", "kibana_user" ],
53+
"roles" : [ "uptime", "kibana_admin" ],
5454
"full_name" : "Jack Nicholson",
5555
"email" : "jacknich@example.com",
5656
"metadata" : {

docs/user/monitoring/viewing-metrics.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ remote monitoring cluster, you must use credentials that are valid on both the
6363

6464
--
6565

66-
.. Create users that have the `monitoring_user` and `kibana_user`
66+
.. Create users that have the `monitoring_user` and `kibana_admin`
6767
{ref}/built-in-roles.html[built-in roles].
6868

6969
. Open {kib} in your web browser.

docs/user/security/authorization/index.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
[[xpack-security-authorization]]
33

44
=== Granting access to {kib}
5-
The Elastic Stack comes with the `kibana_user` {ref}/built-in-roles.html[built-in role], which you can use to grant access to all Kibana features in all spaces. To grant users access to a subset of spaces or features, you can create a custom role that grants the desired Kibana privileges.
5+
The Elastic Stack comes with the `kibana_admin` {ref}/built-in-roles.html[built-in role], which you can use to grant access to all Kibana features in all spaces. To grant users access to a subset of spaces or features, you can create a custom role that grants the desired Kibana privileges.
66

7-
When you assign a user multiple roles, the user receives a union of the roles’ privileges. Therefore, assigning the `kibana_user` role in addition to a custom role that grants Kibana privileges is ineffective because `kibana_user` has access to all the features in all spaces.
7+
When you assign a user multiple roles, the user receives a union of the roles’ privileges. Therefore, assigning the `kibana_admin` role in addition to a custom role that grants Kibana privileges is ineffective because `kibana_admin` has access to all the features in all spaces.
88

9-
NOTE: When running multiple tenants of Kibana by changing the `kibana.index` in your `kibana.yml`, you cannot use `kibana_user` to grant access. You must create custom roles that authorize the user for that specific tenant. Although multi-tenant installations are supported, the recommended approach to securing access to Kibana segments is to grant users access to specific spaces.
9+
NOTE: When running multiple tenants of Kibana by changing the `kibana.index` in your `kibana.yml`, you cannot use `kibana_admin` to grant access. You must create custom roles that authorize the user for that specific tenant. Although multi-tenant installations are supported, the recommended approach to securing access to Kibana segments is to grant users access to specific spaces.
1010

1111
[role="xpack"]
1212
=== {kib} role management

docs/user/security/reporting.asciidoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ elasticsearch.username: 'custom_kibana_system'
8585
[[reporting-roles-user-api]]
8686
==== With the user API
8787
This example uses the {ref}/security-api-put-user.html[user API] to create a user who has the
88-
`reporting_user` role and the `kibana_user` role:
88+
`reporting_user` role and the `kibana_admin` role:
8989

9090
[source, sh]
9191
---------------------------------------------------------------
9292
POST /_security/user/reporter
9393
{
9494
"password" : "x-pack-test-password",
95-
"roles" : ["kibana_user", "reporting_user"],
95+
"roles" : ["kibana_admin", "reporting_user"],
9696
"full_name" : "Reporting User"
9797
}
9898
---------------------------------------------------------------
@@ -106,11 +106,11 @@ roles on a per user basis, or assign roles to groups of users. By default, role
106106
mappings are configured in
107107
{ref}/mapping-roles.html[`config/shield/role_mapping.yml`].
108108
For example, the following snippet assigns the user named Bill Murray the
109-
`kibana_user` and `reporting_user` roles:
109+
`kibana_admin` and `reporting_user` roles:
110110

111111
[source,yaml]
112112
--------------------------------------------------------------------------------
113-
kibana_user:
113+
kibana_admin:
114114
- "cn=Bill Murray,dc=example,dc=com"
115115
reporting_user:
116116
- "cn=Bill Murray,dc=example,dc=com"

docs/user/security/securing-kibana.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ You can manage privileges on the *Management / Security / Roles* page in {kib}.
104104
If you're using the native realm with Basic Authentication, you can assign roles
105105
using the *Management / Security / Users* page in {kib} or the
106106
{ref}/security-api.html#security-user-apis[user management APIs]. For example,
107-
the following creates a user named `jacknich` and assigns it the `kibana_user`
107+
the following creates a user named `jacknich` and assigns it the `kibana_admin`
108108
role:
109109

110110
[source,js]
111111
--------------------------------------------------------------------------------
112112
POST /_security/user/jacknich
113113
{
114114
"password" : "t0pS3cr3t",
115-
"roles" : [ "kibana_user" ]
115+
"roles" : [ "kibana_admin" ]
116116
}
117117
--------------------------------------------------------------------------------
118118
// CONSOLE

0 commit comments

Comments
 (0)