Release v6.0.4

CHANGELOG.md

@@ -2,6 +2,70 @@
 
 About the past changelog entries, see [CHANGELOG v4](CHANGELOG-v4.md) [CHANGELOG v5](CHANGELOG-v5.md) instead.
 
+## Release v6.0.4 - 2026/MM/DD
+
+### News
+
+* Update bundled Fluentd to v1.19.3
+* Update bundled gems
+* msi: fixed a bug that bundled ruby version was out-of-date.
+
+### Core component
+
+* ruby v3.4.9
+* jemalloc v3.6.0
+* OpenSSL 3.6.1 Windows
+* OpenSSL 3.0.8 macOS
+* gems
+  * fluentd v1.19.3 (update)
+  * msgpack 1.8.0
+  * oj 3.16.11
+  * webrick 1.9.2
+  * openssl 3.3.0
+
+### Bundled plugins and gems
+
+* aws-partitions v1.1150.0
+* aws-sdk-core v3.234.0
+* aws-sdk-kms v1.110.0
+* aws-sdk-s3 v1.208.0
+* aws-sdk-sqs v1.101.0
+* aws-sigv4 v1.12.1
+* elasticsearch v8.19.2
+* fluent-diagtool v1.0.5
+* fluent-plugin-elasticsearch v6.0.0
+* fluent-plugin-flowcounter-simple 0.1.0
+* fluent-plugin-kafka v0.19.6 (update)
+* fluent-plugin-metrics-cmetrics v0.1.2
+* fluent-plugin-fluent-package-update-notifier 0.2.3
+* fluent-plugin-obsolete-plugins v0.2.2
+* fluent-plugin-opensearch v1.1.5
+* fluent-plugin-opentelemetry 0.5.2
+* fluent-plugin-prometheus v2.2.2 (update)
+* fluent-plugin-prometheus_pushgateway v0.2.1
+* fluent-plugin-record-modifier v2.2.1
+* fluent-plugin-rewrite-tag-filter v2.4.0
+* fluent-plugin-s3 v1.8.4
+* fluent-plugin-sd-dns 0.1.0
+* fluent-plugin-systemd v1.1.1
+* fluent-plugin-td v1.2.0
+* fluent-plugin-utmpx v0.5.0
+* fluent-plugin-webhdfs v1.6.0
+* mini_portile2 v2.8.9
+* prometheus-client v4.2.5
+* rdkafka v0.21.0
+* ruby-kafka v1.5.0
+* systemd-journal v2.1.1
+* td-client v3.0.0
+* webhdfs v0.11.0
+
+On Windows
+
+* fluent-plugin-parser-winevt_xml v0.2.8
+* fluent-plugin-windows-exporter v1.0.0
+* winevt_c v0.11.3 (update)
+* nokogiri v1.19.2
+
 ## Release v6.0.3 - 2026/03/27
 
 ### News

fluent-package/Gemfile

@@ -23,7 +23,7 @@ gem "serverengine", "2.4.0"
 gem "msgpack", "1.8.0"
 gem "oj", "3.16.11"
 gem "tzinfo", "2.0.6"
-gem "tzinfo-data", "1.2026.1"
+gem "tzinfo-data", "1.2026.2"
 
 # Fluentd v1.19.0 requires io-event 1.10.x or before.
 # The dependency condition cannot be met with async >= 2.25
@@ -60,7 +60,7 @@ gem "ruby-kafka", "1.5.0"
 gem "digest-murmurhash", "1.1.1"
 gem "fluent-plugin-kafka", "0.19.6"
 gem "prometheus-client", "4.2.5"
-gem "fluent-plugin-prometheus", "2.2.1"
+gem "fluent-plugin-prometheus", "2.2.2"
 gem "fluent-plugin-prometheus_pushgateway", "0.2.1"
 gem "jmespath", "1.6.2"
 gem "aws-partitions", "1.1150.0"
@@ -104,7 +104,7 @@ gem "win32-event", "0.6.3", platforms: windows_platforms
 gem "win32-ipc", "0.7.0", platforms: windows_platforms
 # Use officially released version when PR was merged and released.
 #gem "win32-service", "2.3.2", platforms: windows_platforms
-gem "winevt_c", "0.11.2", platforms: windows_platforms
+gem "winevt_c", "0.11.3", platforms: windows_platforms
 gem "win32-eventlog", "0.6.7", platforms: windows_platforms
 gem "fluent-plugin-parser-winevt_xml", "0.2.8", platforms: windows_platforms
 gem "fluent-plugin-windows-eventlog", "0.9.2", platforms: windows_platforms

fluent-package/Gemfile.lock

@@ -9,8 +9,8 @@ GIT
 
 GIT
   remote: https://github.com/fluent/fluentd
-  revision: 76841666b4e4aade23f0c100a7e048995f7d52c8
-  ref: 76841666b4e4aade23f0c100a7e048995f7d52c8
+  revision: 1b849cb95719eefd72ac37213797d4b6d15ea9e1
+  ref: 1b849cb95719eefd72ac37213797d4b6d15ea9e1
   specs:
     fluentd (1.19.2)
       async-http (~> 0.86)
@@ -35,14 +35,15 @@ GIT
       webrick (~> 1.4)
       win32-event (~> 0.6.3)
       win32-ipc (~> 0.7.0)
+      win32-registry (~> 0.1)
       win32-service (~> 2.3.0)
       yajl-ruby (~> 1.0)
       zstd-ruby (~> 1.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.8)
+    addressable (2.8.10)
       public_suffix (>= 2.0.2, < 8.0)
     async (2.24.0)
       console (~> 1.29)
@@ -60,7 +61,7 @@ GEM
       protocol-http1 (~> 0.30)
       protocol-http2 (~> 0.22)
       traces (~> 0.10)
-    async-pool (0.11.1)
+    async-pool (0.11.2)
       async (>= 2.0)
     aws-eventstream (1.4.0)
     aws-partitions (1.1150.0)
@@ -181,7 +182,7 @@ GEM
       csv (~> 3.2)
       fluentd (>= 0.14.12, < 2)
       nokogiri (>= 1.12.5)
-    fluent-plugin-prometheus (2.2.1)
+    fluent-plugin-prometheus (2.2.2)
       fluentd (>= 1.9.1, < 2)
       prometheus-client (>= 2.1.0)
     fluent-plugin-prometheus_pushgateway (0.2.1)
@@ -250,7 +251,7 @@ GEM
       uri (>= 0.11.1)
     net-scp (4.1.0)
       net-ssh (>= 2.6.5, < 8.0.0)
-    net-ssh (7.3.0)
+    net-ssh (7.3.2)
     net-telnet (0.2.0)
     nokogiri (1.19.2)
       mini_portile2 (~> 2.8.2)
@@ -290,7 +291,7 @@ GEM
       sigdump (~> 0.2.2)
     sfl (2.3)
     sigdump (0.2.5)
-    specinfra (2.94.1)
+    specinfra (2.94.2)
       base64
       net-scp
       net-ssh (>= 2.7)
@@ -325,7 +326,7 @@ GEM
     traces (0.18.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2026.1)
+    tzinfo-data (1.2026.2)
       tzinfo (>= 1.0.0)
     uri (1.0.4)
     webhdfs (0.11.0)
@@ -337,7 +338,9 @@ GEM
       ffi
     win32-ipc (0.7.0)
       ffi
-    winevt_c (0.11.2)
+    win32-registry (0.1.2)
+      fiddle (~> 1.0)
+    winevt_c (0.11.3)
     yajl-ruby (1.4.3)
     zip-zip (0.3)
       rubyzip (>= 1.0.0)
@@ -377,7 +380,7 @@ DEPENDENCIES
   fluent-plugin-opensearch (= 1.1.5)
   fluent-plugin-opentelemetry (= 0.5.2)
   fluent-plugin-parser-winevt_xml (= 0.2.8)
-  fluent-plugin-prometheus (= 2.2.1)
+  fluent-plugin-prometheus (= 2.2.2)
   fluent-plugin-prometheus_pushgateway (= 0.2.1)
   fluent-plugin-record-modifier (= 2.2.1)
   fluent-plugin-rewrite-tag-filter (= 2.4.0)
@@ -407,14 +410,14 @@ DEPENDENCIES
   td (= 0.19.1)
   td-client (= 3.0.0)
   tzinfo (= 2.0.6)
-  tzinfo-data (= 1.2026.1)
+  tzinfo-data (= 1.2026.2)
   webhdfs (= 0.11.0)
   webrick (= 1.9.2)
   win32-event (= 0.6.3)
   win32-eventlog (= 0.6.7)
   win32-ipc (= 0.7.0)
   win32-service!
-  winevt_c (= 0.11.2)
+  winevt_c (= 0.11.3)
   yajl-ruby (= 1.4.3)
 
 BUNDLED WITH

fluent-package/bump-version-v7.patch

@@ -1,22 +1,22 @@
-From 9e1837728f192a7829df30a1f92423a1f3708760 Mon Sep 17 00:00:00 2001
+From 861f52e0d842fddd098c16546070d5c030d2805e Mon Sep 17 00:00:00 2001
 From: Kentaro Hayashi <hayashi@clear-code.com>
-Date: Mon, 23 Mar 2026 16:07:31 +0900
+Date: Mon, 27 Apr 2026 11:56:42 +0900
 Subject: [PATCH] Bump version to v7
 
 Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
 ---
- fluent-package/config.rb                  | 6 +++---
- fluent-package/debian/changelog           | 6 ++++++
- fluent-package/yum/fluent-package.spec.in | 3 +++
- 3 files changed, 12 insertions(+), 3 deletions(-)
+ fluent-package/config.rb                  | 10 +++++-----
+ fluent-package/debian/changelog           |  6 ++++++
+ fluent-package/yum/fluent-package.spec.in |  3 +++
+ 3 files changed, 14 insertions(+), 5 deletions(-)
 
 diff --git a/fluent-package/config.rb b/fluent-package/config.rb
-index 03a3fbd..322bf6d 100644
+index ca5dd6c..c8e7b68 100644
 --- a/fluent-package/config.rb
 +++ b/fluent-package/config.rb
 @@ -1,5 +1,5 @@
  PACKAGE_NAME = "fluent-package"
--PACKAGE_VERSION = "6.0.3"
+-PACKAGE_VERSION = "6.0.4"
 +PACKAGE_VERSION = "7.0.0"
 
  # Keep internal path (/opt/td-agent) for package name migration
@@ -27,11 +27,22 @@ index 03a3fbd..322bf6d 100644
  # https://www.ruby-lang.org/en/downloads/ (tar.gz)
 -BUNDLED_RUBY_VERSION = "3.4.9"
 -BUNDLED_RUBY_SOURCE_SHA256SUM = "7bb4d4f5e807cc27251d14d9d6086d182c5b25875191e44ab15b709cd7a7dd9c"
-+BUNDLED_RUBY_VERSION = "4.0.2"
-+BUNDLED_RUBY_SOURCE_SHA256SUM = "51502b26b50b68df4963336ca41e368cde92c928faf91654de4c4c1791f82aac"
++BUNDLED_RUBY_VERSION = "4.0.3"
++BUNDLED_RUBY_SOURCE_SHA256SUM = "77964acc370d5c8375b9502e5ba6c13c03ef91ab9eb9f521c84fb42b9c9a6b0f"
 
  BUNDLED_RUBY_PATCHES = [
    # An example entry:
+@@ -32,8 +32,8 @@ BUNDLED_RUBY_PATCHES = [
+ ]
+
+ # https://rubyinstaller.org/downloads/ (7-ZIP ARCHIVES)
+-BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.9-1"
+-BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "4375268618b61dadf53bf8e54beaca74ea30580c90d3c47ea9f2a134bd3e494e"
++BUNDLED_RUBY_INSTALLER_X64_VERSION = "4.0.3-1"
++BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "a4094317397511e09242be1c95b32c8700fe91ebca713fb4e190de595eea5699"
+
+ # Files under rubyinstaller/ are patches for RubyInstaller's binary package.
+ # Other patches for Ruby's source tree which can be shared with BUNDLED_RUBY_PATCHES.
 diff --git a/fluent-package/debian/changelog b/fluent-package/debian/changelog
 index 07b315b..2bf9599 100644
 --- a/fluent-package/debian/changelog

fluent-package/config.rb

@@ -1,13 +1,13 @@
 PACKAGE_NAME = "fluent-package"
-PACKAGE_VERSION = "6.0.3"
+PACKAGE_VERSION = "6.0.4"
 
 # Keep internal path (/opt/td-agent) for package name migration
 SERVICE_NAME = "fluentd"
 COMPAT_SERVICE_NAME = "td-agent"
 PACKAGE_DIR = "fluent"
 COMPAT_PACKAGE_DIR = COMPAT_SERVICE_NAME
 
-FLUENTD_REVISION = '76841666b4e4aade23f0c100a7e048995f7d52c8' # v1.19.2
+FLUENTD_REVISION = '1b849cb95719eefd72ac37213797d4b6d15ea9e1' # v1.19.3 (RC Apr 20)
 FLUENTD_LOCAL_GEM_REPO = "file://" + File.expand_path(File.join(__dir__, "local_gem_repo"))
 
 # https://github.com/jemalloc/jemalloc/releases
@@ -32,8 +32,8 @@
 ]
 
 # https://rubyinstaller.org/downloads/ (7-ZIP ARCHIVES)
-BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.8-1"
-BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "d1c3ba83ae748c08e35e0b1d9939d45dbca7925e0a8bf84a42860bf19847e0d6"
+BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.9-1"
+BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "4375268618b61dadf53bf8e54beaca74ea30580c90d3c47ea9f2a134bd3e494e"
 
 # Files under rubyinstaller/ are patches for RubyInstaller's binary package.
 # Other patches for Ruby's source tree which can be shared with BUNDLED_RUBY_PATCHES.