diff --git a/docs/reference/setup/bootstrap-checks.asciidoc b/docs/reference/setup/bootstrap-checks.asciidoc index d81c4a4e92dd2..c4b6206c3b8cf 100644 --- a/docs/reference/setup/bootstrap-checks.asciidoc +++ b/docs/reference/setup/bootstrap-checks.asciidoc @@ -194,10 +194,9 @@ filters are installed to prevent the ability to execute system calls related to forking as a defense mechanism against arbitrary code execution attacks on Elasticsearch. The system call filter check ensures that if system call filters are enabled, then they were successfully -installed. To pass the system call filter check you must either fix any +installed. To pass the system call filter check you must fix any configuration errors on your system that prevented system call filters -from installing (check your logs), or *at your own risk* disable system -call filters by setting `bootstrap.system_call_filter` to `false`. +from installing (check your logs). === OnError and OnOutOfMemoryError checks diff --git a/server/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java index 498a91256ccac..3569a8ee37537 100644 --- a/server/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java +++ b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java @@ -23,12 +23,7 @@ private BootstrapSettings() {} ); public static final Setting MEMORY_LOCK_SETTING = Setting.boolSetting("bootstrap.memory_lock", false, Property.NodeScope); - public static final Setting SYSTEM_CALL_FILTER_SETTING = Setting.boolSetting( - "bootstrap.system_call_filter", - true, - Property.DeprecatedWarning, - Property.NodeScope - ); + public static final Setting CTRLHANDLER_SETTING = Setting.boolSetting("bootstrap.ctrlhandler", true, Property.NodeScope); } diff --git a/server/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java b/server/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java index 6b92a949dc54e..a56c8531ee743 100644 --- a/server/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java +++ b/server/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java @@ -447,12 +447,7 @@ String getUseSerialGC() { public void testSystemCallFilterCheck() throws NodeValidationException { final AtomicBoolean isSystemCallFilterInstalled = new AtomicBoolean(); - final BootstrapContext context; - if (randomBoolean()) { - context = createTestContext(Settings.builder().put("bootstrap.system_call_filter", true).build(), null); - } else { - context = emptyContext; - } + final BootstrapContext context = emptyContext; final BootstrapChecks.SystemCallFilterCheck systemCallFilterEnabledCheck = new BootstrapChecks.SystemCallFilterCheck() {