diff --git a/CHANGELOG.md b/CHANGELOG.md index fe2f85cd3..a2b522b1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,70 @@ About the past changelog entries, see [old CHANGELOG](CHANGELOG-v4.md) instead. +## Release v6.0.1 - 2025/11/11 + +### News + +* Update Ruby to 3.4.7 +* Update fluentd to 1.19.1 +* Update bundled gems + +### Core component + +* ruby v3.4.7 (update) +* jemalloc v3.6.0 +* OpenSSL 3.6.0 Windows +* OpenSSL 3.0.8 macOS +* gems + * fluentd v1.19.1 (update) + * msgpack 1.8.0 + * oj 3.16.11 + * webrick 1.9.1 + * openssl 3.3.0 + +### Bundled plugins and gems + +* aws-partitions v1.1150.0 +* aws-sdk-core v3.230.0 +* aws-sdk-kms v1.110.0 +* aws-sdk-s3 v1.197.0 +* aws-sdk-sqs v1.101.0 +* aws-sigv4 v1.12.1 +* elasticsearch v8.19.2 (update) +* fluent-diagtool v1.0.5 +* fluent-plugin-elasticsearch v6.0.0 +* fluent-plugin-flowcounter-simple 0.1.0 +* fluent-plugin-kafka v0.19.5 +* 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.4.0 (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.3 +* 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.18.10 (update) + ## Release v6.0.0 - 2025/08/29 ### News diff --git a/fluent-package/Gemfile b/fluent-package/Gemfile index 4397ca781..f047dcd3c 100644 --- a/fluent-package/Gemfile +++ b/fluent-package/Gemfile @@ -54,7 +54,7 @@ end # plugin gems -gem "elasticsearch", "8.19.0" +gem "elasticsearch", "8.19.2" gem "fluent-plugin-elasticsearch", "6.0.0" gem "ruby-kafka", "1.5.0" gem "digest-murmurhash", "1.1.1" @@ -72,7 +72,7 @@ gem "aws-sdk-s3", "1.197.0" gem "fluent-plugin-s3", "1.8.3" gem "httpclient", "2.9.0" gem "fluent-diagtool", "1.0.5" -gem "td", "0.19.0" +gem "td", "0.19.1" gem "td-client", "3.0.0" gem "fluent-plugin-td", "1.2.0" gem "webhdfs", "0.11.0" @@ -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.3.0" +gem "fluent-plugin-opentelemetry", "0.4.0" windows_platforms = [:mingw, :x64_mingw] # :mswin # ffi-win32-extensions doesn't support ffi 1.17.1 or later @@ -96,7 +96,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.9", platforms: windows_platforms +gem "nokogiri", "1.18.10", 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. diff --git a/fluent-package/Gemfile.lock b/fluent-package/Gemfile.lock index 00bb3dc4b..f660ec7a8 100644 --- a/fluent-package/Gemfile.lock +++ b/fluent-package/Gemfile.lock @@ -9,10 +9,10 @@ GIT GIT remote: https://github.com/fluent/fluentd - revision: ed15edc4b7c86c1fcea3fbf326b7c42325e6fc71 - ref: ed15edc4b7c86c1fcea3fbf326b7c42325e6fc71 + revision: efdc4dca81c23480c9b55e13e55de6aa925b1cf5 + ref: efdc4dca81c23480c9b55e13e55de6aa925b1cf5 specs: - fluentd (1.19.0) + fluentd (1.19.1) async-http (~> 0.86) base64 (~> 0.2) bundler @@ -22,8 +22,6 @@ GIT drb (~> 2.2) fiddle (~> 1.1) http_parser.rb (>= 0.5.1, < 0.9.0) - io-event (< 1.11.0) - io-stream (< 0.8.0) logger (~> 1.6) msgpack (>= 1.3.1, < 2.0.0) serverengine (>= 2.3.2, < 3.0.0) @@ -31,7 +29,7 @@ GIT strptime (>= 0.2.4, < 1.0.0) tzinfo (>= 1.0, < 3.0) tzinfo-data (~> 1.0) - uri (~> 1.0) + uri (~> 1.0, < 1.1.0) webrick (~> 1.4) win32-event (~> 0.6.3) win32-ipc (~> 0.7.0) @@ -85,7 +83,7 @@ GEM aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.3.0) - bigdecimal (3.2.2) + bigdecimal (3.2.3) bindata (2.4.15) capng_c (0.2.3) certstore_c (0.1.7) @@ -102,15 +100,15 @@ GEM rake (>= 12.0.0, < 14.0.0) digest-murmurhash (1.1.1) drb (2.2.3) - elastic-transport (8.4.0) + elastic-transport (8.4.1) faraday (< 3) multi_json - elasticsearch (8.19.0) + elasticsearch (8.19.2) elastic-transport (~> 8.3) - elasticsearch-api (= 8.19.0) - elasticsearch-api (8.19.0) + elasticsearch-api (= 8.19.2) + elasticsearch-api (8.19.2) multi_json - excon (1.3.0) + excon (1.3.1) logger faraday (2.13.4) faraday-net_http (>= 2.0, < 3.5) @@ -169,7 +167,7 @@ GEM faraday_middleware-aws-sigv4 (~> 1.0.1) fluentd (>= 0.14.22) opensearch-ruby (>= 3.0.1) - fluent-plugin-opentelemetry (0.3.0) + fluent-plugin-opentelemetry (0.4.0) async-http (~> 0.88) excon (~> 1.2) fluentd (~> 1.18) @@ -214,13 +212,13 @@ GEM fluent-plugin-windows-exporter (1.0.0) bindata (~> 2.4) fluentd (>= 0.14.10, < 2) - google-protobuf (4.32.0-aarch64-linux-gnu) + google-protobuf (4.32.1-aarch64-linux-gnu) bigdecimal rake (>= 13) - google-protobuf (4.32.0-x64-mingw-ucrt) + google-protobuf (4.32.1-x64-mingw-ucrt) bigdecimal rake (>= 13) - google-protobuf (4.32.0-x86_64-linux-gnu) + google-protobuf (4.32.1-x86_64-linux-gnu) bigdecimal rake (>= 13) hirb (0.7.3) @@ -236,7 +234,7 @@ GEM bindata (~> 2.4.8) logger (1.7.0) ltsv (0.1.2) - metrics (0.14.0) + metrics (0.14.1) mini_portile2 (2.8.9) msgpack (1.8.0) multi_json (1.17.0) @@ -247,7 +245,7 @@ GEM net-ssh (>= 2.6.5, < 8.0.0) net-ssh (7.3.0) net-telnet (0.2.0) - nokogiri (1.18.9) + nokogiri (1.18.10) mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.16.11) @@ -262,19 +260,19 @@ GEM base64 protocol-hpack (1.5.1) protocol-http (0.53.0) - protocol-http1 (0.35.0) + protocol-http1 (0.35.2) protocol-http (~> 0.22) protocol-http2 (0.22.1) protocol-hpack (~> 1.4) protocol-http (~> 0.47) public_suffix (6.0.2) racc (1.8.1) - rake (13.3.0) + rake (13.3.1) rdkafka (0.21.0) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - rexml (3.4.1) + rexml (3.4.4) ruby-kafka (1.5.0) digest-crc ruby-progressbar (1.13.0) @@ -294,7 +292,7 @@ GEM strptime (0.2.5) systemd-journal (2.1.1) ffi (~> 1.9) - td (0.19.0) + td (0.19.1) csv hirb (>= 0.4.5) msgpack @@ -315,12 +313,12 @@ GEM msgpack (>= 0.5.6, < 2.0) mutex_m (>= 0.2.0, < 1.0) td-client (>= 1.0.8, < 4.0) - traces (0.18.1) + traces (0.18.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2025.2) tzinfo (>= 1.0.0) - uri (1.0.3) + uri (1.0.4) webhdfs (0.11.0) addressable webrick (1.9.1) @@ -334,7 +332,7 @@ GEM yajl-ruby (1.4.3) zip-zip (0.3) rubyzip (>= 1.0.0) - zstd-ruby (1.5.7.0) + zstd-ruby (1.5.7.1) PLATFORMS aarch64-linux @@ -355,7 +353,7 @@ DEPENDENCIES cmetrics (= 0.3.3) cool.io (= 1.9.0) digest-murmurhash (= 1.1.1) - elasticsearch (= 8.19.0) + elasticsearch (= 8.19.2) ffi (= 1.17.0) ffi-win32-extensions (= 1.1.0) fiddle (= 1.1.8) @@ -367,7 +365,7 @@ DEPENDENCIES fluent-plugin-metrics-cmetrics (= 0.1.2) fluent-plugin-obsolete-plugins (= 0.2.2) fluent-plugin-opensearch (= 1.1.5) - fluent-plugin-opentelemetry (= 0.3.0) + fluent-plugin-opentelemetry (= 0.4.0) fluent-plugin-parser-winevt_xml (= 0.2.8) fluent-plugin-prometheus (= 2.2.1) fluent-plugin-prometheus_pushgateway (= 0.2.1) @@ -387,7 +385,7 @@ DEPENDENCIES jmespath (= 1.6.2) mini_portile2 (= 2.8.9) msgpack (= 1.8.0) - nokogiri (= 1.18.9) + nokogiri (= 1.18.10) oj (= 3.16.11) opensearch-ruby (= 3.4.0) prometheus-client (= 4.2.5) @@ -396,7 +394,7 @@ DEPENDENCIES ruby-kafka (= 1.5.0) serverengine (= 2.4.0) sigdump (= 0.2.5) - td (= 0.19.0) + td (= 0.19.1) td-client (= 3.0.0) tzinfo (= 2.0.6) tzinfo-data (= 1.2025.2) diff --git a/fluent-package/bump-version-v7.patch b/fluent-package/bump-version-v7.patch index 65fe45cc1..981487b8d 100644 --- a/fluent-package/bump-version-v7.patch +++ b/fluent-package/bump-version-v7.patch @@ -1,4 +1,4 @@ -From 1f249c067ff43a5a181856a9646719d333cc1083 Mon Sep 17 00:00:00 2001 +From 5eaeb61c45f17b38f537b4207648f6b254987e30 Mon Sep 17 00:00:00 2001 From: Shizuo Fujita Date: Fri, 25 Jul 2025 11:09:35 +0900 Subject: [PATCH] Bump version to v7.0.0 @@ -8,16 +8,16 @@ Signed-off-by: Shizuo Fujita fluent-package/config.rb | 10 +++++----- fluent-package/debian/changelog | 6 ++++++ fluent-package/msi/Dockerfile | 2 +- - fluent-package/yum/fluent-package.spec.in | 5 ++++- - 4 files changed, 16 insertions(+), 7 deletions(-) + fluent-package/yum/fluent-package.spec.in | 3 +++ + 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/fluent-package/config.rb b/fluent-package/config.rb -index 5aa9799..fd6e938 100644 +index c681f3b4..efcdc09e 100644 --- a/fluent-package/config.rb +++ b/fluent-package/config.rb @@ -1,5 +1,5 @@ PACKAGE_NAME = "fluent-package" --PACKAGE_VERSION = "6.0.0" +-PACKAGE_VERSION = "6.0.1" +PACKAGE_VERSION = "7.0.0" # Keep internal path (/opt/td-agent) for package name migration @@ -26,8 +26,8 @@ index 5aa9799..fd6e938 100644 BUNDLER_VERSION= "2.3.27" # https://www.ruby-lang.org/en/downloads/ (tar.gz) --BUNDLED_RUBY_VERSION = "3.4.5" --BUNDLED_RUBY_SOURCE_SHA256SUM = "1d88d8a27b442fdde4aa06dc99e86b0bbf0b288963d8433112dd5fac798fd5ee" +-BUNDLED_RUBY_VERSION = "3.4.7" +-BUNDLED_RUBY_SOURCE_SHA256SUM = "23815a6d095696f7919090fdc3e2f9459b2c83d57224b2e446ce1f5f7333ef36" +BUNDLED_RUBY_VERSION = "3.3.8" +BUNDLED_RUBY_SOURCE_SHA256SUM = "5ae28a87a59a3e4ad66bc2931d232dbab953d0aa8f6baf3bc4f8f80977c89cab" @@ -37,15 +37,15 @@ index 5aa9799..fd6e938 100644 ] # https://rubyinstaller.org/downloads/ (7-ZIP ARCHIVES) --BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.5-1" --BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "61634b204f808deec191a6819e4c25c7b3005d84537b24c4fbe7c604aeece89f" +-BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.7-1" +-BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "955678a8373c23e53032ac10f730a06120c7d3b956074020e57ca8b99b8930d4" +BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.3.8-1" +BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "2aa7d8fa7bc527b7373b91c75fae9549f5926fa918ba808b8744c1f0d8ad9f52" # 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 2614fac..95eb903 100644 +index f2828f27..6ede1213 100644 --- a/fluent-package/debian/changelog +++ b/fluent-package/debian/changelog @@ -1,3 +1,9 @@ @@ -55,11 +55,11 @@ index 2614fac..95eb903 100644 + + -- Shizuo Fujita Sun, 29 Aug 2027 13:55:06 -0000 + - fluent-package (6.0.0-1) unstable; urgency=low + fluent-package (6.0.1-1) unstable; urgency=low * New upstream release. diff --git a/fluent-package/msi/Dockerfile b/fluent-package/msi/Dockerfile -index a064784..99c36c6 100644 +index a064784f..99c36c67 100644 --- a/fluent-package/msi/Dockerfile +++ b/fluent-package/msi/Dockerfile @@ -32,7 +32,7 @@ RUN \ @@ -72,21 +72,19 @@ index a064784..99c36c6 100644 ridk install 3 && \ gem install --no-document --force bundler builder diff --git a/fluent-package/yum/fluent-package.spec.in b/fluent-package/yum/fluent-package.spec.in -index 34f0060..eb970f0 100644 +index 47d5404c..d4f56f43 100644 --- a/fluent-package/yum/fluent-package.spec.in +++ b/fluent-package/yum/fluent-package.spec.in -@@ -437,7 +437,10 @@ fi +@@ -448,6 +448,9 @@ fi # NOTE: %{_tmpfilesdir} is available since CentOS 7 %attr(0755,fluentd,fluentd) %dir /tmp/@PACKAGE_DIR@ %changelog --* Fri Aug 29 2025 Kentaro Hayashi - 6.0.0-1 -+* Sun Aug 29 2027 Shizuo Fujita - 6.0.0-1 ++* Sun Aug 29 2027 Shizuo Fujita - 7.0.0-1 +- New upstream release. + -+* Tue Aug 29 2025 Kentaro Hayashi - 6.0.0-1 + * Tue Nov 11 2025 Shizuo Fujita - 6.0.1-1 - New upstream release. - * Sat Dec 14 2024 Kentaro Hayashi - 5.2.0-1 -- -2.50.1 +2.51.0 diff --git a/fluent-package/config.rb b/fluent-package/config.rb index d641b565d..c681f3b40 100644 --- a/fluent-package/config.rb +++ b/fluent-package/config.rb @@ -1,5 +1,5 @@ PACKAGE_NAME = "fluent-package" -PACKAGE_VERSION = "6.0.0" +PACKAGE_VERSION = "6.0.1" # Keep internal path (/opt/td-agent) for package name migration SERVICE_NAME = "fluentd" @@ -7,7 +7,7 @@ PACKAGE_DIR = "fluent" COMPAT_PACKAGE_DIR = COMPAT_SERVICE_NAME -FLUENTD_REVISION = 'ed15edc4b7c86c1fcea3fbf326b7c42325e6fc71' # v1.19.0 +FLUENTD_REVISION = 'efdc4dca81c23480c9b55e13e55de6aa925b1cf5' # v1.19.1 FLUENTD_LOCAL_GEM_REPO = "file://" + File.expand_path(File.join(__dir__, "local_gem_repo")) # https://github.com/jemalloc/jemalloc/releases @@ -23,8 +23,8 @@ BUNDLER_VERSION= "2.3.27" # https://www.ruby-lang.org/en/downloads/ (tar.gz) -BUNDLED_RUBY_VERSION = "3.4.5" -BUNDLED_RUBY_SOURCE_SHA256SUM = "1d88d8a27b442fdde4aa06dc99e86b0bbf0b288963d8433112dd5fac798fd5ee" +BUNDLED_RUBY_VERSION = "3.4.7" +BUNDLED_RUBY_SOURCE_SHA256SUM = "23815a6d095696f7919090fdc3e2f9459b2c83d57224b2e446ce1f5f7333ef36" BUNDLED_RUBY_PATCHES = [ # An example entry: @@ -32,8 +32,8 @@ ] # https://rubyinstaller.org/downloads/ (7-ZIP ARCHIVES) -BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.5-1" -BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "61634b204f808deec191a6819e4c25c7b3005d84537b24c4fbe7c604aeece89f" +BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.7-1" +BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "955678a8373c23e53032ac10f730a06120c7d3b956074020e57ca8b99b8930d4" # 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 2614face1..f2828f275 100644 --- a/fluent-package/debian/changelog +++ b/fluent-package/debian/changelog @@ -1,3 +1,9 @@ +fluent-package (6.0.1-1) unstable; urgency=low + + * New upstream release. + + -- Shizuo Fujita Tue, 11 Nov 2025 09:01:19 -0000 + fluent-package (6.0.0-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 7875b959d..47d5404c6 100644 --- a/fluent-package/yum/fluent-package.spec.in +++ b/fluent-package/yum/fluent-package.spec.in @@ -448,6 +448,9 @@ fi # NOTE: %{_tmpfilesdir} is available since CentOS 7 %attr(0755,fluentd,fluentd) %dir /tmp/@PACKAGE_DIR@ %changelog +* Tue Nov 11 2025 Shizuo Fujita - 6.0.1-1 +- New upstream release. + * Fri Aug 29 2025 Kentaro Hayashi - 6.0.0-1 - New upstream release.