From d0066b319fe87f12df0a4a2d02a31a61bc0b2ffc Mon Sep 17 00:00:00 2001 From: Takuro Ashie Date: Thu, 31 Aug 2023 13:54:08 +0900 Subject: [PATCH] td-agent v4.5.1 (#575) Signed-off-by: Kentaro Hayashi Signed-off-by: Takuro Ashie Co-authored-by: Kentaro Hayashi --- CHANGELOG.md | 65 ++++++++++++++++++ td-agent/Gemfile | 34 ++++----- td-agent/Gemfile.lock | 125 +++++++++++++++++----------------- td-agent/config.rb | 4 +- td-agent/debian/changelog | 6 ++ td-agent/msi/Dockerfile | 13 ++-- td-agent/yum/td-agent.spec.in | 3 + 7 files changed, 165 insertions(+), 85 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64ff9ca21..857528e8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,70 @@ # Treasure Agent 4 changelog +## Release v4.5.1 - 2023/08/31 + +### News + +* Update fluentd to 1.16.2 +* Update gems +* Windows: Fix failure to launch Fluentd manually by td-agent command + +### Core component + +* ruby v2.7.8 +* jemalloc v3.6.0 +* OpenSSL 1.1.1t Windows & macOS +* fluentd v1.16.2 (update) + +### Core gems + +* bundler v2.3.26 +* msgpack v1.7.1 (update) +* cool.io v1.7.1 +* serverengine v2.3.2 +* oj v3.15.0 (update) +* async-http v0.60.2 (update) +* http_parser.rb v0.8.0 +* yajl-ruby v1.4.3 +* sigdump v0.2.5 (update) +* tzinfo v2.0.6 +* tzinfo-data v1.2023.3 + +### Bundled plugins and gems + +* td-client v1.0.8 +* fluent-plugin-td v1.2.0 +* aws-sdk-core v3.178.0 (update) +* aws-sdk-s3 v1.129.0 (update) +* fluent-plugin-s3 v1.7.2 +* webhdfs v0.10.2 +* fluent-plugin-webhdfs v1.5.0 +* ruby-kafka v1.5.0 +* rdkafka v0.11.1 +* fluent-plugin-kafka v0.19.0 +* elasticsearch v8.8.0 (update) +* fluent-plugin-elasticsearch v5.3.0 +* prometheus-client v2.1.0 +* fluent-plugin-prometheus v2.1.0 (update) +* fluent-plugin-prometheus_pushgateway v0.1.1 (update) +* systemd-journal v1.4.2 +* fluent-plugin-systemd v1.0.5 +* fluent-plugin-record-modifier v2.1.1 +* fluent-plugin-rewrite-tag-filter v2.4.0 +* fluent-plugin-sd-dns 0.1.0 +* fluent-plugin-flowcounter-simple 0.1.0 +* fluent-diagtool v1.0.1 +* fluent-plugin-utmpx v0.5.0 +* fluent-plugin-opensearch v1.1.3 (update) +* fluent-plugin-metrics-cmetrics v0.1.2 +* fluent-plugin-calyptia-monitoring v0.1.3 + +On Windows + +* winevt_c v0.10.1 +* fluent-plugin-parser-winevt_xml v0.2.6 (update) +* fluent-plugin-windows-eventlog v0.8.3 +* fluent-plugin-windows-exporter v1.0.0 + ## Release v4.5.0 - 2023/05/08 ### News diff --git a/td-agent/Gemfile b/td-agent/Gemfile index 1f3dfd884..f4b8ee0d7 100644 --- a/td-agent/Gemfile +++ b/td-agent/Gemfile @@ -10,16 +10,16 @@ no_fat_gem = [:ruby] gem "rake" gem "bundler", BUNDLER_VERSION gem "cool.io", "1.7.1", platforms: no_fat_gem -gem "sigdump", "0.2.4" +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.0" -gem "oj", "3.14.3" +gem "msgpack", "1.7.1" +gem "oj", "3.15.0" gem "tzinfo", "2.0.6" gem "tzinfo-data", "1.2023.3" gem "async", "1.31.0" -gem "async-http", "0.60.1" +gem "async-http", "0.60.2" gem "webrick", "1.8.1" if ENV["INSTALL_GEM_FROM_LOCAL_REPO"] @@ -37,21 +37,21 @@ end # plugin gems -gem "elasticsearch", "8.7.0" +gem "elasticsearch", "8.8.0" gem "fluent-plugin-elasticsearch", "5.3.0" gem "ruby-kafka", "1.5.0" gem "digest-murmurhash", "1.1.1" gem "fluent-plugin-kafka", "0.19.0" gem "prometheus-client", "2.1.0" -gem "fluent-plugin-prometheus", "2.0.3" -gem "fluent-plugin-prometheus_pushgateway", "0.1.0" +gem "fluent-plugin-prometheus", "2.1.0" +gem "fluent-plugin-prometheus_pushgateway", "0.1.1" gem "jmespath", "1.6.2" -gem "aws-partitions", "1.752.0" -gem "aws-sdk-core", "3.171.0" -gem "aws-sdk-kms", "1.63.0" -gem "aws-sdk-sqs", "1.53.0" -gem "aws-sigv4", "1.5.2" -gem "aws-sdk-s3", "1.121.0" +gem "aws-partitions", "1.785.0" +gem "aws-sdk-core", "3.178.0" +gem "aws-sdk-kms", "1.71.0" +gem "aws-sdk-sqs", "1.61.0" +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" @@ -64,23 +64,23 @@ gem "fluent-plugin-record-modifier", "2.1.1" 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.1" +gem "mini_portile2", "2.8.2" 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.0" +gem "fluent-plugin-opensearch", "1.1.3" 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.14.3", platforms: windows_platforms +gem "nokogiri", "1.15.3", 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 gem "winevt_c", "0.10.1", platforms: windows_platforms gem "win32-eventlog", "0.6.7", platforms: windows_platforms -gem "fluent-plugin-parser-winevt_xml", "0.2.5", platforms: windows_platforms +gem "fluent-plugin-parser-winevt_xml", "0.2.6", platforms: windows_platforms gem "fluent-plugin-windows-eventlog", "0.8.3", platforms: windows_platforms gem "fluent-plugin-windows-exporter", "1.0.0", platforms: windows_platforms diff --git a/td-agent/Gemfile.lock b/td-agent/Gemfile.lock index ae323bffc..5ddc25f3b 100644 --- a/td-agent/Gemfile.lock +++ b/td-agent/Gemfile.lock @@ -1,16 +1,16 @@ GIT remote: https://github.com/fluent/fluentd - revision: 0a6d706a9cee5882d751b2cc6169696709df0134 - ref: 0a6d706a9cee5882d751b2cc6169696709df0134 + revision: d5685ada81ac89a35a79965f1e94bbe5952a5d3a + ref: d5685ada81ac89a35a79965f1e94bbe5952a5d3a specs: - fluentd (1.16.1) + fluentd (1.16.2) bundler certstore_c (~> 0.1.7) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) serverengine (>= 2.3.2, < 3.0.0) - sigdump (~> 0.2.2) + sigdump (~> 0.2.5) strptime (>= 0.2.4, < 1.0.0) tzinfo (>= 1.0, < 3.0) tzinfo-data (~> 1.0) @@ -23,64 +23,65 @@ GIT GEM remote: https://rubygems.org/ specs: - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) async (1.31.0) console (~> 1.10) nio4r (~> 2.3) timers (~> 4.1) - async-http (0.60.1) + async-http (0.60.2) async (>= 1.25) async-io (>= 1.28) async-pool (>= 0.2) protocol-http (~> 0.24.0) protocol-http1 (~> 0.15.0) protocol-http2 (~> 0.15.0) - traces (>= 0.8.0) - async-io (1.34.3) + traces (>= 0.10.0) + async-io (1.35.0) async async-pool (0.4.0) async (>= 1.25) aws-eventstream (1.2.0) - aws-partitions (1.752.0) - aws-sdk-core (3.171.0) + aws-partitions (1.785.0) + aws-sdk-core (3.178.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.63.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.71.0) + aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.121.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-s3 (1.129.0) + aws-sdk-core (~> 3, >= 3.177.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sdk-sqs (1.53.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.6) + aws-sdk-sqs (1.61.0) + aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.5.2) + aws-sigv4 (1.6.0) aws-eventstream (~> 1, >= 1.0.2) bindata (2.4.15) certstore_c (0.1.7) cmetrics (0.3.3) mini_portile2 (~> 2.7) concurrent-ruby (1.2.2) - console (1.16.2) + console (1.23.2) + fiber-annotation fiber-local cool.io (1.7.1) - digest-crc (0.6.4) + digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) digest-murmurhash (1.1.1) - elastic-transport (8.2.1) + elastic-transport (8.2.2) faraday (< 3) multi_json - elasticsearch (8.7.0) + elasticsearch (8.8.0) elastic-transport (~> 8) - elasticsearch-api (= 8.7.0) - elasticsearch-api (8.7.0) + elasticsearch-api (= 8.8.0) + elasticsearch-api (8.8.0) multi_json - excon (0.99.0) - faraday (2.7.4) + excon (0.102.0) + faraday (2.7.10) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-excon (2.1.0) @@ -93,6 +94,7 @@ GEM ffi (1.15.5) ffi-win32-extensions (1.0.4) ffi + fiber-annotation (0.2.0) fiber-local (1.0.0) fileutils (1.7.1) fluent-config-regexp-type (1.0.0) @@ -120,7 +122,7 @@ GEM fluent-plugin-metrics-cmetrics (0.1.2) cmetrics (>= 0.2.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-opensearch (1.1.0) + fluent-plugin-opensearch (1.1.3) aws-sdk-core (~> 3) excon faraday (>= 2.0.0) @@ -128,14 +130,15 @@ GEM faraday_middleware-aws-sigv4 (~> 1.0.1) fluentd (>= 0.14.22) opensearch-ruby - fluent-plugin-parser-winevt_xml (0.2.5) + fluent-plugin-parser-winevt_xml (0.2.6) fluentd (>= 0.14.12, < 2) - nokogiri (>= 1.12.5, < 1.15) - fluent-plugin-prometheus (2.0.3) + nokogiri (>= 1.12.5, < 1.16) + fluent-plugin-prometheus (2.1.0) fluentd (>= 1.9.1, < 2) prometheus-client (>= 2.1.0) - fluent-plugin-prometheus_pushgateway (0.1.0) - fluent-plugin-prometheus (>= 2.0.0, < 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-record-modifier (2.1.1) fluentd (>= 1.0, < 2) fluent-plugin-rewrite-tag-filter (2.4.0) @@ -174,14 +177,14 @@ GEM linux-utmpx (0.3.0) bindata (~> 2.4.8) ltsv (0.1.2) - mini_portile2 (2.8.1) - msgpack (1.7.0) + mini_portile2 (2.8.2) + msgpack (1.7.1) multi_json (1.15.0) nio4r (2.5.9) - nokogiri (1.14.3) - mini_portile2 (~> 2.8.0) + nokogiri (1.15.3) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - oj (3.14.3) + oj (3.15.0) opensearch-api (2.2.0) multi_json opensearch-ruby (2.1.0) @@ -193,20 +196,20 @@ GEM parallel (1.20.1) prometheus-client (2.1.0) protocol-hpack (1.4.2) - protocol-http (0.24.1) - protocol-http1 (0.15.0) + protocol-http (0.24.7) + protocol-http1 (0.15.1) protocol-http (~> 0.22) protocol-http2 (0.15.1) protocol-hpack (~> 1.4) protocol-http (~> 0.18) - public_suffix (5.0.1) - racc (1.6.2) + public_suffix (5.0.3) + racc (1.7.1) rake (13.0.6) rdkafka (0.11.1) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - rexml (3.2.5) + rexml (3.2.6) ruby-kafka (1.5.0) digest-crc ruby-progressbar (1.13.0) @@ -214,7 +217,7 @@ GEM rubyzip (1.3.0) serverengine (2.3.2) sigdump (~> 0.2.2) - sigdump (0.2.4) + sigdump (0.2.5) strptime (0.2.5) systemd-journal (1.4.2) ffi (~> 1.9) @@ -237,7 +240,7 @@ GEM msgpack (>= 0.5.6, < 2.0) td-client (>= 0.8.66, < 2.0) timers (4.3.5) - traces (0.9.1) + traces (0.11.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2023.3) @@ -267,18 +270,18 @@ PLATFORMS DEPENDENCIES async (= 1.31.0) - async-http (= 0.60.1) - aws-partitions (= 1.752.0) - aws-sdk-core (= 3.171.0) - aws-sdk-kms (= 1.63.0) - aws-sdk-s3 (= 1.121.0) - aws-sdk-sqs (= 1.53.0) - aws-sigv4 (= 1.5.2) + async-http (= 0.60.2) + aws-partitions (= 1.785.0) + aws-sdk-core (= 3.178.0) + aws-sdk-kms (= 1.71.0) + aws-sdk-s3 (= 1.129.0) + aws-sdk-sqs (= 1.61.0) + aws-sigv4 (= 1.6.0) bundler (= 2.3.26) cmetrics (= 0.3.3) cool.io (= 1.7.1) digest-murmurhash (= 1.1.1) - elasticsearch (= 8.7.0) + elasticsearch (= 8.8.0) ffi (= 1.15.5) ffi-win32-extensions (= 1.0.4) fluent-diagtool (= 1.0.1) @@ -287,10 +290,10 @@ DEPENDENCIES fluent-plugin-flowcounter-simple (= 0.1.0) fluent-plugin-kafka (= 0.19.0) fluent-plugin-metrics-cmetrics (= 0.1.2) - fluent-plugin-opensearch (= 1.1.0) - fluent-plugin-parser-winevt_xml (= 0.2.5) - fluent-plugin-prometheus (= 2.0.3) - fluent-plugin-prometheus_pushgateway (= 0.1.0) + fluent-plugin-opensearch (= 1.1.3) + fluent-plugin-parser-winevt_xml (= 0.2.6) + fluent-plugin-prometheus (= 2.1.0) + fluent-plugin-prometheus_pushgateway (= 0.1.1) fluent-plugin-record-modifier (= 2.1.1) fluent-plugin-rewrite-tag-filter (= 2.4.0) fluent-plugin-s3 (= 1.7.2) @@ -305,17 +308,17 @@ DEPENDENCIES http_parser.rb (= 0.8.0) httpclient (= 2.8.3) jmespath (= 1.6.2) - mini_portile2 (= 2.8.1) - msgpack (= 1.7.0) - nokogiri (= 1.14.3) - oj (= 3.14.3) + mini_portile2 (= 2.8.2) + msgpack (= 1.7.1) + nokogiri (= 1.15.3) + oj (= 3.15.0) opensearch-ruby (= 2.1.0) prometheus-client (= 2.1.0) rake rdkafka (= 0.11.1) ruby-kafka (= 1.5.0) serverengine (= 2.3.2) - sigdump (= 0.2.4) + sigdump (= 0.2.5) systemd-journal (= 1.4.2) td (= 0.17.1) td-client (= 1.0.8) diff --git a/td-agent/config.rb b/td-agent/config.rb index 935fe6a17..1841f8507 100644 --- a/td-agent/config.rb +++ b/td-agent/config.rb @@ -1,7 +1,7 @@ PACKAGE_NAME = "td-agent" -PACKAGE_VERSION = "4.5.0" +PACKAGE_VERSION = "4.5.1" -FLUENTD_REVISION = '0a6d706a9cee5882d751b2cc6169696709df0134' # v1.16.1 +FLUENTD_REVISION = 'd5685ada81ac89a35a79965f1e94bbe5952a5d3a' # v1.16.2 FLUENTD_LOCAL_GEM_REPO = "file://" + File.expand_path(File.join(__dir__, "local_gem_repo")) # https://github.com/jemalloc/jemalloc/releases diff --git a/td-agent/debian/changelog b/td-agent/debian/changelog index 1a1d0563e..c64c72e70 100644 --- a/td-agent/debian/changelog +++ b/td-agent/debian/changelog @@ -1,3 +1,9 @@ +td-agent (4.5.1-1) unstable; urgency=low + + * New upstream release. + + -- Takuro Ashie Mon, 28 Aug 2023 08:33:29 -0000 + td-agent (4.5.0-1) unstable; urgency=low * New upstream release. diff --git a/td-agent/msi/Dockerfile b/td-agent/msi/Dockerfile index 4a9485f3b..7d21b54a8 100644 --- a/td-agent/msi/Dockerfile +++ b/td-agent/msi/Dockerfile @@ -14,11 +14,14 @@ # limitations under the License. # -# The "servercore" image cannot install DotNet3.5 (which is required by -# wixtoolset) by chocolatey. -ARG FROM=mcr.microsoft.com/dotnet/framework/runtime:3.5-windowsservercore-ltsc2019 +# The latest chocolatey requires .net 4.8, and wixtoolset requires .net 3.5, +# To satisfy both of them without reboot, use sdk image. +ARG FROM=mcr.microsoft.com/dotnet/framework/sdk:3.5-windowsservercore-ltsc2019 FROM ${FROM} +# Launch the following command as if cmd /S /C ... +SHELL ["cmd", "/S", "/C"] + # Install Chocolatey to set up toolchain RUN @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "[System.Net.ServicePointManager]::SecurityProtocol = 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" @@ -26,8 +29,8 @@ RUN @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -I RUN \ choco install -y git wixtoolset 7zip & \ choco install -y cmake --installargs 'ADD_CMAKE_TO_PATH=System' && \ - choco install -y msys2 --params /NoUpdate --version=20230318.0.0 && \ - choco install ruby -y --version=3.0.4.1 && \ + choco install -y msys2 --params /NoUpdate --version=20230526.0.0 && \ + choco install ruby -y --version=3.1.3.1 && \ refreshenv && \ ridk install 3 && \ gem install --no-document --force bundler builder diff --git a/td-agent/yum/td-agent.spec.in b/td-agent/yum/td-agent.spec.in index 3f8e5118a..056d1595a 100644 --- a/td-agent/yum/td-agent.spec.in +++ b/td-agent/yum/td-agent.spec.in @@ -261,6 +261,9 @@ fi # NOTE: %{_tmpfilesdir} is available since CentOS 7 %attr(0755,td-agent,td-agent) %dir /tmp/@PACKAGE@ %changelog +* Mon Aug 28 2023 Takuro Ashie - 4.5.1-1 +- New upstream release. + * Mon May 01 2023 Takuro Ashie - 4.5.0-1 - New upstream release.