Skip to content

Commit 766cf3f

Browse files
committed
Revert "Integrate k-NN functionality with security plugin (#2274) (#2455)"
This reverts commit 6ded82d. Resolves #2478 Signed-off-by: Peter Nied <[email protected]> Signed-off-by: Peter Nied <[email protected]>
1 parent d6d7c78 commit 766cf3f

File tree

3 files changed

+2
-25
lines changed

3 files changed

+2
-25
lines changed

config/roles.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -68,29 +68,6 @@ anomaly_full_access:
6868
- 'indices:admin/aliases/get'
6969
- 'indices:admin/mappings/get'
7070

71-
# Allow users to execute read only k-NN actions
72-
knn_read_access:
73-
reserved: true
74-
cluster_permissions:
75-
- 'cluster:admin/knn_search_model_action'
76-
- 'cluster:admin/knn_get_model_action'
77-
- 'cluster:admin/knn_stats_action'
78-
79-
# Allow users to use all k-NN functionality
80-
knn_full_access:
81-
reserved: true
82-
cluster_permissions:
83-
- 'cluster:admin/knn_training_model_action'
84-
- 'cluster:admin/knn_training_job_router_action'
85-
- 'cluster:admin/knn_training_job_route_decision_info_action'
86-
- 'cluster:admin/knn_warmup_action'
87-
- 'cluster:admin/knn_delete_model_action'
88-
- 'cluster:admin/knn_remove_model_from_cache_action'
89-
- 'cluster:admin/knn_update_model_graveyard_action'
90-
- 'cluster:admin/knn_search_model_action'
91-
- 'cluster:admin/knn_get_model_action'
92-
- 'cluster:admin/knn_stats_action'
93-
9471
# Allows users to read Notebooks
9572
notebooks_read_access:
9673
reserved: true

tools/install_demo_configuration.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ echo plugins.security.enable_snapshot_restore_privilege: true >> "%OPENSEARCH_CO
315315
echo plugins.security.check_snapshot_restore_write_privileges: true >> "%OPENSEARCH_CONF_FILE%"
316316
echo plugins.security.restapi.roles_enabled: ["all_access", "security_rest_api_access"] >> "%OPENSEARCH_CONF_FILE%"
317317
echo plugins.security.system_indices.enabled: true >> "%OPENSEARCH_CONF_FILE%"
318-
echo plugins.security.system_indices.indices: [".plugins-ml-model", ".plugins-ml-task", ".opendistro-alerting-config", ".opendistro-alerting-alert*", ".opendistro-anomaly-results*", ".opendistro-anomaly-detector*", ".opendistro-anomaly-checkpoints", ".opendistro-anomaly-detection-state", ".opendistro-reports-*", ".opensearch-notifications-*", ".opensearch-notebooks", ".opensearch-observability", ".opendistro-asynchronous-search-response*", ".replication-metadata-store", ".opensearch-knn-models"] >> "%OPENSEARCH_CONF_FILE%"
318+
echo plugins.security.system_indices.indices: [".plugins-ml-model", ".plugins-ml-task", ".opendistro-alerting-config", ".opendistro-alerting-alert*", ".opendistro-anomaly-results*", ".opendistro-anomaly-detector*", ".opendistro-anomaly-checkpoints", ".opendistro-anomaly-detection-state", ".opendistro-reports-*", ".opensearch-notifications-*", ".opensearch-notebooks", ".opensearch-observability", ".opendistro-asynchronous-search-response*", ".replication-metadata-store"] >> "%OPENSEARCH_CONF_FILE%"
319319

320320
:: network.host
321321
>nul findstr /b /c:"network.host" "%OPENSEARCH_CONF_FILE%" && (

tools/install_demo_configuration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ echo "plugins.security.enable_snapshot_restore_privilege: true" | $SUDO_CMD tee
377377
echo "plugins.security.check_snapshot_restore_write_privileges: true" | $SUDO_CMD tee -a "$OPENSEARCH_CONF_FILE" > /dev/null
378378
echo 'plugins.security.restapi.roles_enabled: ["all_access", "security_rest_api_access"]' | $SUDO_CMD tee -a "$OPENSEARCH_CONF_FILE" > /dev/null
379379
echo 'plugins.security.system_indices.enabled: true' | $SUDO_CMD tee -a "$OPENSEARCH_CONF_FILE" > /dev/null
380-
echo 'plugins.security.system_indices.indices: [".plugins-ml-model", ".plugins-ml-task", ".opendistro-alerting-config", ".opendistro-alerting-alert*", ".opendistro-anomaly-results*", ".opendistro-anomaly-detector*", ".opendistro-anomaly-checkpoints", ".opendistro-anomaly-detection-state", ".opendistro-reports-*", ".opensearch-notifications-*", ".opensearch-notebooks", ".opensearch-observability", ".opendistro-asynchronous-search-response*", ".replication-metadata-store", ".opensearch-knn-models"]' | $SUDO_CMD tee -a "$OPENSEARCH_CONF_FILE" > /dev/null
380+
echo 'plugins.security.system_indices.indices: [".plugins-ml-model", ".plugins-ml-task", ".opendistro-alerting-config", ".opendistro-alerting-alert*", ".opendistro-anomaly-results*", ".opendistro-anomaly-detector*", ".opendistro-anomaly-checkpoints", ".opendistro-anomaly-detection-state", ".opendistro-reports-*", ".opensearch-notifications-*", ".opensearch-notebooks", ".opensearch-observability", ".opendistro-asynchronous-search-response*", ".replication-metadata-store"]' | $SUDO_CMD tee -a "$OPENSEARCH_CONF_FILE" > /dev/null
381381

382382
#network.host
383383
if $SUDO_CMD grep --quiet -i "^network.host" "$OPENSEARCH_CONF_FILE"; then

0 commit comments

Comments
 (0)