diff --git a/CHANGELOG.md b/CHANGELOG.md index bb552cdc22fa9..a8b6f0686d2f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Use RemoteSegmentStoreDirectory instead of RemoteDirectory ([#4240](https://github.com/opensearch-project/OpenSearch/pull/4240)) - Add index specific setting for remote repository ([#4253](https://github.com/opensearch-project/OpenSearch/pull/4253)) - [Segment Replication] Update replicas to commit SegmentInfos instead of relying on SIS files from primary shards. ([#4402](https://github.com/opensearch-project/OpenSearch/pull/4402)) +- Change the version to remove deprecated code of adding node name into log pattern of log4j property file ([#4569](https://github.com/opensearch-project/OpenSearch/pull/4569)) ### Deprecated diff --git a/qa/evil-tests/src/test/java/org/opensearch/common/logging/EvilLoggerTests.java b/qa/evil-tests/src/test/java/org/opensearch/common/logging/EvilLoggerTests.java index 9319d11ebae98..a14d40048ac59 100644 --- a/qa/evil-tests/src/test/java/org/opensearch/common/logging/EvilLoggerTests.java +++ b/qa/evil-tests/src/test/java/org/opensearch/common/logging/EvilLoggerTests.java @@ -299,7 +299,7 @@ public void testNoNodeNameInPatternWarning() throws IOException, UserException { // the first message is a warning for unsupported configuration files assertLogLine(events.get(0), Level.WARN, location, "\\[" + nodeName + "\\] Some logging configurations have " + "%marker but don't have %node_name. We will automatically add %node_name to the pattern to ease the " - + "migration for users who customize log4j2.properties but will stop this behavior in 7.0. You should " + + "migration for users who customize log4j2.properties but will stop this behavior in 3.0. You should " + "manually replace `%node_name` with `\\[%node_name\\]%marker ` in these locations:"); if (Constants.WINDOWS) { assertThat(events.get(1), endsWith("no_node_name\\log4j2.properties")); diff --git a/server/src/main/java/org/opensearch/common/logging/LogConfigurator.java b/server/src/main/java/org/opensearch/common/logging/LogConfigurator.java index facef3a0caecc..eec291cd69f77 100644 --- a/server/src/main/java/org/opensearch/common/logging/LogConfigurator.java +++ b/server/src/main/java/org/opensearch/common/logging/LogConfigurator.java @@ -258,7 +258,7 @@ public FileVisitResult visitFile(final Path file, final BasicFileAttributes attr .warn( "Some logging configurations have %marker but don't have %node_name. " + "We will automatically add %node_name to the pattern to ease the migration for users who customize " - + "log4j2.properties but will stop this behavior in 7.0. You should manually replace `%node_name` with " + + "log4j2.properties but will stop this behavior in 3.0. You should manually replace `%node_name` with " + "`[%node_name]%marker ` in these locations:\n {}", deprecatedLocationsString );