Skip to content

Commit d283260

Browse files
legregoelasticsearchmachineslobodanadamovic
authored
Grants kibana_system the ability to forcemerge certain indices. (elastic#135795) (elastic#137214)
* 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 8ebeec5 commit d283260

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
@@ -315,7 +315,8 @@ static RoleDescriptor kibanaSystem(String name) {
315315
TransportUpdateSettingsAction.TYPE.name(),
316316
TransportPutMappingAction.TYPE.name(),
317317
RolloverAction.NAME,
318-
"indices:admin/data_stream/lifecycle/put"
318+
"indices:admin/data_stream/lifecycle/put",
319+
"indices:admin/forcemerge*"
319320
)
320321
.build(),
321322
// 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
@@ -1345,6 +1345,7 @@ public void testKibanaSystemRole() {
13451345
kibanaRole.indices().allowedIndicesMatcher("indices:admin/data_stream/lifecycle/put").test(indexAbstraction),
13461346
is(true)
13471347
);
1348+
assertThat(kibanaRole.indices().allowedIndicesMatcher("indices:admin/forcemerge").test(indexAbstraction), is(true));
13481349

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

0 commit comments

Comments
 (0)