Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,71 @@

About the past changelog entries, see [CHANGELOG v4](CHANGELOG-v4.md) [CHANGELOG v5](CHANGELOG-v5.md) instead.

## Release v6.0.3 - 2026/03/27

### News

* Update Ruby to 3.4.9
* It contains fix for zlib gem (CVE-2026-27820)
* Update bundled gems
* It will fix memory leaks with cool.io. (#999)

### Core component

* ruby v3.4.9 (update)
* jemalloc v3.6.0
* OpenSSL 3.6.1 Windows (update)
* OpenSSL 3.0.8 macOS
* gems
* fluentd v1.19.2
* 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 (update)
* fluent-plugin-prometheus v2.2.1
* 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 (update)
* 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.2
* nokogiri v1.19.2 (update)

## Release v6.0.2 - 2026/02/27

### News
Expand Down
12 changes: 6 additions & 6 deletions fluent-package/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ source "https://rubygems.org"
no_fat_gem = [:ruby]
gem "rake"
gem "bundler", BUNDLER_VERSION
gem "cool.io", "1.9.3", platforms: no_fat_gem
gem "cool.io", "1.9.4", platforms: no_fat_gem
gem "sigdump", "0.2.5"
gem "http_parser.rb", "0.8.1"
gem "yajl-ruby", "1.4.3"
gem "serverengine", "2.4.0"
gem "msgpack", "1.8.0"
gem "oj", "3.16.11"
gem "tzinfo", "2.0.6"
gem "tzinfo-data", "1.2025.3"
gem "tzinfo-data", "1.2026.1"

# Fluentd v1.19.0 requires io-event 1.10.x or before.
# The dependency condition cannot be met with async >= 2.25
Expand Down Expand Up @@ -58,7 +58,7 @@ gem "elasticsearch", "8.19.2"
gem "fluent-plugin-elasticsearch", "6.0.0"
gem "ruby-kafka", "1.5.0"
gem "digest-murmurhash", "1.1.1"
gem "fluent-plugin-kafka", "0.19.5"
gem "fluent-plugin-kafka", "0.19.6"
gem "prometheus-client", "4.2.5"
gem "fluent-plugin-prometheus", "2.2.1"
gem "fluent-plugin-prometheus_pushgateway", "0.2.1"
Expand All @@ -69,7 +69,7 @@ gem "aws-sdk-kms", "1.110.0"
gem "aws-sdk-sqs", "1.101.0"
gem "aws-sigv4", "1.12.1"
gem "aws-sdk-s3", "1.208.0"
gem "fluent-plugin-s3", "1.8.3"
gem "fluent-plugin-s3", "1.8.4"
gem "httpclient", "2.9.0"
gem "fluent-diagtool", "1.0.5"
gem "td", "0.19.1"
Expand All @@ -88,7 +88,7 @@ gem "opensearch-ruby", "3.4.0"
gem "fluent-plugin-opensearch", "1.1.5"
gem "fluent-plugin-fluent-package-update-notifier", "0.2.3"
gem "fluent-plugin-obsolete-plugins", "0.2.2"
gem "fluent-plugin-opentelemetry", "0.5.1"
gem "fluent-plugin-opentelemetry", "0.5.2"

# fix CVE-2026-25765 for elasticseach and opensearch
gem "faraday", "2.14.1"
Expand All @@ -99,7 +99,7 @@ gem "ffi", "1.17.0", platforms: windows_platforms
gem "ffi-win32-extensions", "1.1.0", platforms: windows_platforms
# fiddle gem that isn't default gems as of Ruby 3.5
gem "fiddle", "1.1.8", platforms: windows_platforms
gem "nokogiri", "1.18.10", platforms: windows_platforms
gem "nokogiri", "1.19.2", platforms: windows_platforms
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.
Expand Down
24 changes: 12 additions & 12 deletions fluent-package/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ GEM
fiber-annotation
fiber-local (~> 1.1)
json
cool.io (1.9.3)
cool.io (1.9.4)
csv (3.3.5)
digest-crc (0.7.0)
rake (>= 12.0.0, < 14.0.0)
Expand Down Expand Up @@ -151,7 +151,7 @@ GEM
fluent-plugin-fluent-package-update-notifier (0.2.3)
fluentd (>= 0.14.10, < 2)
specinfra (~> 2.94.1)
fluent-plugin-kafka (0.19.5)
fluent-plugin-kafka (0.19.6)
bigdecimal (~> 3.1)
fluentd (>= 0.10.58, < 2)
ltsv
Expand All @@ -169,7 +169,7 @@ GEM
faraday_middleware-aws-sigv4 (~> 1.0.1)
fluentd (>= 0.14.22)
opensearch-ruby (>= 3.0.1)
fluent-plugin-opentelemetry (0.5.1)
fluent-plugin-opentelemetry (0.5.2)
async-http (~> 0.88)
excon (~> 1.2)
fluentd (~> 1.18)
Expand All @@ -191,7 +191,7 @@ GEM
fluent-plugin-rewrite-tag-filter (2.4.0)
fluent-config-regexp-type
fluentd (>= 0.14.2, < 2)
fluent-plugin-s3 (1.8.3)
fluent-plugin-s3 (1.8.4)
aws-sdk-s3 (~> 1.60)
aws-sdk-sqs (~> 1.23)
fluentd (>= 0.14.22, < 2)
Expand Down Expand Up @@ -252,7 +252,7 @@ GEM
net-ssh (>= 2.6.5, < 8.0.0)
net-ssh (7.3.0)
net-telnet (0.2.0)
nokogiri (1.18.10)
nokogiri (1.19.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
oj (3.16.11)
Expand Down Expand Up @@ -325,7 +325,7 @@ GEM
traces (0.18.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2025.3)
tzinfo-data (1.2026.1)
tzinfo (>= 1.0.0)
uri (1.0.4)
webhdfs (0.11.0)
Expand Down Expand Up @@ -360,7 +360,7 @@ DEPENDENCIES
bundler (= 2.3.27)
capng_c (= 0.2.4)
cmetrics (= 0.3.3)
cool.io (= 1.9.3)
cool.io (= 1.9.4)
digest-murmurhash (= 1.1.1)
elasticsearch (= 8.19.2)
faraday (= 2.14.1)
Expand All @@ -371,17 +371,17 @@ DEPENDENCIES
fluent-plugin-elasticsearch (= 6.0.0)
fluent-plugin-flowcounter-simple (= 0.1.0)
fluent-plugin-fluent-package-update-notifier (= 0.2.3)
fluent-plugin-kafka (= 0.19.5)
fluent-plugin-kafka (= 0.19.6)
fluent-plugin-metrics-cmetrics (= 0.1.2)
fluent-plugin-obsolete-plugins (= 0.2.2)
fluent-plugin-opensearch (= 1.1.5)
fluent-plugin-opentelemetry (= 0.5.1)
fluent-plugin-opentelemetry (= 0.5.2)
fluent-plugin-parser-winevt_xml (= 0.2.8)
fluent-plugin-prometheus (= 2.2.1)
fluent-plugin-prometheus_pushgateway (= 0.2.1)
fluent-plugin-record-modifier (= 2.2.1)
fluent-plugin-rewrite-tag-filter (= 2.4.0)
fluent-plugin-s3 (= 1.8.3)
fluent-plugin-s3 (= 1.8.4)
fluent-plugin-sd-dns (= 0.1.0)
fluent-plugin-systemd (= 1.1.1)
fluent-plugin-td (= 1.2.0)
Expand All @@ -395,7 +395,7 @@ DEPENDENCIES
jmespath (= 1.6.2)
mini_portile2 (= 2.8.9)
msgpack (= 1.8.0)
nokogiri (= 1.18.10)
nokogiri (= 1.19.2)
oj (= 3.16.11)
opensearch-ruby (= 3.4.0)
prometheus-client (= 4.2.5)
Expand All @@ -407,7 +407,7 @@ DEPENDENCIES
td (= 0.19.1)
td-client (= 3.0.0)
tzinfo (= 2.0.6)
tzinfo-data (= 1.2025.3)
tzinfo-data (= 1.2026.1)
webhdfs (= 0.11.0)
webrick (= 1.9.2)
win32-event (= 0.6.3)
Expand Down
26 changes: 13 additions & 13 deletions fluent-package/bump-version-v7.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 3f9f7082ba57fd19964cc31276801e0a68917903 Mon Sep 17 00:00:00 2001
From 9e1837728f192a7829df30a1f92423a1f3708760 Mon Sep 17 00:00:00 2001
From: Kentaro Hayashi <hayashi@clear-code.com>
Date: Mon, 16 Mar 2026 15:33:12 +0900
Subject: [PATCH] Update test patch for v7
Date: Mon, 23 Mar 2026 16:07:31 +0900
Subject: [PATCH] Bump version to v7

Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
---
Expand All @@ -11,12 +11,12 @@ Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/fluent-package/config.rb b/fluent-package/config.rb
index bbecffb..eeda9e1 100644
index 03a3fbd..322bf6d 100644
--- a/fluent-package/config.rb
+++ b/fluent-package/config.rb
@@ -1,5 +1,5 @@
PACKAGE_NAME = "fluent-package"
-PACKAGE_VERSION = "6.0.2"
-PACKAGE_VERSION = "6.0.3"
+PACKAGE_VERSION = "7.0.0"

# Keep internal path (/opt/td-agent) for package name migration
Expand All @@ -25,15 +25,15 @@ index bbecffb..eeda9e1 100644
BUNDLER_VERSION= "2.3.27"

# https://www.ruby-lang.org/en/downloads/ (tar.gz)
-BUNDLED_RUBY_VERSION = "3.4.8"
-BUNDLED_RUBY_SOURCE_SHA256SUM = "53c4ddad41fbb6189f1f5ee0db57a51d54bd1f87f8755b3d68604156a35b045b"
+BUNDLED_RUBY_VERSION = "4.0.1"
+BUNDLED_RUBY_SOURCE_SHA256SUM = "3924be2d05db30f4e35f859bf028be85f4b7dd01714142fd823e4af5de2faf9d"
-BUNDLED_RUBY_VERSION = "3.4.9"
-BUNDLED_RUBY_SOURCE_SHA256SUM = "7bb4d4f5e807cc27251d14d9d6086d182c5b25875191e44ab15b709cd7a7dd9c"
+BUNDLED_RUBY_VERSION = "4.0.2"
+BUNDLED_RUBY_SOURCE_SHA256SUM = "51502b26b50b68df4963336ca41e368cde92c928faf91654de4c4c1791f82aac"

BUNDLED_RUBY_PATCHES = [
# An example entry:
diff --git a/fluent-package/debian/changelog b/fluent-package/debian/changelog
index 56073b5..dd40807 100644
index 07b315b..2bf9599 100644
--- a/fluent-package/debian/changelog
+++ b/fluent-package/debian/changelog
@@ -1,3 +1,9 @@
Expand All @@ -43,11 +43,11 @@ index 56073b5..dd40807 100644
+
+ -- Kentaro Hayashi <hayashi@clear-code.com> Sun, 29 Aug 2027 06:31:51 -0000
+
fluent-package (6.0.2-1) unstable; urgency=low
fluent-package (6.0.3-1) unstable; urgency=low

* New upstream release.
diff --git a/fluent-package/yum/fluent-package.spec.in b/fluent-package/yum/fluent-package.spec.in
index cc395a8..458c222 100644
index a786cc3..30aa7cb 100644
--- a/fluent-package/yum/fluent-package.spec.in
+++ b/fluent-package/yum/fluent-package.spec.in
@@ -472,6 +472,9 @@ fi
Expand All @@ -57,7 +57,7 @@ index cc395a8..458c222 100644
+* Sun Aug 29 2027 Kentaro Hayashi <hayashi@clear-code.com> - 7.0.0-1
+- New upstream release.
+
* Fri Feb 27 2026 Kentaro Hayashi <hayashi@clear-code.com> - 6.0.2-1
* Wed Mar 25 2026 Kentaro Hayashi <hayashi@clear-code.com> - 6.0.3-1
- New upstream release.

--
Expand Down
6 changes: 3 additions & 3 deletions fluent-package/config.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PACKAGE_NAME = "fluent-package"
PACKAGE_VERSION = "6.0.2"
PACKAGE_VERSION = "6.0.3"

# Keep internal path (/opt/td-agent) for package name migration
SERVICE_NAME = "fluentd"
Expand All @@ -23,8 +23,8 @@
BUNDLER_VERSION= "2.3.27"

# https://www.ruby-lang.org/en/downloads/ (tar.gz)
BUNDLED_RUBY_VERSION = "3.4.8"
BUNDLED_RUBY_SOURCE_SHA256SUM = "53c4ddad41fbb6189f1f5ee0db57a51d54bd1f87f8755b3d68604156a35b045b"
BUNDLED_RUBY_VERSION = "3.4.9"
BUNDLED_RUBY_SOURCE_SHA256SUM = "7bb4d4f5e807cc27251d14d9d6086d182c5b25875191e44ab15b709cd7a7dd9c"

BUNDLED_RUBY_PATCHES = [
# An example entry:
Expand Down
6 changes: 6 additions & 0 deletions fluent-package/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
fluent-package (6.0.3-1) unstable; urgency=low

* New upstream release.

-- Kentaro Hayashi <hayashi@clear-code.com> Wed, 25 Mar 2026 06:38:18 -0000

fluent-package (6.0.2-1) unstable; urgency=low

* New upstream release.
Expand Down
2 changes: 1 addition & 1 deletion fluent-package/msi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN \
# Required CMake 3.x to build cmetrics gem
choco install -y cmake --version=3.31.6 --installargs 'ADD_CMAKE_TO_PATH=System' && \
choco install -y msys2 --params /NoUpdate --version=20250221.0.0 && \
choco install ruby -y --version=3.4.8.1 && \
choco install ruby -y --version=3.4.9.1 && \
refreshenv && \
ridk install 3 && \
gem install --no-document --force bundler builder
3 changes: 3 additions & 0 deletions fluent-package/yum/fluent-package.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,9 @@ fi
# NOTE: %{_tmpfilesdir} is available since CentOS 7
%attr(0755,fluentd,fluentd) %dir /tmp/@PACKAGE_DIR@
%changelog
* Wed Mar 25 2026 Kentaro Hayashi <hayashi@clear-code.com> - 6.0.3-1
- New upstream release.

* Fri Feb 27 2026 Kentaro Hayashi <hayashi@clear-code.com> - 6.0.2-1
- New upstream release.

Expand Down