From 77a802a6a1c8b98b9c3c8868443bdf4b00a5b6f3 Mon Sep 17 00:00:00 2001 From: Daijiro Fukuda Date: Fri, 24 Nov 2023 17:56:47 +0900 Subject: [PATCH] v5.0.2 Signed-off-by: Daijiro Fukuda Co-authored-by: Kentaro Hayashi --- CHANGELOG.md | 86 ++++++++++++++++++++++- fluent-package/Gemfile | 18 ++--- fluent-package/Gemfile.lock | 72 ++++++++++--------- fluent-package/config.rb | 4 +- fluent-package/debian/changelog | 6 ++ fluent-package/yum/fluent-package.spec.in | 3 + 6 files changed, 142 insertions(+), 47 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a518ebc0d..e0a3d1407 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,90 @@ About the past changelog entries, see [old CHANGELOG](CHANGELOG-v4.md) instead. +## Release v5.0.2 - 2023/11/29 + +### News + +* Update fluentd to 1.16.3 +* Update bundled gems +* msi: support path which contains space or parenthesis (#589) +* deb: fixed system user/group name in logrotate config (#592,#594) + * It fixes a bug that unknown user error was reported. +* rpm: fixed to create fluentd user as system account (#596) + * It fixes a bug that /var/lib/fluent directory was created unexpectedly. +* rpm: changed to keep system account after removing fluent-package. (#598) + * In the previous versions, there was a bug that group was not cleanly removed + when the package was upgraded from td-agent v4. + This change makes reinstall/downgrade friendly. +* Update fluent-diagtool to v1.0.3 + * Supports fluent-package. + * Supports Windows partially. + * Adds the feature to confirm the manually installed plugin list. + +### Core component + +* ruby v3.2.2 +* jemalloc v3.6.0 +* OpenSSL 3.1.0 Windows +* OpenSSL 3.0.8 macOS +* fluentd v1.16.3 (update) + +### Core gems + +* async-http v0.60.2 +* bundler v2.3.26 +* cool.io v1.8.0 (update) +* http_parser.rb v0.8.0 +* msgpack v1.7.2 (update) +* oj v3.16.1 (update) +* serverengine v2.3.2 +* sigdump v0.2.5 +* tzinfo v2.0.6 +* tzinfo-data v1.2023.3 +* yajl-ruby v1.4.3 + +### Bundled plugins and gems + +* aws-partitions v1.785.0 +* aws-sdk-core v3.178.0 +* aws-sdk-kms v1.71.0 +* aws-sdk-s3 v1.129.0 +* aws-sdk-sqs v1.61.0 +* aws-sigv4 v1.6.0 +* elasticsearch v8.8.0 +* fluent-diagtool v1.0.3 (update) +* fluent-plugin-calyptia-monitoring v0.1.3 +* fluent-plugin-elasticsearch v5.4.0 (update) +* fluent-plugin-flowcounter-simple 0.1.0 +* fluent-plugin-kafka v0.19.2 (update) +* fluent-plugin-metrics-cmetrics v0.1.2 +* fluent-plugin-opensearch v1.1.4 (update) +* fluent-plugin-prometheus v2.1.0 +* fluent-plugin-prometheus_pushgateway v0.1.1 +* fluent-plugin-record-modifier v2.1.1 +* fluent-plugin-rewrite-tag-filter v2.4.0 +* fluent-plugin-s3 v1.7.2 +* fluent-plugin-sd-dns 0.1.0 +* fluent-plugin-systemd v1.0.5 +* fluent-plugin-td v1.2.0 +* fluent-plugin-utmpx v0.5.0 +* fluent-plugin-webhdfs v1.5.0 +* mini_portile2 v2.8.2 +* prometheus-client v4.1.0 +* rdkafka v0.12.0 +* ruby-kafka v1.5.0 +* systemd-journal v1.4.2 +* td-client v1.0.8 +* webhdfs v0.10.2 + +On Windows + +* fluent-plugin-parser-winevt_xml v0.2.6 +* fluent-plugin-windows-eventlog v0.8.3 +* fluent-plugin-windows-exporter v1.0.0 +* winevt_c v0.10.1 +* nokogiri v1.15.5 (update) + ## Release v5.0.1 - 2023/08/29 ### News @@ -148,7 +232,7 @@ It is just modified to be a minimally buildable state, it is for testing purpose ### Core gems -* async-http v0.60.2 (update) +* async-http v0.61.0 (update) * bundler v2.3.26 * cool.io v1.7.1 * http_parser.rb v0.8.0 diff --git a/fluent-package/Gemfile b/fluent-package/Gemfile index 25d8f4ba3..0418bbb0b 100644 --- a/fluent-package/Gemfile +++ b/fluent-package/Gemfile @@ -9,17 +9,17 @@ source "https://rubygems.org" no_fat_gem = [:ruby] gem "rake" gem "bundler", BUNDLER_VERSION -gem "cool.io", "1.7.1", platforms: no_fat_gem +gem "cool.io", "1.8.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.3.2' -gem "msgpack", "1.7.1" -gem "oj", "3.15.0" +gem "msgpack", "1.7.2" +gem "oj", "3.16.1" gem "tzinfo", "2.0.6" gem "tzinfo-data", "1.2023.3" gem "async", "1.31.0" -gem "async-http", "0.60.2" +gem "async-http", "0.61.0" gem "webrick", "1.8.1" # CVE-2023-36617: should be removed after we update Ruby to 3.2.3 or later @@ -41,10 +41,10 @@ end # plugin gems gem "elasticsearch", "8.8.0" -gem "fluent-plugin-elasticsearch", "5.3.0" +gem "fluent-plugin-elasticsearch", "5.4.0" gem "ruby-kafka", "1.5.0" gem "digest-murmurhash", "1.1.1" -gem "fluent-plugin-kafka", "0.19.0" +gem "fluent-plugin-kafka", "0.19.2" # 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" @@ -58,7 +58,7 @@ gem "aws-sigv4", "1.6.0" gem "aws-sdk-s3", "1.129.0" gem "fluent-plugin-s3", "1.7.2" gem "httpclient", "2.8.3" -gem "fluent-diagtool", "1.0.1" +gem "fluent-diagtool", "1.0.3" gem "td", "0.17.1" gem "td-client", "1.0.8" gem "fluent-plugin-td", "1.2.0" @@ -73,12 +73,12 @@ gem "cmetrics", "0.3.3" gem "fluent-plugin-metrics-cmetrics", "0.1.2" gem "fluent-plugin-calyptia-monitoring", "0.1.3" gem "opensearch-ruby", "2.1.0" -gem "fluent-plugin-opensearch", "1.1.3" +gem "fluent-plugin-opensearch", "1.1.4" windows_platforms = [:mingw, :x64_mingw] # :mswin gem "ffi", "1.15.5", platforms: windows_platforms gem "ffi-win32-extensions", "1.0.4", platforms: windows_platforms -gem "nokogiri", "1.15.3", platforms: windows_platforms +gem "nokogiri", "1.15.5", platforms: windows_platforms gem "win32-event", "0.6.3", platforms: windows_platforms gem "win32-ipc", "0.7.0", platforms: windows_platforms gem "win32-service", "2.3.2", platforms: windows_platforms diff --git a/fluent-package/Gemfile.lock b/fluent-package/Gemfile.lock index 5f4f6ebac..2295f8414 100644 --- a/fluent-package/Gemfile.lock +++ b/fluent-package/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/fluent/fluentd - revision: d5685ada81ac89a35a79965f1e94bbe5952a5d3a - ref: d5685ada81ac89a35a79965f1e94bbe5952a5d3a + revision: d3cf2e0f95a0ad88b9897197db6c5152310f114f + ref: d3cf2e0f95a0ad88b9897197db6c5152310f114f specs: - fluentd (1.16.2) + fluentd (1.16.3) bundler certstore_c (~> 0.1.7) cool.io (>= 1.4.5, < 2.0.0) @@ -29,15 +29,15 @@ GEM console (~> 1.10) nio4r (~> 2.3) timers (~> 4.1) - async-http (0.60.2) + async-http (0.61.0) async (>= 1.25) async-io (>= 1.28) async-pool (>= 0.2) - protocol-http (~> 0.24.0) - protocol-http1 (~> 0.15.0) + protocol-http (~> 0.25.0) + protocol-http1 (~> 0.16.0) protocol-http2 (~> 0.15.0) traces (>= 0.10.0) - async-io (1.35.0) + async-io (1.38.0) async async-pool (0.4.0) async (>= 1.25) @@ -60,19 +60,20 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.6.0) aws-eventstream (~> 1, >= 1.0.2) + base64 (0.2.0) bindata (2.4.15) certstore_c (0.1.7) cmetrics (0.3.3) mini_portile2 (~> 2.7) concurrent-ruby (1.2.2) - console (1.21.0) + console (1.23.2) fiber-annotation fiber-local - cool.io (1.7.1) + cool.io (1.8.0) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) digest-murmurhash (1.1.1) - elastic-transport (8.2.2) + elastic-transport (8.3.0) faraday (< 3) multi_json elasticsearch (8.8.0) @@ -80,8 +81,9 @@ GEM elasticsearch-api (= 8.8.0) elasticsearch-api (8.8.0) multi_json - excon (0.100.0) - faraday (2.7.10) + excon (0.104.0) + faraday (2.7.12) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-excon (2.1.0) @@ -96,10 +98,10 @@ GEM ffi fiber-annotation (0.2.0) fiber-local (1.0.0) - fileutils (1.7.1) + fileutils (1.7.2) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) - fluent-diagtool (1.0.1) + fluent-diagtool (1.0.3) fileutils json fluent-logger (0.9.0) @@ -107,7 +109,7 @@ GEM fluent-plugin-calyptia-monitoring (0.1.3) fluent-plugin-metrics-cmetrics (>= 0.1.1) fluentd (>= 1.14.0, < 2) - fluent-plugin-elasticsearch (5.3.0) + fluent-plugin-elasticsearch (5.4.0) elasticsearch excon faraday (>= 2.0.0) @@ -115,14 +117,14 @@ GEM fluentd (>= 0.14.22) fluent-plugin-flowcounter-simple (0.1.0) fluentd (>= 1.0) - fluent-plugin-kafka (0.19.0) + fluent-plugin-kafka (0.19.2) 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.3) + fluent-plugin-opensearch (1.1.4) aws-sdk-core (~> 3) excon faraday (>= 2.0.0) @@ -178,13 +180,13 @@ GEM bindata (~> 2.4.8) ltsv (0.1.2) mini_portile2 (2.8.2) - msgpack (1.7.1) + msgpack (1.7.2) multi_json (1.15.0) - nio4r (2.5.9) - nokogiri (1.15.3) + nio4r (2.6.1) + nokogiri (1.15.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) - oj (3.15.0) + oj (3.16.1) opensearch-api (2.2.0) multi_json opensearch-ruby (2.1.0) @@ -196,15 +198,15 @@ GEM parallel (1.20.1) prometheus-client (2.1.0) protocol-hpack (1.4.2) - protocol-http (0.24.7) - protocol-http1 (0.15.1) + protocol-http (0.25.0) + protocol-http1 (0.16.0) protocol-http (~> 0.22) protocol-http2 (0.15.1) protocol-hpack (~> 1.4) protocol-http (~> 0.18) - public_suffix (5.0.3) - racc (1.7.1) - rake (13.0.6) + public_suffix (5.0.4) + racc (1.7.3) + rake (13.1.0) rdkafka (0.12.0) ffi (~> 1.15) mini_portile2 (~> 2.6) @@ -271,7 +273,7 @@ PLATFORMS DEPENDENCIES async (= 1.31.0) - async-http (= 0.60.2) + async-http (= 0.61.0) aws-partitions (= 1.785.0) aws-sdk-core (= 3.178.0) aws-sdk-kms (= 1.71.0) @@ -280,18 +282,18 @@ DEPENDENCIES aws-sigv4 (= 1.6.0) bundler (= 2.3.26) cmetrics (= 0.3.3) - cool.io (= 1.7.1) + cool.io (= 1.8.0) digest-murmurhash (= 1.1.1) elasticsearch (= 8.8.0) ffi (= 1.15.5) ffi-win32-extensions (= 1.0.4) - fluent-diagtool (= 1.0.1) + fluent-diagtool (= 1.0.3) fluent-plugin-calyptia-monitoring (= 0.1.3) - fluent-plugin-elasticsearch (= 5.3.0) + fluent-plugin-elasticsearch (= 5.4.0) fluent-plugin-flowcounter-simple (= 0.1.0) - fluent-plugin-kafka (= 0.19.0) + fluent-plugin-kafka (= 0.19.2) fluent-plugin-metrics-cmetrics (= 0.1.2) - fluent-plugin-opensearch (= 1.1.3) + fluent-plugin-opensearch (= 1.1.4) fluent-plugin-parser-winevt_xml (= 0.2.6) fluent-plugin-prometheus (= 2.1.0) fluent-plugin-prometheus_pushgateway (= 0.1.1) @@ -310,9 +312,9 @@ DEPENDENCIES httpclient (= 2.8.3) jmespath (= 1.6.2) mini_portile2 (= 2.8.2) - msgpack (= 1.7.1) - nokogiri (= 1.15.3) - oj (= 3.15.0) + msgpack (= 1.7.2) + nokogiri (= 1.15.5) + oj (= 3.16.1) opensearch-ruby (= 2.1.0) prometheus-client (= 2.1.0) rake diff --git a/fluent-package/config.rb b/fluent-package/config.rb index 3e27d3a9a..21c06bf35 100644 --- a/fluent-package/config.rb +++ b/fluent-package/config.rb @@ -1,5 +1,5 @@ PACKAGE_NAME = "fluent-package" -PACKAGE_VERSION = "5.0.1" +PACKAGE_VERSION = "5.0.2" # 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 = 'd5685ada81ac89a35a79965f1e94bbe5952a5d3a' # v1.16.2 +FLUENTD_REVISION = 'd3cf2e0f95a0ad88b9897197db6c5152310f114f' # v1.16.3 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/debian/changelog b/fluent-package/debian/changelog index bf2a882bb..f52bd7d87 100644 --- a/fluent-package/debian/changelog +++ b/fluent-package/debian/changelog @@ -1,3 +1,9 @@ +fluent-package (5.0.2-1) unstable; urgency=medium + + * New upstream release. + + -- Kentaro Hayashi Wed, 29 Nov 2023 11:47:16 +0900 + fluent-package (5.0.1-1) unstable; urgency=medium * Non-maintainer upload. diff --git a/fluent-package/yum/fluent-package.spec.in b/fluent-package/yum/fluent-package.spec.in index 512cddab2..ef5e91af4 100644 --- a/fluent-package/yum/fluent-package.spec.in +++ b/fluent-package/yum/fluent-package.spec.in @@ -351,6 +351,9 @@ fi # NOTE: %{_tmpfilesdir} is available since CentOS 7 %attr(0755,fluentd,fluentd) %dir /tmp/@PACKAGE_DIR@ %changelog +* Wed Nov 29 2023 Kentaro Hayashi - 5.0.2-1 +- New upstream release. + * Tue Aug 29 2023 Kentaro Hayashi - 5.0.1-1 - New upstream release.