From 2659a588dda3b03108a4181396f366f6199784c5 Mon Sep 17 00:00:00 2001 From: Takuro Ashie Date: Fri, 22 Jul 2022 14:22:34 +0900 Subject: [PATCH 1/5] td-agent 4.4.0 Signed-off-by: Takuro Ashie --- .github/workflows/apt.yml | 4 - CHANGELOG.md | 59 ++++++++++++++ td-agent/Gemfile | 50 ++++++------ td-agent/Gemfile.lock | 140 +++++++++++++++++----------------- td-agent/Rakefile | 2 +- td-agent/config.rb | 12 +-- td-agent/debian/changelog | 6 ++ td-agent/yum/td-agent.spec.in | 3 + 8 files changed, 170 insertions(+), 106 deletions(-) diff --git a/.github/workflows/apt.yml b/.github/workflows/apt.yml index b32914a30..3cf3ec4bc 100644 --- a/.github/workflows/apt.yml +++ b/.github/workflows/apt.yml @@ -12,7 +12,6 @@ jobs: label: - Debian GNU/Linux buster amd64 - Debian GNU/Linux bullseye amd64 - - Ubuntu Xenial amd64 - Ubuntu Bionic amd64 - Ubuntu Focal amd64 - Ubuntu Jammy amd64 @@ -23,9 +22,6 @@ jobs: - label: Debian GNU/Linux bullseye amd64 rake-job: debian-bullseye test-docker-image: debian:bullseye - - label: Ubuntu Xenial amd64 - rake-job: ubuntu-xenial - test-docker-image: ubuntu:xenial - label: Ubuntu Bionic amd64 rake-job: ubuntu-bionic test-docker-image: ubuntu:bionic diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e5765839..b12a95d85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,64 @@ # Treasure Agent 4 changelog +## Release v4.4.0 - 2022/07/29 + +### News + +* Update fluentd to 1.15.1 +* Drop Ubuntu 16.04 "Xenial Xerus" support + +### Core component + +* ruby v2.7.6 +* jemalloc v3.6.0 +* fluentd v1.15.1 (update) + +### Core gems + +* bundler v2.3.18 (update) +* msgpack v1.5.3 (update) +* cool.io v1.7.1 +* serverengine v2.3.0 (update) +* oj v3.13.17 (update) +* async-http v0.56.6 (update) +* http_parser.rb v0.8.0 +* yajl-ruby v1.4.3 +* sigdump v0.2.4 +* tzinfo v2.0.5 (update) +* tzinfo-data v1.2022.1 + +### Bundled plugins and gems + +* td-client v1.0.8 +* fluent-plugin-td v1.2.0 (update) +* aws-sdk-core v3.131.3 (update) +* aws-sdk-s3 v1.114.0 (update) +* fluent-plugin-s3 v1.7.1 (update) +* webhdfs v0.10.2 +* fluent-plugin-webhdfs v1.5.0 +* ruby-kafka v1.5.0 (update) +* rdkafka v0.11.1 +* fluent-plugin-kafka v0.18.0 (update) +* elasticsearch v8.3.0 (update) +* fluent-plugin-elasticsearch v5.2.3 (update) +* prometheus-client v2.1.0 +* fluent-plugin-prometheus v2.0.3 (update) +* fluent-plugin-prometheus_pushgateway v0.1.0 +* systemd-journal v1.4.2 +* fluent-plugin-systemd v1.0.5 +* fluent-plugin-record-modifier v2.1.0 +* 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 + +On Windows + +* winevt_c v0.10.0 (update) +* fluent-plugin-parser-winevt_xml v0.2.4 +* fluent-plugin-windows-eventlog v0.8.1 + ## Release v4.3.2 - 2022/06/28 ### News diff --git a/td-agent/Gemfile b/td-agent/Gemfile index c9ab706b5..81a1dfcd1 100644 --- a/td-agent/Gemfile +++ b/td-agent/Gemfile @@ -13,13 +13,13 @@ gem "cool.io", "1.7.1", platforms: no_fat_gem gem "sigdump", "0.2.4" gem "http_parser.rb", "0.8.0" gem "yajl-ruby", "1.4.3" -gem "serverengine", '2.2.5' -gem "msgpack", "1.5.1" -gem "oj", "3.13.11" -gem "tzinfo", "2.0.4" +gem "serverengine", '2.3.0' +gem "msgpack", "1.5.3" +gem "oj", "3.13.17" +gem "tzinfo", "2.0.5" gem "tzinfo-data", "1.2022.1" -gem "async", "1.30.2" -gem "async-http", "0.56.5" +gem "async", "1.30.3" +gem "async-http", "0.56.6" gem "webrick", "1.7.0" if ENV["INSTALL_GEM_FROM_LOCAL_REPO"] @@ -37,27 +37,27 @@ end # plugin gems -gem "elasticsearch", "8.1.2" -gem "fluent-plugin-elasticsearch", "5.2.2" -gem "ruby-kafka", "1.4.0" +gem "elasticsearch", "8.3.0" +gem "fluent-plugin-elasticsearch", "5.2.3" +gem "ruby-kafka", "1.5.0" gem "digest-murmurhash", "1.1.1" -gem "fluent-plugin-kafka", "0.17.5" +gem "fluent-plugin-kafka", "0.18.0" gem "prometheus-client", "2.1.0" -gem "fluent-plugin-prometheus", "2.0.2" +gem "fluent-plugin-prometheus", "2.0.3" gem "fluent-plugin-prometheus_pushgateway", "0.1.0" gem "jmespath", "1.6.1" -gem "aws-partitions", "1.577.0" -gem "aws-sdk-core", "3.130.1" -gem "aws-sdk-kms", "1.55.0" -gem "aws-sdk-sqs", "1.51.0" -gem "aws-sigv4", "1.4.0" -gem "aws-sdk-s3", "1.113.0" -gem "fluent-plugin-s3", "1.6.1" +gem "aws-partitions", "1.609.0" +gem "aws-sdk-core", "3.131.3" +gem "aws-sdk-kms", "1.58.0" +gem "aws-sdk-sqs", "1.51.1" +gem "aws-sigv4", "1.5.1" +gem "aws-sdk-s3", "1.114.0" +gem "fluent-plugin-s3", "1.7.1" gem "httpclient", "2.8.3" gem "fluent-diagtool", "1.0.1" gem "td", "0.16.9" gem "td-client", "1.0.8" -gem "fluent-plugin-td", "1.1.0" +gem "fluent-plugin-td", "1.2.0" gem "webhdfs", "0.10.2" gem "fluent-plugin-webhdfs", "1.5.0" gem "fluent-plugin-record-modifier", "2.1.0" @@ -65,23 +65,23 @@ 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.0" -gem "cmetrics", "0.2.5" +gem "cmetrics", "0.3.3" gem "fluent-plugin-metrics-cmetrics", "0.1.2" gem "fluent-plugin-calyptia-monitoring", "0.1.3" -gem "opensearch-ruby", "1.0.0" -gem "fluent-plugin-opensearch", "1.0.4" +gem "opensearch-ruby", "2.0.2" +gem "fluent-plugin-opensearch", "1.0.7" 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.13.6", platforms: windows_platforms +gem "nokogiri", "1.13.7", platforms: windows_platforms gem "win32-api", "1.10.1", 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 "windows-api", "0.4.4", platforms: windows_platforms +gem "windows-api", "0.4.5", platforms: windows_platforms gem "windows-pr", "1.2.6", platforms: windows_platforms -gem "winevt_c", "0.9.3", platforms: windows_platforms +gem "winevt_c", "0.10.0", platforms: windows_platforms gem "win32-eventlog", "0.6.7", platforms: windows_platforms gem "fluent-plugin-parser-winevt_xml", "0.2.4", platforms: windows_platforms gem "fluent-plugin-windows-eventlog", "0.8.1", platforms: windows_platforms diff --git a/td-agent/Gemfile.lock b/td-agent/Gemfile.lock index 4979b5fdb..b1c5445e5 100644 --- a/td-agent/Gemfile.lock +++ b/td-agent/Gemfile.lock @@ -1,15 +1,15 @@ GIT remote: https://github.com/fluent/fluentd - revision: c0f48a0080550eff6aa6fa19d269e480684e7a45 - ref: c0f48a0080550eff6aa6fa19d269e480684e7a45 + revision: 79ead40de9dec33afc2a9bf6cc25f5ec2d65a482 + ref: 79ead40de9dec33afc2a9bf6cc25f5ec2d65a482 specs: - fluentd (1.14.6) + fluentd (1.15.0) 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.2.5, < 3.0.0) + serverengine (>= 2.3.0, < 3.0.0) sigdump (~> 0.2.2) strptime (>= 0.2.4, < 1.0.0) tzinfo (>= 1.0, < 3.0) @@ -19,6 +19,7 @@ GIT win32-event (~> 0.6.3) win32-ipc (~> 0.7.0) win32-service (~> 2.3.0) + windows-api (~> 0.4.5) windows-pr (~> 1.2.6) yajl-ruby (~> 1.0) @@ -27,43 +28,44 @@ GEM specs: addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - async (1.30.2) + async (1.30.3) console (~> 1.10) nio4r (~> 2.3) timers (~> 4.1) - async-http (0.56.5) + async-http (0.56.6) async (>= 1.25) async-io (>= 1.28) async-pool (>= 0.2) protocol-http (~> 0.22.0) protocol-http1 (~> 0.14.0) protocol-http2 (~> 0.14.0) + traces (~> 0.4.0) async-io (1.33.0) async async-pool (0.3.10) async (>= 1.25) aws-eventstream (1.2.0) - aws-partitions (1.577.0) - aws-sdk-core (3.130.1) + aws-partitions (1.609.0) + aws-sdk-core (3.131.3) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.55.0) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.58.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.113.0) + aws-sdk-s3 (1.114.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sdk-sqs (1.51.0) + aws-sdk-sqs (1.51.1) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.4.0) + aws-sigv4 (1.5.1) aws-eventstream (~> 1, >= 1.0.2) bindata (2.4.10) certstore_c (0.1.7) - cmetrics (0.2.5) + cmetrics (0.3.3) mini_portile2 (~> 2.7) concurrent-ruby (1.1.10) console (1.15.3) @@ -73,15 +75,15 @@ GEM digest-crc (0.6.4) rake (>= 12.0.0, < 14.0.0) digest-murmurhash (1.1.1) - elastic-transport (8.0.0) + elastic-transport (8.0.1) faraday (~> 1) multi_json - elasticsearch (8.1.2) - elastic-transport (= 8.0.0) - elasticsearch-api (= 8.1.2) - elasticsearch-api (8.1.2) + elasticsearch (8.3.0) + elastic-transport (~> 8) + elasticsearch-api (= 8.3.0) + elasticsearch-api (8.3.0) multi_json - excon (0.92.3) + excon (0.92.4) faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -124,20 +126,20 @@ GEM fluent-plugin-calyptia-monitoring (0.1.3) fluent-plugin-metrics-cmetrics (>= 0.1.1) fluentd (>= 1.14.0, < 2) - fluent-plugin-elasticsearch (5.2.2) + fluent-plugin-elasticsearch (5.2.3) elasticsearch excon fluentd (>= 0.14.22) fluent-plugin-flowcounter-simple (0.1.0) fluentd (>= 1.0) - fluent-plugin-kafka (0.17.5) + fluent-plugin-kafka (0.18.0) fluentd (>= 0.10.58, < 2) ltsv ruby-kafka (>= 1.4.0, < 2) fluent-plugin-metrics-cmetrics (0.1.2) cmetrics (>= 0.2.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-opensearch (1.0.4) + fluent-plugin-opensearch (1.0.7) aws-sdk-core (~> 3) excon faraday_middleware-aws-sigv4 @@ -146,7 +148,7 @@ GEM fluent-plugin-parser-winevt_xml (0.2.4) fluentd (>= 0.14.12, < 2) nokogiri (>= 1.12.5, < 1.14) - fluent-plugin-prometheus (2.0.2) + fluent-plugin-prometheus (2.0.3) fluentd (>= 1.9.1, < 2) prometheus-client (>= 2.1.0) fluent-plugin-prometheus_pushgateway (0.1.0) @@ -156,7 +158,7 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-s3 (1.6.1) + fluent-plugin-s3 (1.7.1) aws-sdk-s3 (~> 1.60) aws-sdk-sqs (~> 1.23) fluentd (>= 0.14.22, < 2) @@ -165,9 +167,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluent-plugin-td (1.1.0) + fluent-plugin-td (1.2.0) fluentd (>= 0.14.13, < 2) - td-client (~> 1.0) + td-client (>= 1.0.8) fluent-plugin-utmpx (0.5.0) fluentd (>= 0.14.10, < 2) linux-utmpx (~> 0.3.0) @@ -190,19 +192,19 @@ GEM bindata (~> 2.4.8) ltsv (0.1.2) mini_portile2 (2.8.0) - msgpack (1.5.1) + msgpack (1.5.3) multi_json (1.15.0) multipart-post (2.2.3) nio4r (2.5.8) - nokogiri (1.13.6-x64-mingw32) + nokogiri (1.13.7-x64-mingw32) racc (~> 1.4) - oj (3.13.11) - opensearch-api (1.0.0) + oj (3.13.17) + opensearch-api (2.0.2) multi_json - opensearch-ruby (1.0.0) - opensearch-api (= 1.0.0) - opensearch-transport (= 1.0.0) - opensearch-transport (1.0.0) + opensearch-ruby (2.0.2) + opensearch-api (= 2.0.2) + opensearch-transport (= 2.0.0) + opensearch-transport (2.0.0) faraday (~> 1) multi_json parallel (1.22.1) @@ -221,16 +223,13 @@ GEM ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - ruby-kafka (1.4.0) + ruby-kafka (1.5.0) digest-crc ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) rubyzip (1.3.0) - serverengine (2.2.5) + serverengine (2.3.0) sigdump (~> 0.2.2) - serverengine (2.2.5-x64-mingw32) - sigdump (~> 0.2.2) - windows-pr (~> 1.2.5) sigdump (0.2.4) strptime (0.2.5) systemd-journal (1.4.2) @@ -253,7 +252,8 @@ GEM msgpack (>= 0.5.6, < 2.0) td-client (>= 0.8.66, < 2.0) timers (4.3.3) - tzinfo (2.0.4) + traces (0.4.1) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) tzinfo-data (1.2022.1) tzinfo (>= 1.0.0) @@ -271,12 +271,12 @@ GEM win32-service (2.3.2) ffi ffi-win32-extensions - windows-api (0.4.4) + windows-api (0.4.5) win32-api (>= 1.4.5) windows-pr (1.2.6) win32-api (>= 1.4.5) windows-api (>= 0.4.0) - winevt_c (0.9.3) + winevt_c (0.10.0) yajl-ruby (1.4.3) zip-zip (0.3) rubyzip (>= 1.0.0) @@ -288,37 +288,37 @@ PLATFORMS x86_64-linux DEPENDENCIES - async (= 1.30.2) - async-http (= 0.56.5) - aws-partitions (= 1.577.0) - aws-sdk-core (= 3.130.1) - aws-sdk-kms (= 1.55.0) - aws-sdk-s3 (= 1.113.0) - aws-sdk-sqs (= 1.51.0) - aws-sigv4 (= 1.4.0) - bundler (= 2.3.11) - cmetrics (= 0.2.5) + async (= 1.30.3) + async-http (= 0.56.6) + aws-partitions (= 1.609.0) + aws-sdk-core (= 3.131.3) + aws-sdk-kms (= 1.58.0) + aws-sdk-s3 (= 1.114.0) + aws-sdk-sqs (= 1.51.1) + aws-sigv4 (= 1.5.1) + bundler (= 2.3.18) + cmetrics (= 0.3.3) cool.io (= 1.7.1) digest-murmurhash (= 1.1.1) - elasticsearch (= 8.1.2) + elasticsearch (= 8.3.0) ffi (= 1.15.5) ffi-win32-extensions (= 1.0.4) fluent-diagtool (= 1.0.1) fluent-plugin-calyptia-monitoring (= 0.1.3) - fluent-plugin-elasticsearch (= 5.2.2) + fluent-plugin-elasticsearch (= 5.2.3) fluent-plugin-flowcounter-simple (= 0.1.0) - fluent-plugin-kafka (= 0.17.5) + fluent-plugin-kafka (= 0.18.0) fluent-plugin-metrics-cmetrics (= 0.1.2) - fluent-plugin-opensearch (= 1.0.4) + fluent-plugin-opensearch (= 1.0.7) fluent-plugin-parser-winevt_xml (= 0.2.4) - fluent-plugin-prometheus (= 2.0.2) + fluent-plugin-prometheus (= 2.0.3) fluent-plugin-prometheus_pushgateway (= 0.1.0) fluent-plugin-record-modifier (= 2.1.0) fluent-plugin-rewrite-tag-filter (= 2.4.0) - fluent-plugin-s3 (= 1.6.1) + fluent-plugin-s3 (= 1.7.1) fluent-plugin-sd-dns (= 0.1.0) fluent-plugin-systemd (= 1.0.5) - fluent-plugin-td (= 1.1.0) + fluent-plugin-td (= 1.2.0) fluent-plugin-utmpx (= 0.5.0) fluent-plugin-webhdfs (= 1.5.0) fluent-plugin-windows-eventlog (= 0.8.1) @@ -328,20 +328,20 @@ DEPENDENCIES httpclient (= 2.8.3) jmespath (= 1.6.1) mini_portile2 (= 2.8.0) - msgpack (= 1.5.1) - nokogiri (= 1.13.6) - oj (= 3.13.11) - opensearch-ruby (= 1.0.0) + msgpack (= 1.5.3) + nokogiri (= 1.13.7) + oj (= 3.13.17) + opensearch-ruby (= 2.0.2) prometheus-client (= 2.1.0) rake rdkafka (= 0.11.1) - ruby-kafka (= 1.4.0) - serverengine (= 2.2.5) + ruby-kafka (= 1.5.0) + serverengine (= 2.3.0) sigdump (= 0.2.4) systemd-journal (= 1.4.2) td (= 0.16.9) td-client (= 1.0.8) - tzinfo (= 2.0.4) + tzinfo (= 2.0.5) tzinfo-data (= 1.2022.1) webhdfs (= 0.10.2) webrick (= 1.7.0) @@ -350,10 +350,10 @@ DEPENDENCIES win32-eventlog (= 0.6.7) win32-ipc (= 0.7.0) win32-service (= 2.3.2) - windows-api (= 0.4.4) + windows-api (= 0.4.5) windows-pr (= 1.2.6) - winevt_c (= 0.9.3) + winevt_c (= 0.10.0) yajl-ruby (= 1.4.3) BUNDLED WITH - 2.3.11 + 2.3.18 diff --git a/td-agent/Rakefile b/td-agent/Rakefile index db1ebd872..72090b560 100755 --- a/td-agent/Rakefile +++ b/td-agent/Rakefile @@ -771,6 +771,7 @@ class BuildTask configure_opts = [ "--prefix=#{install_prefix}", "--openssldir=#{File.join("etc", "openssl")}", + "no-tests", "no-unit-test", "no-comp", "no-idea", @@ -1325,7 +1326,6 @@ EOS [ "debian-buster", "debian-bullseye", - "ubuntu-xenial", "ubuntu-bionic", "ubuntu-focal", "ubuntu-jammy", diff --git a/td-agent/config.rb b/td-agent/config.rb index bc283e041..29ef4ab05 100644 --- a/td-agent/config.rb +++ b/td-agent/config.rb @@ -1,7 +1,7 @@ PACKAGE_NAME = "td-agent" -PACKAGE_VERSION = "4.3.2" +PACKAGE_VERSION = "4.4.0" -FLUENTD_REVISION = 'c0f48a0080550eff6aa6fa19d269e480684e7a45' # v1.14.6 +FLUENTD_REVISION = '79ead40de9dec33afc2a9bf6cc25f5ec2d65a482' # v1.15.0 FLUENTD_LOCAL_GEM_REPO = "file://" + File.expand_path(File.join(__dir__, "local_gem_repo")) # https://github.com/jemalloc/jemalloc/releases @@ -11,13 +11,13 @@ #JEMALLOC_VERSION = "5.2.1" # https://www.openssl.org/source/ -OPENSSL_VERSION = "1.1.1p" +OPENSSL_VERSION = "1.1.1q" # To fix memory leak issue: https://github.com/fluent/fluent-package-builder/issues/374 -MINGW_OPENSSL_VERSION = "1.1.1.p-1" -MINGW_OPENSSL_SHA256SUM = "1b665a0acc0d84d20e2d5acb454956b10d17078596e360e604cb78bd54f7c915" +MINGW_OPENSSL_VERSION = "1.1.1.q-1" +MINGW_OPENSSL_SHA256SUM = "4fb25397e48f6ab22e8b07d40519fddf3eec3dc6a163b2a1ecc68326d31fcb65" -BUNDLER_VERSION= "2.3.11" +BUNDLER_VERSION= "2.3.18" # https://www.ruby-lang.org/en/downloads/ (tar.gz) BUNDLED_RUBY_VERSION = "2.7.6" diff --git a/td-agent/debian/changelog b/td-agent/debian/changelog index 63bda8715..791893b3d 100644 --- a/td-agent/debian/changelog +++ b/td-agent/debian/changelog @@ -1,3 +1,9 @@ +td-agent (4.4.0-1) unstable; urgency=low + + * New upstream release. + + -- Takuro Ashie Fri, 22 Jul 2022 05:22:13 -0000 + td-agent (4.3.2-1) unstable; urgency=low * New upstream release. diff --git a/td-agent/yum/td-agent.spec.in b/td-agent/yum/td-agent.spec.in index a86005a9b..bdb4d9d93 100644 --- a/td-agent/yum/td-agent.spec.in +++ b/td-agent/yum/td-agent.spec.in @@ -254,6 +254,9 @@ fi # NOTE: %{_tmpfilesdir} is available since CentOS 7 %attr(0755,td-agent,td-agent) %dir /tmp/@PACKAGE@ %changelog +* Fri Jul 22 2022 Takuro Ashie - 4.4.0-1 +- New upstream release. + * Fri Jun 24 2022 Takuro Ashie - 4.3.2-1 - New upstream release. From 367422f5161556f16612fbe2099be655c88b3e71 Mon Sep 17 00:00:00 2001 From: Takuro Ashie Date: Fri, 22 Jul 2022 15:04:48 +0900 Subject: [PATCH 2/5] Update msys2 and Ruby to build msi package Signed-off-by: Takuro Ashie --- td-agent/msi/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/td-agent/msi/Dockerfile b/td-agent/msi/Dockerfile index 5f4b42b43..a31fdd076 100644 --- a/td-agent/msi/Dockerfile +++ b/td-agent/msi/Dockerfile @@ -26,8 +26,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=20220118.0.0 && \ - choco install ruby -y --version=3.0.3.1 && \ + choco install -y msys2 --params /NoUpdate --version=20220603.0.0 && \ + choco install ruby -y --version=3.0.4.1 && \ refreshenv && \ ridk install 3 && \ gem install --no-document --force bundler From 6ade93ce0a7ba4c336ce3ac21f4b84a6c8541520 Mon Sep 17 00:00:00 2001 From: Takuro Ashie Date: Wed, 27 Jul 2022 11:09:16 +0900 Subject: [PATCH 3/5] Update fluentd to v1.15.1 Signed-off-by: Takuro Ashie --- td-agent/Gemfile.lock | 6 +++--- td-agent/config.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/td-agent/Gemfile.lock b/td-agent/Gemfile.lock index b1c5445e5..abe190e33 100644 --- a/td-agent/Gemfile.lock +++ b/td-agent/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/fluent/fluentd - revision: 79ead40de9dec33afc2a9bf6cc25f5ec2d65a482 - ref: 79ead40de9dec33afc2a9bf6cc25f5ec2d65a482 + revision: cf241f0d9449a19346cc252946f14b7a79e2a4d2 + ref: cf241f0d9449a19346cc252946f14b7a79e2a4d2 specs: - fluentd (1.15.0) + fluentd (1.15.1) bundler certstore_c (~> 0.1.7) cool.io (>= 1.4.5, < 2.0.0) diff --git a/td-agent/config.rb b/td-agent/config.rb index 29ef4ab05..0202155fa 100644 --- a/td-agent/config.rb +++ b/td-agent/config.rb @@ -1,7 +1,7 @@ PACKAGE_NAME = "td-agent" PACKAGE_VERSION = "4.4.0" -FLUENTD_REVISION = '79ead40de9dec33afc2a9bf6cc25f5ec2d65a482' # v1.15.0 +FLUENTD_REVISION = 'cf241f0d9449a19346cc252946f14b7a79e2a4d2' # v1.15.1 FLUENTD_LOCAL_GEM_REPO = "file://" + File.expand_path(File.join(__dir__, "local_gem_repo")) # https://github.com/jemalloc/jemalloc/releases From 69a277830041ea8938560cdc0ac3b9d318843070 Mon Sep 17 00:00:00 2001 From: Takuro Ashie Date: Wed, 27 Jul 2022 11:16:41 +0900 Subject: [PATCH 4/5] CHANGELOG.md: Add missing plugins Signed-off-by: Takuro Ashie --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b12a95d85..998ef75c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,12 +52,16 @@ * fluent-plugin-flowcounter-simple 0.1.0 * fluent-diagtool v1.0.1 * fluent-plugin-utmpx v0.5.0 +* fluent-plugin-opensearch v1.0.7 (update) +* fluent-plugin-metrics-cmetrics v0.1.2 +* fluent-plugin-calyptia-monitoring v0.1.3 On Windows * winevt_c v0.10.0 (update) * fluent-plugin-parser-winevt_xml v0.2.4 * fluent-plugin-windows-eventlog v0.8.1 +* fluent-plugin-windows-exporter v1.0.0 ## Release v4.3.2 - 2022/06/28 From e44fd72ca7eee3f42bedfb368eb94850c8828a7d Mon Sep 17 00:00:00 2001 From: Takuro Ashie Date: Thu, 28 Jul 2022 14:46:32 +0900 Subject: [PATCH 5/5] CHANGELOG.md: Add description about `TD_AGENT_OPTIONS` Signed-off-by: Takuro Ashie --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 998ef75c9..5e9a6d900 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ * Update fluentd to 1.15.1 * Drop Ubuntu 16.04 "Xenial Xerus" support +* Remove `TD_AGENT_OPTIONS=` from systemd unit file. + Load it from /etc/sysconfig/td-agent or /etc/default/td-agent instead. ### Core component