From bd88300e1aa9b501eb8a4acee1522021d9af1368 Mon Sep 17 00:00:00 2001 From: Lars <126493657+ash-darin@users.noreply.github.com> Date: Wed, 11 Jun 2025 14:21:00 +0200 Subject: [PATCH 01/11] Update log4j2.properties This changes the timestamp into a format, which includes the timezone. This will make it easier for all applications who read the logs to place it correctly without haveing to guess that this is UTC. Support for this format is documented here: https://logging.apache.org/log4j/2.x/javadoc/log4j-core/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.FixedFormat.html --- config/log4j2.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/log4j2.properties b/config/log4j2.properties index 92acf87be41..c1fd6f242d7 100644 --- a/config/log4j2.properties +++ b/config/log4j2.properties @@ -4,7 +4,7 @@ name = LogstashPropertiesConfig appender.console.type = Console appender.console.name = plain_console appender.console.layout.type = PatternLayout -appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n +appender.console.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n appender.json_console.type = Console appender.json_console.name = json_console @@ -21,7 +21,7 @@ appender.rolling.policies.time.type = TimeBasedTriggeringPolicy appender.rolling.policies.time.interval = 1 appender.rolling.policies.time.modulate = true appender.rolling.layout.type = PatternLayout -appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n +appender.rolling.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n appender.rolling.policies.size.type = SizeBasedTriggeringPolicy appender.rolling.policies.size.size = 100MB appender.rolling.strategy.type = DefaultRolloverStrategy @@ -64,7 +64,7 @@ appender.routing.pipeline.name = appender-${ctx:pipeline.id} appender.routing.pipeline.fileName = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.log appender.routing.pipeline.filePattern = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.%i.log.gz appender.routing.pipeline.layout.type = PatternLayout -appender.routing.pipeline.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n +appender.routing.pipeline.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c] %m%n appender.routing.pipeline.policy.type = SizeBasedTriggeringPolicy appender.routing.pipeline.policy.size = 100MB appender.routing.pipeline.strategy.type = DefaultRolloverStrategy @@ -86,7 +86,7 @@ rootLogger.appenderRef.routing.ref = pipeline_routing_appender appender.console_slowlog.type = Console appender.console_slowlog.name = plain_console_slowlog appender.console_slowlog.layout.type = PatternLayout -appender.console_slowlog.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n +appender.console_slowlog.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c] %m%n appender.json_console_slowlog.type = Console appender.json_console_slowlog.name = json_console_slowlog @@ -103,7 +103,7 @@ appender.rolling_slowlog.policies.time.type = TimeBasedTriggeringPolicy appender.rolling_slowlog.policies.time.interval = 1 appender.rolling_slowlog.policies.time.modulate = true appender.rolling_slowlog.layout.type = PatternLayout -appender.rolling_slowlog.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n +appender.rolling_slowlog.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c] %m%n appender.rolling_slowlog.policies.size.type = SizeBasedTriggeringPolicy appender.rolling_slowlog.policies.size.size = 100MB appender.rolling_slowlog.strategy.type = DefaultRolloverStrategy @@ -148,7 +148,7 @@ appender.deprecation_rolling.policies.time.type = TimeBasedTriggeringPolicy appender.deprecation_rolling.policies.time.interval = 1 appender.deprecation_rolling.policies.time.modulate = true appender.deprecation_rolling.layout.type = PatternLayout -appender.deprecation_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n +appender.deprecation_rolling.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n appender.deprecation_rolling.policies.size.type = SizeBasedTriggeringPolicy appender.deprecation_rolling.policies.size.size = 100MB appender.deprecation_rolling.strategy.type = DefaultRolloverStrategy From 017729c5cadf669b7e4f18c033d2b34ea328f9ff Mon Sep 17 00:00:00 2001 From: Lars <126493657+ash-darin@users.noreply.github.com> Date: Wed, 11 Jun 2025 14:44:13 +0200 Subject: [PATCH 02/11] Update ISO timestamp --- docs/reference/logging.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/logging.md b/docs/reference/logging.md index 90df52d0409..5cda278d5c7 100644 --- a/docs/reference/logging.md +++ b/docs/reference/logging.md @@ -64,7 +64,7 @@ appender.rolling.policies.time.type = TimeBasedTriggeringPolicy <4> appender.rolling.policies.time.interval = 1 appender.rolling.policies.time.modulate = true appender.rolling.layout.type = PatternLayout -appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n +appender.rolling.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n appender.rolling.policies.size.type = SizeBasedTriggeringPolicy <5> appender.rolling.policies.size.size = 100MB appender.rolling.strategy.type = DefaultRolloverStrategy From 6572a4a05a12c8f16f90caa02459c501565e0e52 Mon Sep 17 00:00:00 2001 From: Lars <126493657+ash-darin@users.noreply.github.com> Date: Wed, 11 Jun 2025 14:44:46 +0200 Subject: [PATCH 03/11] Update ISO timestamp --- docs/reference/getting-started-with-logstash.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/getting-started-with-logstash.md b/docs/reference/getting-started-with-logstash.md index d3ee34baf16..0748de0fc05 100644 --- a/docs/reference/getting-started-with-logstash.md +++ b/docs/reference/getting-started-with-logstash.md @@ -110,7 +110,7 @@ In the `config/log4j2.properties`: appender.routing.pipeline.fileName = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.log appender.routing.pipeline.filePattern = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.%i.log.gz appender.routing.pipeline.layout.type = PatternLayout - appender.routing.pipeline.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n + appender.routing.pipeline.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c] %m%n appender.routing.pipeline.policy.type = SizeBasedTriggeringPolicy appender.routing.pipeline.policy.size = 100MB appender.routing.pipeline.strategy.type = DefaultRolloverStrategy From 85132c41962c02a5689e3177a8839fa79a2f154f Mon Sep 17 00:00:00 2001 From: Lars <126493657+ash-darin@users.noreply.github.com> Date: Wed, 11 Jun 2025 14:45:15 +0200 Subject: [PATCH 04/11] Update ISO timestamp --- docker/data/logstash/config/log4j2.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/data/logstash/config/log4j2.properties b/docker/data/logstash/config/log4j2.properties index 663a0158034..d6e62d5778e 100644 --- a/docker/data/logstash/config/log4j2.properties +++ b/docker/data/logstash/config/log4j2.properties @@ -4,7 +4,7 @@ name = LogstashPropertiesConfig appender.console.type = Console appender.console.name = plain_console appender.console.layout.type = PatternLayout -appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n +appender.console.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n appender.json_console.type = Console appender.json_console.name = json_console From e66b9b116e3f3071dcdf79bf34651e0a35063620 Mon Sep 17 00:00:00 2001 From: Lars <126493657+ash-darin@users.noreply.github.com> Date: Wed, 11 Jun 2025 14:45:45 +0200 Subject: [PATCH 05/11] Update ISO timestamp --- .../src/main/resources/log4j2-with-script.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/logstash-core/benchmarks/src/main/resources/log4j2-with-script.properties b/logstash-core/benchmarks/src/main/resources/log4j2-with-script.properties index 52a61d10d4c..dc49f0b3e1e 100644 --- a/logstash-core/benchmarks/src/main/resources/log4j2-with-script.properties +++ b/logstash-core/benchmarks/src/main/resources/log4j2-with-script.properties @@ -10,7 +10,7 @@ appender.rolling.policies.time.type = TimeBasedTriggeringPolicy appender.rolling.policies.time.interval = 1 appender.rolling.policies.time.modulate = true appender.rolling.layout.type = PatternLayout -appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]} %-.10000m%n +appender.rolling.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]} %-.10000m%n appender.rolling.policies.size.type = SizeBasedTriggeringPolicy appender.rolling.policies.size.size = 100MB appender.rolling.strategy.type = DefaultRolloverStrategy @@ -24,7 +24,7 @@ appender.routing.pipeline.name = appender-${ctx:pipeline.id} appender.routing.pipeline.fileName = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.log appender.routing.pipeline.filePattern = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.%i.log.gz appender.routing.pipeline.layout.type = PatternLayout -appender.routing.pipeline.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n +appender.routing.pipeline.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c] %m%n appender.routing.pipeline.policy.type = SizeBasedTriggeringPolicy appender.routing.pipeline.policy.size = 100MB appender.routing.pipeline.strategy.type = DefaultRolloverStrategy From 201b809b761e20a5331b8f96d2b65b1d07bca4ec Mon Sep 17 00:00:00 2001 From: Lars <126493657+ash-darin@users.noreply.github.com> Date: Wed, 11 Jun 2025 14:46:48 +0200 Subject: [PATCH 06/11] Update ISO timestamp --- docker/data/logstash/config/log4j2.file.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/data/logstash/config/log4j2.file.properties b/docker/data/logstash/config/log4j2.file.properties index 234b23db45e..be977338908 100644 --- a/docker/data/logstash/config/log4j2.file.properties +++ b/docker/data/logstash/config/log4j2.file.properties @@ -4,7 +4,7 @@ name = LogstashPropertiesConfig appender.console.type = Console appender.console.name = plain_console appender.console.layout.type = PatternLayout -appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n +appender.console.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n appender.json_console.type = Console appender.json_console.name = json_console @@ -21,7 +21,7 @@ appender.rolling.policies.time.type = TimeBasedTriggeringPolicy appender.rolling.policies.time.interval = 1 appender.rolling.policies.time.modulate = true appender.rolling.layout.type = PatternLayout -appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n +appender.rolling.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n appender.rolling.policies.size.type = SizeBasedTriggeringPolicy appender.rolling.policies.size.size = 100MB appender.rolling.strategy.type = DefaultRolloverStrategy @@ -52,7 +52,7 @@ appender.routing.pipeline.name = appender-${ctx:pipeline.id} appender.routing.pipeline.fileName = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.log appender.routing.pipeline.filePattern = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.%i.log.gz appender.routing.pipeline.layout.type = PatternLayout -appender.routing.pipeline.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n +appender.routing.pipeline.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c] %m%n appender.routing.pipeline.policy.type = SizeBasedTriggeringPolicy appender.routing.pipeline.policy.size = 100MB appender.routing.pipeline.strategy.type = DefaultRolloverStrategy @@ -68,7 +68,7 @@ rootLogger.appenderRef.routing.ref = pipeline_routing_appender appender.console_slowlog.type = Console appender.console_slowlog.name = plain_console_slowlog appender.console_slowlog.layout.type = PatternLayout -appender.console_slowlog.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n +appender.console_slowlog.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c] %m%n appender.json_console_slowlog.type = Console appender.json_console_slowlog.name = json_console_slowlog @@ -130,7 +130,7 @@ appender.deprecation_rolling.policies.time.type = TimeBasedTriggeringPolicy appender.deprecation_rolling.policies.time.interval = 1 appender.deprecation_rolling.policies.time.modulate = true appender.deprecation_rolling.layout.type = PatternLayout -appender.deprecation_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n +appender.deprecation_rolling.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n appender.deprecation_rolling.policies.size.type = SizeBasedTriggeringPolicy appender.deprecation_rolling.policies.size.size = 100MB appender.deprecation_rolling.strategy.type = DefaultRolloverStrategy From 6e9615962266015fda36e230571025ef2fbb603c Mon Sep 17 00:00:00 2001 From: Lars <126493657+ash-darin@users.noreply.github.com> Date: Wed, 11 Jun 2025 14:47:14 +0200 Subject: [PATCH 07/11] Update ISO timestamp --- .../src/main/resources/log4j2-without-script.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logstash-core/benchmarks/src/main/resources/log4j2-without-script.properties b/logstash-core/benchmarks/src/main/resources/log4j2-without-script.properties index 959f65e0dd4..f851583ab4e 100644 --- a/logstash-core/benchmarks/src/main/resources/log4j2-without-script.properties +++ b/logstash-core/benchmarks/src/main/resources/log4j2-without-script.properties @@ -10,7 +10,7 @@ appender.rolling.policies.time.type = TimeBasedTriggeringPolicy appender.rolling.policies.time.interval = 1 appender.rolling.policies.time.modulate = true appender.rolling.layout.type = PatternLayout -appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]} %-.10000m%n +appender.rolling.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]} %-.10000m%n appender.rolling.policies.size.type = SizeBasedTriggeringPolicy appender.rolling.policies.size.size = 100MB appender.rolling.strategy.type = DefaultRolloverStrategy From 8c4a867f4bf55173f7242ec40fdad3618a7ad0f5 Mon Sep 17 00:00:00 2001 From: Lars <126493657+ash-darin@users.noreply.github.com> Date: Wed, 11 Jun 2025 14:47:53 +0200 Subject: [PATCH 08/11] Update ISO timestamp --- .../src/main/java/org/logstash/log/PipelineRoutingAppender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logstash-core/src/main/java/org/logstash/log/PipelineRoutingAppender.java b/logstash-core/src/main/java/org/logstash/log/PipelineRoutingAppender.java index ba54ed60a8c..1d15d1fb8c6 100644 --- a/logstash-core/src/main/java/org/logstash/log/PipelineRoutingAppender.java +++ b/logstash-core/src/main/java/org/logstash/log/PipelineRoutingAppender.java @@ -31,7 +31,7 @@ * fileName="${sys:ls.logs}/pipeline_${ctx:pipeline.id}.log" * filePattern="${sys:ls.logs}/pipeline_${ctx:pipeline.id}.%i.log.gz"> * - * [%d{ISO8601}][%-5p][%-25c] %m%n + * [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c] %m%n * * * From 7a2401f301ae51b5ed24181faa84b9bf490b3aa4 Mon Sep 17 00:00:00 2001 From: Lars <126493657+ash-darin@users.noreply.github.com> Date: Wed, 11 Jun 2025 14:50:09 +0200 Subject: [PATCH 09/11] Update ISO timestamp --- .../fixtures/persistent_queues/log4j2.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qa/integration/fixtures/persistent_queues/log4j2.properties b/qa/integration/fixtures/persistent_queues/log4j2.properties index 3bc313e0367..5dfdce58bec 100644 --- a/qa/integration/fixtures/persistent_queues/log4j2.properties +++ b/qa/integration/fixtures/persistent_queues/log4j2.properties @@ -4,7 +4,7 @@ name = LogstashPropertiesConfig appender.console.type = Console appender.console.name = plain_console appender.console.layout.type = PatternLayout -appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n +appender.console.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n appender.json_console.type = Console appender.json_console.name = json_console @@ -21,7 +21,7 @@ appender.rolling.policies.time.type = TimeBasedTriggeringPolicy appender.rolling.policies.time.interval = 1 appender.rolling.policies.time.modulate = true appender.rolling.layout.type = PatternLayout -appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n +appender.rolling.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n appender.rolling.policies.size.type = SizeBasedTriggeringPolicy appender.rolling.policies.size.size = 100MB appender.rolling.strategy.type = DefaultRolloverStrategy @@ -52,7 +52,7 @@ appender.routing.pipeline.name = appender-${ctx:pipeline.id} appender.routing.pipeline.fileName = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.log appender.routing.pipeline.filePattern = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.%i.log.gz appender.routing.pipeline.layout.type = PatternLayout -appender.routing.pipeline.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n +appender.routing.pipeline.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c] %m%n appender.routing.pipeline.policy.type = SizeBasedTriggeringPolicy appender.routing.pipeline.policy.size = 100MB appender.routing.pipeline.strategy.type = DefaultRolloverStrategy @@ -68,7 +68,7 @@ rootLogger.appenderRef.routing.ref = pipeline_routing_appender appender.console_slowlog.type = Console appender.console_slowlog.name = plain_console_slowlog appender.console_slowlog.layout.type = PatternLayout -appender.console_slowlog.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n +appender.console_slowlog.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c] %m%n appender.json_console_slowlog.type = Console appender.json_console_slowlog.name = json_console_slowlog @@ -85,7 +85,7 @@ appender.rolling_slowlog.policies.time.type = TimeBasedTriggeringPolicy appender.rolling_slowlog.policies.time.interval = 1 appender.rolling_slowlog.policies.time.modulate = true appender.rolling_slowlog.layout.type = PatternLayout -appender.rolling_slowlog.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n +appender.rolling_slowlog.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c] %m%n appender.json_rolling_slowlog.type = RollingFile appender.json_rolling_slowlog.name = json_rolling_slowlog @@ -115,7 +115,7 @@ appender.deprecation_rolling.policies.time.type = TimeBasedTriggeringPolicy appender.deprecation_rolling.policies.time.interval = 1 appender.deprecation_rolling.policies.time.modulate = true appender.deprecation_rolling.layout.type = PatternLayout -appender.deprecation_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n +appender.deprecation_rolling.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n appender.deprecation_rolling.policies.size.type = SizeBasedTriggeringPolicy appender.deprecation_rolling.policies.size.size = 100MB appender.deprecation_rolling.strategy.type = DefaultRolloverStrategy From 9bab7d744bc806be764284ccc9334f0ce2a96b75 Mon Sep 17 00:00:00 2001 From: Lars <126493657+ash-darin@users.noreply.github.com> Date: Wed, 11 Jun 2025 14:50:31 +0200 Subject: [PATCH 10/11] Update ISO timestamp --- .../src/test/resources/log4j2-log-deprecation-test.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logstash-core/src/test/resources/log4j2-log-deprecation-test.properties b/logstash-core/src/test/resources/log4j2-log-deprecation-test.properties index 6794c96e102..696c4cf1ba8 100644 --- a/logstash-core/src/test/resources/log4j2-log-deprecation-test.properties +++ b/logstash-core/src/test/resources/log4j2-log-deprecation-test.properties @@ -11,7 +11,7 @@ appender.deprecation_rolling.policies.time.type = TimeBasedTriggeringPolicy appender.deprecation_rolling.policies.time.interval = 1 appender.deprecation_rolling.policies.time.modulate = true appender.deprecation_rolling.layout.type = PatternLayout -appender.deprecation_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]} %m%n +appender.deprecation_rolling.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]} %m%n appender.deprecation_rolling.policies.size.type = SizeBasedTriggeringPolicy appender.deprecation_rolling.policies.size.size = 100MB appender.deprecation_rolling.strategy.type = DefaultRolloverStrategy From 95e722122dab1329cd2febb1425793d8d91d0338 Mon Sep 17 00:00:00 2001 From: Lars <126493657+ash-darin@users.noreply.github.com> Date: Wed, 11 Jun 2025 14:50:53 +0200 Subject: [PATCH 11/11] Update ISO timestamp --- .../src/test/resources/log4j2-log-pipeline-test.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logstash-core/src/test/resources/log4j2-log-pipeline-test.properties b/logstash-core/src/test/resources/log4j2-log-pipeline-test.properties index 6c24ef2de66..0e91412ab63 100644 --- a/logstash-core/src/test/resources/log4j2-log-pipeline-test.properties +++ b/logstash-core/src/test/resources/log4j2-log-pipeline-test.properties @@ -10,7 +10,7 @@ appender.rolling.policies.time.type = TimeBasedTriggeringPolicy appender.rolling.policies.time.interval = 1 appender.rolling.policies.time.modulate = true appender.rolling.layout.type = PatternLayout -appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{plugin.name}]} %-.10000m%n +appender.rolling.layout.pattern = [%d{ISO8601_OFFSET_DATE_TIME_HHCMM}][%-5p][%-25c]%notEmpty{[%X{plugin.name}]} %-.10000m%n appender.rolling.policies.size.type = SizeBasedTriggeringPolicy appender.rolling.policies.size.size = 100MB appender.rolling.strategy.type = DefaultRolloverStrategy