From a1f831beedc940567fdcdeac6b52890fd4eba2a3 Mon Sep 17 00:00:00 2001 From: Albert Zaharovits Date: Fri, 2 Nov 2018 14:59:22 +0200 Subject: [PATCH] remove deprecated settings in 7 --- .../migration/migrate_7_0/settings.asciidoc | 17 +++++++++++++++++ .../audit/logfile/LoggingAuditTrail.java | 12 +++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/docs/reference/migration/migrate_7_0/settings.asciidoc b/docs/reference/migration/migrate_7_0/settings.asciidoc index 85648da4f0d25..e7b61a0618d9f 100644 --- a/docs/reference/migration/migrate_7_0/settings.asciidoc +++ b/docs/reference/migration/migrate_7_0/settings.asciidoc @@ -66,3 +66,20 @@ used. Therefore, these settings have been renamed from `search.remote.*` to in the cluster state, or set on dynamic settings updates, we will automatically upgrade the setting from `search.remote.*` to `cluster.remote.*`. The fallback settings will be removed in 8.0.0. + +[float] +==== Audit logfile local node info + +The following settings have been removed: +- `xpack.security.audit.logfile.prefix.emit_node_host_address`, instead use + `xpack.security.audit.logfile.emit_node_host_address` +- `xpack.security.audit.logfile.prefix.emit_node_host_name`, instead use + `xpack.security.audit.logfile.emit_node_host_name` +- `xpack.security.audit.logfile.prefix.emit_node_name`, instead use + `xpack.security.audit.logfile.emit_node_name` +The new settings have the same meaning as the removed ones, but the `prefix` +name component is no longer meaningful as logfile audit entries are structured +JSON documents and are not prefixed by anything. +Moreover, `xpack.security.audit.logfile.emit_node_name` has changed its default +from `true` to `false`. All other settings mentioned before, have kept their +default value of `false`. diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java index dabe62c9bc0c2..8b3f19cd1a3e8 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java @@ -109,18 +109,12 @@ public class LoggingAuditTrail extends AbstractComponent implements AuditTrail, public static final String OPAQUE_ID_FIELD_NAME = "opaque_id"; public static final String NAME = "logfile"; - public static final Setting DEPRECATED_EMIT_HOST_ADDRESS_SETTING = Setting.boolSetting( - setting("audit.logfile.prefix.emit_node_host_address"), false, Property.NodeScope, Property.Dynamic, Property.Deprecated); public static final Setting EMIT_HOST_ADDRESS_SETTING = Setting.boolSetting(setting("audit.logfile.emit_node_host_address"), - DEPRECATED_EMIT_HOST_ADDRESS_SETTING, Property.NodeScope, Property.Dynamic); - public static final Setting DEPRECATED_EMIT_HOST_NAME_SETTING = Setting.boolSetting( - setting("audit.logfile.prefix.emit_node_host_name"), false, Property.NodeScope, Property.Dynamic, Property.Deprecated); + false, Property.NodeScope, Property.Dynamic); public static final Setting EMIT_HOST_NAME_SETTING = Setting.boolSetting(setting("audit.logfile.emit_node_host_name"), - DEPRECATED_EMIT_HOST_NAME_SETTING, Property.NodeScope, Property.Dynamic); - public static final Setting DEPRECATED_EMIT_NODE_NAME_SETTING = Setting - .boolSetting(setting("audit.logfile.prefix.emit_node_name"), false, Property.NodeScope, Property.Dynamic, Property.Deprecated); + false, Property.NodeScope, Property.Dynamic); public static final Setting EMIT_NODE_NAME_SETTING = Setting.boolSetting(setting("audit.logfile.emit_node_name"), - DEPRECATED_EMIT_NODE_NAME_SETTING, Property.NodeScope, Property.Dynamic); + false, Property.NodeScope, Property.Dynamic); public static final Setting EMIT_NODE_ID_SETTING = Setting.boolSetting(setting("audit.logfile.emit_node_id"), true, Property.NodeScope, Property.Dynamic); private static final List DEFAULT_EVENT_INCLUDES = Arrays.asList(ACCESS_DENIED.toString(), ACCESS_GRANTED.toString(),