diff --git a/CHANGELOG.md b/CHANGELOG.md index 1aabda51..e9f3028d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,69 @@ About the past changelog entries, see [old CHANGELOG](CHANGELOG-v4.md) instead. +## Release v6.0.0 - 2025/08/29 + +### News + +* Update Ruby to 3.4.4 +* Update fluentd to 1.19.0 +* Update bundled gems + +### Core component + +* ruby v3.4.4 (update) +* jemalloc v3.6.0 +* OpenSSL 3.4.0 Windows +* OpenSSL 3.0.8 macOS +* gems + * fluentd v1.19.0 (update) + * msgpack 1.8.0 (update) + * oj 3.16.11 (update) + * webrick 1.9.1 (update) + * openssl 3.3.0 + +### Bundled plugins and gems + +* aws-partitions v1.1110.0 (update) +* aws-sdk-core v3.225.0 (update) +* aws-sdk-kms v1.102.0 (update) +* aws-sdk-s3 v1.189.0 (update) +* aws-sdk-sqs v1.96.0 (update) +* aws-sigv4 v1.12.0 (update) +* elasticsearch v9.0.3 (update) +* fluent-diagtool v1.0.5 +* fluent-plugin-elasticsearch v6.0.0 (update) +* fluent-plugin-fluent-package-notifier v0.1.0 (new) +* fluent-plugin-flowcounter-simple 0.1.0 +* fluent-plugin-kafka v0.19.4 (update) +* fluent-plugin-metrics-cmetrics v0.1.2 +* fluent-plugin-obsolete-plugins v0.1.1 (new) +* fluent-plugin-opensearch v1.1.5 (update) +* fluent-plugin-prometheus v2.2.1 (update) +* fluent-plugin-prometheus_pushgateway v0.2.1 (update) +* fluent-plugin-record-modifier v2.2.0 (update) +* fluent-plugin-rewrite-tag-filter v2.4.0 +* fluent-plugin-s3 v1.8.3 (update) +* fluent-plugin-sd-dns 0.1.0 +* fluent-plugin-systemd v1.1.0 (update) +* fluent-plugin-td v1.2.0 +* fluent-plugin-utmpx v0.5.0 +* fluent-plugin-webhdfs v1.6.0 (update) +* mini_portile2 v2.8.9 (update) +* prometheus-client v4.2.4 (update) +* rdkafka v0.21.0 (update) +* ruby-kafka v1.5.0 +* systemd-journal v2.0.0 (update) +* td-client v2.0.0 (update) +* webhdfs v0.11.0 (update) + +On Windows + +* fluent-plugin-parser-winevt_xml v0.2.8 (update) +* fluent-plugin-windows-exporter v1.0.0 +* winevt_c v0.11.2 (update) +* nokogiri v1.18.8 (update) + ## Release v5.0.7 - 2025/05/16 ### News diff --git a/fluent-package/Gemfile b/fluent-package/Gemfile index 88690ade..5b6e647c 100644 --- a/fluent-package/Gemfile +++ b/fluent-package/Gemfile @@ -9,18 +9,17 @@ source "https://rubygems.org" no_fat_gem = [:ruby] gem "rake" gem "bundler", BUNDLER_VERSION -gem "cool.io", "1.8.1", platforms: no_fat_gem +gem "cool.io", "1.9.0", platforms: no_fat_gem gem "sigdump", "0.2.5" gem "http_parser.rb", "0.8.0" gem "yajl-ruby", "1.4.3" -gem "serverengine", '2.4.0' -gem "msgpack", "1.7.3" -gem "oj", "3.16.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.2024.2" -gem "async", "1.32.1" -# async-http 0.65.0 or later does not support async 1.x -gem "async-http", "0.64.2" +gem "tzinfo-data", "1.2025.2" +gem "async", "2.24.0" +gem "async-http", "0.89.0" gem "webrick", "1.9.1" if ENV["INSTALL_GEM_FROM_LOCAL_REPO"] @@ -46,28 +45,26 @@ end # plugin gems -gem "elasticsearch", "8.14.0" -gem "fluent-plugin-elasticsearch", "5.4.3" +gem "elasticsearch", "9.0.3" +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.3" -# f-p-prometheus_pushgateway doesn't support prometheus 3.0 or later -gem "prometheus-client", "2.1.0" -gem "fluent-plugin-prometheus", "2.1.0" -gem "fluent-plugin-prometheus_pushgateway", "0.1.1" +gem "fluent-plugin-kafka", "0.19.4" +gem "prometheus-client", "4.2.4" +gem "fluent-plugin-prometheus", "2.2.1" +gem "fluent-plugin-prometheus_pushgateway", "0.2.1" gem "jmespath", "1.6.2" -gem "aws-partitions", "1.957.0" -gem "aws-sdk-core", "3.201.2" -gem "aws-sdk-kms", "1.88.0" -gem "aws-sdk-sqs", "1.80.0" -gem "aws-sigv4", "1.8.0" -gem "aws-sdk-s3", "1.156.0" -gem "fluent-plugin-s3", "1.8.1" -gem "httpclient", "2.8.3" +gem "aws-partitions", "1.1110.0" +gem "aws-sdk-core", "3.225.0" +gem "aws-sdk-kms", "1.102.0" +gem "aws-sdk-sqs", "1.96.0" +gem "aws-sigv4", "1.12.0" +gem "aws-sdk-s3", "1.189.0" +gem "fluent-plugin-s3", "1.8.3" +gem "httpclient", "2.9.0" gem "fluent-diagtool", "1.0.5" -# td doesn't support td-client 2.0.0 or later yet -gem "td", "0.17.1" -gem "td-client", "1.0.8" +gem "td", "0.18.0" +gem "td-client", "2.0.0" gem "fluent-plugin-td", "1.2.0" gem "webhdfs", "0.11.0" gem "fluent-plugin-webhdfs", "1.6.0" @@ -75,26 +72,29 @@ gem "fluent-plugin-record-modifier", "2.2.0" gem "fluent-plugin-rewrite-tag-filter", "2.4.0" gem "fluent-plugin-sd-dns", "0.1.0" gem "fluent-plugin-flowcounter-simple", "0.1.0" -gem "mini_portile2", "2.8.7" +gem "mini_portile2", "2.8.9" gem "cmetrics", "0.3.3" gem "fluent-plugin-metrics-cmetrics", "0.1.2" -gem "fluent-plugin-calyptia-monitoring", "0.1.3" gem "opensearch-ruby", "3.4.0" -gem "fluent-plugin-opensearch", "1.1.4" +gem "fluent-plugin-opensearch", "1.1.5" +gem "fluent-plugin-fluent-package-update-notifier", "0.1.0" +gem "fluent-plugin-obsolete-plugins", "0.1.1" windows_platforms = [:mingw, :x64_mingw] # :mswin +# ffi-win32-extensions doesn't support ffi 1.17.1 or later gem "ffi", "1.17.0", platforms: windows_platforms -gem "ffi-win32-extensions", "1.0.4", platforms: windows_platforms -# keep nokogiri 1.16.x because winevt_xml requires < 1.17 -gem "nokogiri", "1.16.8", 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.8", 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. #gem "win32-service", "2.3.2", platforms: windows_platforms -gem "winevt_c", "0.11.1", platforms: windows_platforms +gem "winevt_c", "0.11.2", platforms: windows_platforms gem "win32-eventlog", "0.6.7", platforms: windows_platforms -gem "fluent-plugin-parser-winevt_xml", "0.2.7", platforms: windows_platforms -gem "fluent-plugin-windows-eventlog", "0.9.0", platforms: windows_platforms +gem "fluent-plugin-parser-winevt_xml", "0.2.8", platforms: windows_platforms +gem "fluent-plugin-windows-eventlog", "0.9.1", platforms: windows_platforms gem "fluent-plugin-windows-exporter", "1.0.0", platforms: windows_platforms not_windows_platforms = [:ruby] @@ -102,6 +102,8 @@ gem "capng_c", "0.2.3", platforms: not_windows_platforms # Use newer bundled rdkafka with librdkafka 2.8.0 to support AlmaLinux 10 # (librdkafka 2.8.0 supports "OpenSSL without the ENGINE component") gem "rdkafka", "0.21.0", platforms: not_windows_platforms +# Keep systemd-journal 2.0.0 and f-p-systemd 1.1.0 until regression issue is fixed +# See https://github.com/ledbettj/systemd-journal/pull/109 gem "systemd-journal", "2.0.0", platforms: not_windows_platforms gem "fluent-plugin-systemd", "1.1.0", platforms: not_windows_platforms gem "fluent-plugin-utmpx", "0.5.0", platforms: not_windows_platforms diff --git a/fluent-package/Gemfile.lock b/fluent-package/Gemfile.lock index 05727fd5..d040b1fa 100644 --- a/fluent-package/Gemfile.lock +++ b/fluent-package/Gemfile.lock @@ -9,16 +9,18 @@ GIT GIT remote: https://github.com/fluent/fluentd - revision: 46372ddd521870f6a203baefb5a598209486d0bc - ref: 46372ddd521870f6a203baefb5a598209486d0bc + revision: bee06706104aad4ee243f2e959c6d18005762b35 + ref: bee06706104aad4ee243f2e959c6d18005762b35 specs: fluentd (1.18.0) + async-http (~> 0.86) base64 (~> 0.2) bundler certstore_c (~> 0.1.7) cool.io (>= 1.4.5, < 2.0.0) csv (~> 3.2) drb (~> 2.2) + fiddle (~> 1.1) http_parser.rb (>= 0.5.1, < 0.9.0) logger (~> 1.6) msgpack (>= 1.3.1, < 2.0.0) @@ -27,81 +29,87 @@ GIT strptime (>= 0.2.4, < 1.0.0) tzinfo (>= 1.0, < 3.0) tzinfo-data (~> 1.0) + uri (~> 1.0) webrick (~> 1.4) win32-event (~> 0.6.3) win32-ipc (~> 0.7.0) win32-service (~> 2.3.0) yajl-ruby (~> 1.0) + zstd-ruby (~> 1.5) GEM remote: https://rubygems.org/ specs: addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - async (1.32.1) - console (~> 1.10) - nio4r (~> 2.3) - timers (~> 4.1) - async-http (0.64.2) - async (>= 1.25) - async-io (>= 1.28) - async-pool (>= 0.2) - protocol-http (~> 0.26.0) - protocol-http1 (~> 0.19.0) - protocol-http2 (~> 0.16.0) - traces (>= 0.10.0) - async-io (1.43.2) - async - async-pool (0.10.2) + async (2.24.0) + console (~> 1.29) + fiber-annotation + io-event (~> 1.9) + metrics (~> 0.12) + traces (~> 0.15) + async-http (0.89.0) + async (>= 2.10.2) + async-pool (~> 0.9) + io-endpoint (~> 0.14) + io-stream (~> 0.6) + metrics (~> 0.12) + protocol-http (~> 0.49) + protocol-http1 (~> 0.30) + protocol-http2 (~> 0.22) + traces (~> 0.10) + async-pool (0.10.3) async (>= 1.25) - traces - aws-eventstream (1.3.0) - aws-partitions (1.957.0) - aws-sdk-core (3.201.2) + aws-eventstream (1.4.0) + aws-partitions (1.1110.0) + aws-sdk-core (3.225.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.88.0) - aws-sdk-core (~> 3, >= 3.201.0) + logger + aws-sdk-kms (1.102.0) + aws-sdk-core (~> 3, >= 3.225.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.156.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-s3 (1.189.0) + aws-sdk-core (~> 3, >= 3.225.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sdk-sqs (1.80.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-sqs (1.96.0) + aws-sdk-core (~> 3, >= 3.225.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.8.0) + aws-sigv4 (1.12.0) aws-eventstream (~> 1, >= 1.0.2) - base64 (0.2.0) - bigdecimal (3.1.8) + base64 (0.3.0) + bigdecimal (3.2.2) bindata (2.4.15) - certstore_c (0.1.7) capng_c (0.2.3) + certstore_c (0.1.7) cmetrics (0.3.3) mini_portile2 (~> 2.7) - concurrent-ruby (1.3.4) - console (1.29.2) + concurrent-ruby (1.3.5) + console (1.30.2) fiber-annotation fiber-local (~> 1.1) json - cool.io (1.8.1) - csv (3.3.0) - digest-crc (0.6.5) + cool.io (1.9.0) + csv (3.3.5) + digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) digest-murmurhash (1.1.1) - drb (2.2.1) - elastic-transport (8.3.5) + drb (2.2.3) + elastic-transport (8.4.0) faraday (< 3) multi_json - elasticsearch (8.14.0) + elasticsearch (9.0.3) elastic-transport (~> 8.3) - elasticsearch-api (= 8.14.0) - elasticsearch-api (8.14.0) + elasticsearch-api (= 9.0.3) + elasticsearch-api (9.0.3) multi_json - excon (1.2.2) - faraday (2.12.2) + excon (1.2.7) + logger + faraday (2.13.1) faraday-net_http (>= 2.0, < 3.5) json logger @@ -114,12 +122,13 @@ GEM aws-sigv4 (~> 1.0) faraday (>= 2.0, < 3) ffi (1.17.0) - ffi-win32-extensions (1.0.4) - ffi + ffi-win32-extensions (1.1.0) + ffi (>= 1.15.5, <= 1.17.0) fiber-annotation (0.2.0) fiber-local (1.1.0) fiber-storage - fiber-storage (1.0.0) + fiber-storage (1.0.1) + fiddle (1.1.8) fileutils (1.7.3) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) @@ -128,10 +137,7 @@ GEM json fluent-logger (0.9.1) msgpack (>= 1.0.0, < 2) - fluent-plugin-calyptia-monitoring (0.1.3) - fluent-plugin-metrics-cmetrics (>= 0.1.1) - fluentd (>= 1.14.0, < 2) - fluent-plugin-elasticsearch (5.4.3) + fluent-plugin-elasticsearch (6.0.0) elasticsearch excon faraday (>= 2.0.0) @@ -139,38 +145,42 @@ GEM fluentd (>= 0.14.22) fluent-plugin-flowcounter-simple (0.1.0) fluentd (>= 1.0) - fluent-plugin-kafka (0.19.3) + fluent-plugin-fluent-package-update-notifier (0.1.0) + fluentd (>= 0.14.10, < 2) + fluent-plugin-kafka (0.19.4) + bigdecimal (~> 3.1) fluentd (>= 0.10.58, < 2) ltsv ruby-kafka (>= 1.5.0, < 2) fluent-plugin-metrics-cmetrics (0.1.2) cmetrics (>= 0.2.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-opensearch (1.1.4) + fluent-plugin-obsolete-plugins (0.1.1) + fluentd (>= 0.14.10, < 2) + fluent-plugin-opensearch (1.1.5) aws-sdk-core (~> 3) excon faraday (>= 2.0.0) faraday-excon (>= 2.0.0) faraday_middleware-aws-sigv4 (~> 1.0.1) fluentd (>= 0.14.22) - opensearch-ruby - fluent-plugin-parser-winevt_xml (0.2.7) + opensearch-ruby (>= 3.0.1) + fluent-plugin-parser-winevt_xml (0.2.8) base64 (~> 0.2) csv (~> 3.2) fluentd (>= 0.14.12, < 2) - nokogiri (>= 1.12.5, < 1.17) - fluent-plugin-prometheus (2.1.0) + nokogiri (>= 1.12.5) + fluent-plugin-prometheus (2.2.1) fluentd (>= 1.9.1, < 2) prometheus-client (>= 2.1.0) - fluent-plugin-prometheus_pushgateway (0.1.1) - fluent-plugin-prometheus (>= 2.0.0, < 2.2.0) - prometheus-client (~> 2.1) + fluent-plugin-prometheus_pushgateway (0.2.1) + fluent-plugin-prometheus (>= 2.0.0, < 3) fluent-plugin-record-modifier (2.2.0) fluentd (>= 1.1, < 2) fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-s3 (1.8.1) + fluent-plugin-s3 (1.8.3) aws-sdk-s3 (~> 1.60) aws-sdk-sqs (~> 1.23) fluentd (>= 0.14.22, < 2) @@ -188,7 +198,7 @@ GEM fluent-plugin-webhdfs (1.6.0) fluentd (>= 0.14.22) webhdfs (>= 0.11.0) - fluent-plugin-windows-eventlog (0.9.0) + fluent-plugin-windows-eventlog (0.9.1) fluentd (>= 0.14.12, < 2) win32-eventlog winevt_c (>= 0.11.0) @@ -197,23 +207,28 @@ GEM fluentd (>= 0.14.10, < 2) hirb (0.7.3) http_parser.rb (0.8.0) - httpclient (2.8.3) + httpclient (2.9.0) + mutex_m + io-endpoint (0.15.2) + io-event (1.10.1) + io-stream (0.6.1) jmespath (1.6.2) - json (2.9.0) + json (2.12.2) linux-utmpx (0.3.0) bindata (~> 2.4.8) - logger (1.6.2) + logger (1.7.0) ltsv (0.1.2) - mini_portile2 (2.8.7) - msgpack (1.7.3) + metrics (0.12.2) + mini_portile2 (2.8.9) + msgpack (1.8.0) multi_json (1.15.0) + mutex_m (0.3.0) net-http (0.6.0) uri - nio4r (2.7.4) - nokogiri (1.16.8) + nokogiri (1.18.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) - oj (3.16.7) + oj (3.16.11) bigdecimal (>= 3.0) ostruct (>= 0.2) opensearch-ruby (3.4.0) @@ -221,22 +236,23 @@ GEM multi_json (>= 1.0) ostruct (0.6.1) parallel (1.20.1) - prometheus-client (2.1.0) + prometheus-client (4.2.4) + base64 protocol-hpack (1.5.1) - protocol-http (0.26.8) - protocol-http1 (0.19.1) + protocol-http (0.50.1) + protocol-http1 (0.34.0) protocol-http (~> 0.22) - protocol-http2 (0.16.0) + protocol-http2 (0.22.1) protocol-hpack (~> 1.4) - protocol-http (~> 0.18) - public_suffix (6.0.1) + protocol-http (~> 0.47) + public_suffix (6.0.2) racc (1.8.1) - rake (13.2.1) + rake (13.3.0) rdkafka (0.21.0) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - rexml (3.3.9) + rexml (3.4.1) ruby-kafka (1.5.0) digest-crc ruby-progressbar (1.13.0) @@ -249,31 +265,32 @@ GEM strptime (0.2.5) systemd-journal (2.0.0) ffi (~> 1.9) - td (0.17.1) + td (0.18.0) hirb (>= 0.4.5) msgpack parallel (~> 1.20.0) rexml ruby-progressbar (~> 1.7) rubyzip (~> 1.3.0) - td-client (>= 1.0.8, < 2) + td-client (>= 1.0.8, < 3) td-logger (>= 0.3.21, < 2) yajl-ruby (>= 1.3.1, < 2.0) zip-zip (~> 0.3) - td-client (1.0.8) + td-client (2.0.0) httpclient (>= 2.7) msgpack (>= 0.5.6, < 2) - td-logger (0.3.28) + td-logger (0.4.0) fluent-logger (>= 0.5.0, < 2.0) + logger msgpack (>= 0.5.6, < 2.0) - td-client (>= 0.8.66, < 2.0) - timers (4.3.5) - traces (0.14.1) + mutex_m (>= 0.2.0, < 1.0) + td-client (>= 1.0.8, < 3.0) + traces (0.15.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.2) + tzinfo-data (1.2025.2) tzinfo (>= 1.0.0) - uri (1.0.2) + uri (1.0.3) webhdfs (0.11.0) addressable webrick (1.9.1) @@ -283,10 +300,11 @@ GEM ffi win32-ipc (0.7.0) ffi - winevt_c (0.11.1) + winevt_c (0.11.2) yajl-ruby (1.4.3) zip-zip (0.3) rubyzip (>= 1.0.0) + zstd-ruby (1.5.6.6) PLATFORMS x64-mingw-ucrt @@ -295,69 +313,71 @@ PLATFORMS x86_64-linux DEPENDENCIES - async (= 1.32.1) - async-http (= 0.64.2) - aws-partitions (= 1.957.0) - aws-sdk-core (= 3.201.2) - aws-sdk-kms (= 1.88.0) - aws-sdk-s3 (= 1.156.0) - aws-sdk-sqs (= 1.80.0) - aws-sigv4 (= 1.8.0) + async (= 2.24.0) + async-http (= 0.89.0) + aws-partitions (= 1.1110.0) + aws-sdk-core (= 3.225.0) + aws-sdk-kms (= 1.102.0) + aws-sdk-s3 (= 1.189.0) + aws-sdk-sqs (= 1.96.0) + aws-sigv4 (= 1.12.0) bundler (= 2.3.27) capng_c (= 0.2.3) cmetrics (= 0.3.3) - cool.io (= 1.8.1) + cool.io (= 1.9.0) digest-murmurhash (= 1.1.1) - elasticsearch (= 8.14.0) + elasticsearch (= 9.0.3) ffi (= 1.17.0) - ffi-win32-extensions (= 1.0.4) + ffi-win32-extensions (= 1.1.0) + fiddle (= 1.1.8) fluent-diagtool (= 1.0.5) - fluent-plugin-calyptia-monitoring (= 0.1.3) - fluent-plugin-elasticsearch (= 5.4.3) + fluent-plugin-elasticsearch (= 6.0.0) fluent-plugin-flowcounter-simple (= 0.1.0) - fluent-plugin-kafka (= 0.19.3) + fluent-plugin-fluent-package-update-notifier (= 0.1.0) + fluent-plugin-kafka (= 0.19.4) fluent-plugin-metrics-cmetrics (= 0.1.2) - fluent-plugin-opensearch (= 1.1.4) - fluent-plugin-parser-winevt_xml (= 0.2.7) - fluent-plugin-prometheus (= 2.1.0) - fluent-plugin-prometheus_pushgateway (= 0.1.1) + fluent-plugin-obsolete-plugins (= 0.1.1) + fluent-plugin-opensearch (= 1.1.5) + 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.0) fluent-plugin-rewrite-tag-filter (= 2.4.0) - fluent-plugin-s3 (= 1.8.1) + fluent-plugin-s3 (= 1.8.3) fluent-plugin-sd-dns (= 0.1.0) fluent-plugin-systemd (= 1.1.0) fluent-plugin-td (= 1.2.0) fluent-plugin-utmpx (= 0.5.0) fluent-plugin-webhdfs (= 1.6.0) - fluent-plugin-windows-eventlog (= 0.9.0) + fluent-plugin-windows-eventlog (= 0.9.1) fluent-plugin-windows-exporter (= 1.0.0) fluentd! http_parser.rb (= 0.8.0) - httpclient (= 2.8.3) + httpclient (= 2.9.0) jmespath (= 1.6.2) - mini_portile2 (= 2.8.7) - msgpack (= 1.7.3) - nokogiri (= 1.16.8) - oj (= 3.16.7) + mini_portile2 (= 2.8.9) + msgpack (= 1.8.0) + nokogiri (= 1.18.8) + oj (= 3.16.11) opensearch-ruby (= 3.4.0) - prometheus-client (= 2.1.0) + prometheus-client (= 4.2.4) rake rdkafka (= 0.21.0) ruby-kafka (= 1.5.0) serverengine (= 2.4.0) sigdump (= 0.2.5) systemd-journal (= 2.0.0) - td (= 0.17.1) - td-client (= 1.0.8) + td (= 0.18.0) + td-client (= 2.0.0) tzinfo (= 2.0.6) - tzinfo-data (= 1.2024.2) + tzinfo-data (= 1.2025.2) webhdfs (= 0.11.0) webrick (= 1.9.1) win32-event (= 0.6.3) win32-eventlog (= 0.6.7) win32-ipc (= 0.7.0) win32-service! - winevt_c (= 0.11.1) + winevt_c (= 0.11.2) yajl-ruby (= 1.4.3) BUNDLED WITH diff --git a/fluent-package/bump-version-v6.patch b/fluent-package/bump-version-v6.patch index ed69e3c7..ef9034b8 100644 --- a/fluent-package/bump-version-v6.patch +++ b/fluent-package/bump-version-v6.patch @@ -1,17 +1,18 @@ -From 22ef9f8d96e796933b490bf1bf8c41425e6d621e Mon Sep 17 00:00:00 2001 +From f6e245b9eae6f4f98a41125e623d0dd7ac2e535a Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi -Date: Wed, 11 Dec 2024 22:55:30 +0900 -Subject: [PATCH] bump version to 6.0.0 +Date: Mon, 9 Jun 2025 18:20:28 +0900 +Subject: [PATCH] Bump version to v6.0.0 Signed-off-by: Kentaro Hayashi --- - 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/msi/Dockerfile | 2 +- + 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 8219301..7d4fec7 100644 +index 509f338..de767fd 100644 --- a/fluent-package/config.rb +++ b/fluent-package/config.rb @@ -1,5 +1,5 @@ @@ -27,11 +28,22 @@ index 8219301..7d4fec7 100644 # https://www.ruby-lang.org/en/downloads/ (tar.gz) -BUNDLED_RUBY_VERSION = "3.2.6" -BUNDLED_RUBY_SOURCE_SHA256SUM = "d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370" -+BUNDLED_RUBY_VERSION = "3.3.6" -+BUNDLED_RUBY_SOURCE_SHA256SUM = "8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d" ++BUNDLED_RUBY_VERSION = "3.4.4" ++BUNDLED_RUBY_SOURCE_SHA256SUM = "a0597bfdf312e010efd1effaa8d7f1d7833146fdc17950caa8158ffa3dcbfa85" 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.2.6-1" +-BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "549616f2964301616fd713e5590f024b63b28d6cc5e5033c87eff32e0d1fa2d2" ++BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.4-2" ++BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "29fe655a8bee91d6466e631ae612142a1c5d68d46323ccca7f35add2dbb28b51" + + # 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 0a73dbb..2614fac 100644 --- a/fluent-package/debian/changelog @@ -46,6 +58,19 @@ index 0a73dbb..2614fac 100644 fluent-package (5.2.0-1) unstable; urgency=low * New upstream release. +diff --git a/fluent-package/msi/Dockerfile b/fluent-package/msi/Dockerfile +index f140c34..a064784 100644 +--- a/fluent-package/msi/Dockerfile ++++ b/fluent-package/msi/Dockerfile +@@ -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.2.8.1 && \ ++ choco install ruby -y --version=3.4.4.2 && \ + refreshenv && \ + 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 45f0519..240f30c 100644 --- a/fluent-package/yum/fluent-package.spec.in @@ -61,5 +86,5 @@ index 45f0519..240f30c 100644 - New upstream release. -- -2.45.2 +2.49.0 diff --git a/fluent-package/config.rb b/fluent-package/config.rb index 82193019..509f3385 100644 --- a/fluent-package/config.rb +++ b/fluent-package/config.rb @@ -7,7 +7,7 @@ PACKAGE_DIR = "fluent" COMPAT_PACKAGE_DIR = COMPAT_SERVICE_NAME -FLUENTD_REVISION = '46372ddd521870f6a203baefb5a598209486d0bc' # v1.18.0 +FLUENTD_REVISION = 'bee06706104aad4ee243f2e959c6d18005762b35' # HEAD #4993 FLUENTD_LOCAL_GEM_REPO = "file://" + File.expand_path(File.join(__dir__, "local_gem_repo")) # https://github.com/jemalloc/jemalloc/releases diff --git a/fluent-package/yum/systemd-test/update-to-next-major-version.sh b/fluent-package/yum/systemd-test/update-to-next-major-version.sh index 63dc6245..2200e96b 100755 --- a/fluent-package/yum/systemd-test/update-to-next-major-version.sh +++ b/fluent-package/yum/systemd-test/update-to-next-major-version.sh @@ -22,10 +22,16 @@ sudo sed -i "s/=auto/=$service_restart/" /etc/sysconfig/fluentd sudo /opt/fluent/bin/fluent-gem install --no-document fluent-plugin-concat sudo /opt/fluent/bin/fluent-gem install --no-document gqtp +# Show bundled ruby version before updating to next major version +/opt/fluent/bin/ruby -v + # Install next major version package="/host/v6-test/${distribution}/${DISTRIBUTION_VERSION}/x86_64/Packages/fluent-package-*.rpm" sudo $DNF install -y $package +# Show bundled ruby version +/opt/fluent/bin/ruby -v + # Test: Check whether plugin/gem were installed during upgrading if [ "$service_restart" != manual ] && [ "$status_before_update" = active ]; then # plugin gem should be installed automatically