Skip to content

Commit feb0b8f

Browse files
authored
update kibana_system to grant it access to .chat-* system index (#131419)
* update `kibana_system` to grant it access to `.chat-*` system index * fix unit test
1 parent b4a455d commit feb0b8f

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

modules/kibana/src/main/java/org/elasticsearch/kibana/KibanaPlugin.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ public class KibanaPlugin extends Plugin implements SystemIndexPlugin {
3838
.setAllowedElasticProductOrigins(KIBANA_PRODUCT_ORIGIN)
3939
.build();
4040

41+
public static final SystemIndexDescriptor ONECHAT_INDEX_DESCRIPTOR = SystemIndexDescriptor.builder()
42+
.setIndexPattern(".chat-*")
43+
.setDescription("Onechat system index")
44+
.setType(Type.EXTERNAL_UNMANAGED)
45+
.setAllowedElasticProductOrigins(KIBANA_PRODUCT_ORIGIN)
46+
.build();
47+
4148
public static final SystemIndexDescriptor APM_AGENT_CONFIG_INDEX_DESCRIPTOR = SystemIndexDescriptor.builder()
4249
.setIndexPattern(".apm-agent-configuration*")
4350
.setDescription("system index for APM agent configuration")
@@ -57,6 +64,7 @@ public Collection<SystemIndexDescriptor> getSystemIndexDescriptors(Settings sett
5764
return List.of(
5865
KIBANA_INDEX_DESCRIPTOR,
5966
REPORTING_INDEX_DESCRIPTOR,
67+
ONECHAT_INDEX_DESCRIPTOR,
6068
APM_AGENT_CONFIG_INDEX_DESCRIPTOR,
6169
APM_CUSTOM_LINK_INDEX_DESCRIPTOR
6270
);

modules/kibana/src/test/java/org/elasticsearch/kibana/KibanaPluginTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class KibanaPluginTests extends ESTestCase {
2020
public void testKibanaIndexNames() {
2121
assertThat(
2222
new KibanaPlugin().getSystemIndexDescriptors(Settings.EMPTY).stream().map(SystemIndexDescriptor::getIndexPattern).toList(),
23-
contains(".kibana_*", ".reporting-*", ".apm-agent-configuration*", ".apm-custom-link*")
23+
contains(".kibana_*", ".reporting-*", ".chat-*", ".apm-agent-configuration*", ".apm-custom-link*")
2424
);
2525
}
2626
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ static RoleDescriptor kibanaSystem(String name) {
109109
new RoleDescriptor.IndicesPrivileges[] {
110110
// System indices defined in KibanaPlugin
111111
RoleDescriptor.IndicesPrivileges.builder()
112-
.indices(".kibana*", ".reporting-*")
112+
.indices(".kibana*", ".reporting-*", ".chat-*")
113113
.privileges("all")
114114
.allowRestrictedIndices(true)
115115
.build(),

0 commit comments

Comments
 (0)