Skip to content

Commit 64a9333

Browse files
committed
Deprecate plugins.security.system_indices.indices
Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent 6660542 commit 64a9333

File tree

3 files changed

+2
-38
lines changed

3 files changed

+2
-38
lines changed

src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,8 @@ public List<Setting<?>> getSettings() {
14211421
Function.identity(),
14221422
Property.NodeScope,
14231423
Property.Filtered,
1424-
Property.Final
1424+
Property.Final,
1425+
Property.Deprecated
14251426
)
14261427
);
14271428

src/main/java/org/opensearch/security/tools/democonfig/SecuritySettingsConfigurer.java

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -45,40 +45,6 @@
4545
public class SecuritySettingsConfigurer {
4646

4747
static final List<String> REST_ENABLED_ROLES = List.of("all_access", "security_rest_api_access");
48-
static final List<String> SYSTEM_INDICES = List.of(
49-
".plugins-ml-agent",
50-
".plugins-ml-config",
51-
".plugins-ml-connector",
52-
".plugins-ml-controller",
53-
".plugins-ml-model-group",
54-
".plugins-ml-model",
55-
".plugins-ml-task",
56-
".plugins-ml-conversation-meta",
57-
".plugins-ml-conversation-interactions",
58-
".plugins-ml-memory-meta",
59-
".plugins-ml-memory-message",
60-
".plugins-ml-stop-words",
61-
".opendistro-alerting-config",
62-
".opendistro-alerting-alert*",
63-
".opendistro-anomaly-results*",
64-
".opendistro-anomaly-detector*",
65-
".opendistro-anomaly-checkpoints",
66-
".opendistro-anomaly-detection-state",
67-
".opendistro-reports-*",
68-
".opensearch-notifications-*",
69-
".opensearch-notebooks",
70-
".opensearch-observability",
71-
".ql-datasources",
72-
".opendistro-asynchronous-search-response*",
73-
".replication-metadata-store",
74-
".opensearch-knn-models",
75-
".geospatial-ip2geo-data*",
76-
".plugins-flow-framework-config",
77-
".plugins-flow-framework-templates",
78-
".plugins-flow-framework-state",
79-
".plugins-search-relevance-experiment",
80-
".plugins-search-relevance-judgment-cache"
81-
);
8248
static final Integer DEFAULT_PASSWORD_MIN_LENGTH = 8;
8349
static String ADMIN_PASSWORD = "";
8450
static String ADMIN_USERNAME = "admin";
@@ -371,7 +337,6 @@ Map<String, Object> buildSecurityConfigMap() {
371337
configMap.put("plugins.security.restapi.roles_enabled", REST_ENABLED_ROLES);
372338

373339
configMap.put("plugins.security.system_indices.enabled", true);
374-
configMap.put("plugins.security.system_indices.indices", SYSTEM_INDICES);
375340

376341
if (!isNetworkHostAlreadyPresent(installer.OPENSEARCH_CONF_FILE)) {
377342
if (installer.cluster_mode) {

src/test/java/org/opensearch/security/tools/democonfig/SecuritySettingsConfigurerTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import static org.opensearch.security.tools.democonfig.SecuritySettingsConfigurer.DEFAULT_ADMIN_PASSWORD;
4848
import static org.opensearch.security.tools.democonfig.SecuritySettingsConfigurer.DEFAULT_PASSWORD_MIN_LENGTH;
4949
import static org.opensearch.security.tools.democonfig.SecuritySettingsConfigurer.REST_ENABLED_ROLES;
50-
import static org.opensearch.security.tools.democonfig.SecuritySettingsConfigurer.SYSTEM_INDICES;
5150
import static org.opensearch.security.tools.democonfig.SecuritySettingsConfigurer.isKeyPresentInYMLFile;
5251
import static org.opensearch.security.tools.democonfig.util.DemoConfigHelperUtil.createDirectory;
5352
import static org.opensearch.security.tools.democonfig.util.DemoConfigHelperUtil.createFile;
@@ -269,7 +268,6 @@ public void testBuildSecurityConfigMap() {
269268
assertThat(actual.get("plugins.security.check_snapshot_restore_write_privileges"), equalTo(true));
270269
assertThat(actual.get("plugins.security.restapi.roles_enabled"), equalTo(REST_ENABLED_ROLES));
271270
assertThat(actual.get("plugins.security.system_indices.enabled"), equalTo(true));
272-
assertThat(actual.get("plugins.security.system_indices.indices"), equalTo(SYSTEM_INDICES));
273271
assertThat(actual.get("node.max_local_storage_nodes"), equalTo(3));
274272

275273
installer.initsecurity = true;

0 commit comments

Comments
 (0)