Skip to content

Commit 1571527

Browse files
authored
[Monitoring] Add new cluster privilege now necessary for the stack monitoring ui (#47871) (#47916)
* Add new cluster privilege now necessary for the stack monitoring ui * PR feedback, and add test
1 parent e745177 commit 1571527

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package org.elasticsearch.xpack.core.security.authz.store;
77

88
import org.elasticsearch.action.ActionListener;
9+
import org.elasticsearch.action.admin.cluster.remote.RemoteInfoAction;
910
import org.elasticsearch.action.admin.cluster.repositories.get.GetRepositoriesAction;
1011
import org.elasticsearch.common.collect.MapBuilder;
1112
import org.elasticsearch.xpack.core.monitoring.action.MonitoringBulkAction;
@@ -54,7 +55,7 @@ private static Map<String, RoleDescriptor> initializeReservedRoles() {
5455
null, null,
5556
MetadataUtils.DEFAULT_RESERVED_METADATA, null))
5657
.put("monitoring_user", new RoleDescriptor("monitoring_user",
57-
new String[] { "cluster:monitor/main", "cluster:monitor/xpack/info" },
58+
new String[] { "cluster:monitor/main", "cluster:monitor/xpack/info", RemoteInfoAction.NAME },
5859
new RoleDescriptor.IndicesPrivileges[] {
5960
RoleDescriptor.IndicesPrivileges.builder()
6061
.indices(".monitoring-*").privileges("read", "read_cross_cluster").build()

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import org.elasticsearch.Version;
99
import org.elasticsearch.action.admin.cluster.health.ClusterHealthAction;
10+
import org.elasticsearch.action.admin.cluster.remote.RemoteInfoAction;
1011
import org.elasticsearch.action.admin.cluster.repositories.get.GetRepositoriesAction;
1112
import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryAction;
1213
import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteAction;
@@ -438,6 +439,7 @@ public void testMonitoringUserRole() {
438439
Role monitoringUserRole = Role.builder(roleDescriptor, null).build();
439440
assertThat(monitoringUserRole.cluster().check(MainAction.NAME, request, authentication), is(true));
440441
assertThat(monitoringUserRole.cluster().check(XPackInfoAction.NAME, request, authentication), is(true));
442+
assertThat(monitoringUserRole.cluster().check(RemoteInfoAction.NAME, request, authentication), is(true));
441443
assertThat(monitoringUserRole.cluster().check(ClusterHealthAction.NAME, request, authentication), is(false));
442444
assertThat(monitoringUserRole.cluster().check(ClusterStateAction.NAME, request, authentication), is(false));
443445
assertThat(monitoringUserRole.cluster().check(ClusterStatsAction.NAME, request, authentication), is(false));

0 commit comments

Comments
 (0)