Skip to content

Commit 79aaa07

Browse files
legregoelasticsearchmachineslobodanadamovic
authored
Grants kibana_system the ability to forcemerge certain indices. (elastic#135795) (elastic#137215)
* Grants kibana_system the ability to forcemerge certain indices. * Grants kibana_system the ability to forcemerge certain indices. * [CI] Auto commit changes from spotless * [CI] Auto commit changes from spotless * Update docs/changelog/135795.yaml * Update x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/store/KibanaOwnedReservedRoleDescriptors.java --------- Co-authored-by: elasticsearchmachine <[email protected]> Co-authored-by: Slobodan Adamović <[email protected]>
1 parent dabb916 commit 79aaa07

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

docs/changelog/135795.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 135795
2+
summary: Grants `kibana_system` the ability to forcemerge certain indices
3+
area: Authorization
4+
type: bug
5+
issues: []

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/store/KibanaOwnedReservedRoleDescriptors.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,8 @@ static RoleDescriptor kibanaSystem(String name) {
325325
TransportUpdateSettingsAction.TYPE.name(),
326326
TransportPutMappingAction.TYPE.name(),
327327
RolloverAction.NAME,
328-
"indices:admin/data_stream/lifecycle/put"
328+
"indices:admin/data_stream/lifecycle/put",
329+
"indices:admin/forcemerge*"
329330
)
330331
.build(),
331332
// Endpoint specific action responses. Kibana reads and writes (for third party

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,6 +1358,7 @@ public void testKibanaSystemRole() {
13581358
kibanaRole.indices().allowedIndicesMatcher("indices:admin/data_stream/lifecycle/put").test(indexAbstraction),
13591359
is(true)
13601360
);
1361+
assertThat(kibanaRole.indices().allowedIndicesMatcher("indices:admin/forcemerge").test(indexAbstraction), is(true));
13611362

13621363
// Implied by the overall view_index_metadata and monitor privilege
13631364
assertViewIndexMetadata(kibanaRole, indexName);

0 commit comments

Comments
 (0)