diff --git a/modules/kibana/src/main/java/org/elasticsearch/kibana/KibanaPlugin.java b/modules/kibana/src/main/java/org/elasticsearch/kibana/KibanaPlugin.java index e5877d1f2eb2a..550ac2482a0b2 100644 --- a/modules/kibana/src/main/java/org/elasticsearch/kibana/KibanaPlugin.java +++ b/modules/kibana/src/main/java/org/elasticsearch/kibana/KibanaPlugin.java @@ -38,6 +38,13 @@ public class KibanaPlugin extends Plugin implements SystemIndexPlugin { .setAllowedElasticProductOrigins(KIBANA_PRODUCT_ORIGIN) .build(); + public static final SystemIndexDescriptor ONECHAT_INDEX_DESCRIPTOR = SystemIndexDescriptor.builder() + .setIndexPattern(".chat-*") + .setDescription("Onechat system index") + .setType(Type.EXTERNAL_UNMANAGED) + .setAllowedElasticProductOrigins(KIBANA_PRODUCT_ORIGIN) + .build(); + public static final SystemIndexDescriptor APM_AGENT_CONFIG_INDEX_DESCRIPTOR = SystemIndexDescriptor.builder() .setIndexPattern(".apm-agent-configuration*") .setDescription("system index for APM agent configuration") @@ -57,6 +64,7 @@ public Collection getSystemIndexDescriptors(Settings sett return List.of( KIBANA_INDEX_DESCRIPTOR, REPORTING_INDEX_DESCRIPTOR, + ONECHAT_INDEX_DESCRIPTOR, APM_AGENT_CONFIG_INDEX_DESCRIPTOR, APM_CUSTOM_LINK_INDEX_DESCRIPTOR ); diff --git a/modules/kibana/src/test/java/org/elasticsearch/kibana/KibanaPluginTests.java b/modules/kibana/src/test/java/org/elasticsearch/kibana/KibanaPluginTests.java index aa883c83eecf6..73709b2e48704 100644 --- a/modules/kibana/src/test/java/org/elasticsearch/kibana/KibanaPluginTests.java +++ b/modules/kibana/src/test/java/org/elasticsearch/kibana/KibanaPluginTests.java @@ -20,7 +20,7 @@ public class KibanaPluginTests extends ESTestCase { public void testKibanaIndexNames() { assertThat( new KibanaPlugin().getSystemIndexDescriptors(Settings.EMPTY).stream().map(SystemIndexDescriptor::getIndexPattern).toList(), - contains(".kibana_*", ".reporting-*", ".apm-agent-configuration*", ".apm-custom-link*") + contains(".kibana_*", ".reporting-*", ".chat-*", ".apm-agent-configuration*", ".apm-custom-link*") ); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/store/KibanaOwnedReservedRoleDescriptors.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/store/KibanaOwnedReservedRoleDescriptors.java index 38b78ad357bf5..f5e3c239dadcd 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/store/KibanaOwnedReservedRoleDescriptors.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/store/KibanaOwnedReservedRoleDescriptors.java @@ -109,7 +109,7 @@ static RoleDescriptor kibanaSystem(String name) { new RoleDescriptor.IndicesPrivileges[] { // System indices defined in KibanaPlugin RoleDescriptor.IndicesPrivileges.builder() - .indices(".kibana*", ".reporting-*") + .indices(".kibana*", ".reporting-*", ".chat-*") .privileges("all") .allowRestrictedIndices(true) .build(),