Skip to content
This repository has been archived by the owner on Jun 5, 2023. It is now read-only.

Release 3.2.0 #173

Merged
merged 15 commits into from
Jun 21, 2018
22 changes: 11 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: 0cb3a8dfb6cebd56684c1d4609a676959389e4c5
revision: cd92f43bf80ed5b0a664ef8a83d6beb0a6578a72
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
omnibus (>= 5.6.1)

GIT
remote: https://github.com/chef/omnibus.git
revision: 41c5d2eaa819587b631d893e613612a96031c8af
revision: 7e9c9a6a71c1ada2d7f42484f13074e1ec6b7cd3
specs:
omnibus (5.6.10)
omnibus (5.6.12)
aws-sdk (~> 2)
chef-sugar (~> 3.3)
cleanroom (~> 1.0)
Expand All @@ -29,13 +29,13 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-sdk (2.11.27)
aws-sdk-resources (= 2.11.27)
aws-sdk-core (2.11.27)
aws-sdk (2.11.57)
aws-sdk-resources (= 2.11.57)
aws-sdk-core (2.11.57)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.11.27)
aws-sdk-core (= 2.11.27)
aws-sdk-resources (2.11.57)
aws-sdk-core (= 2.11.57)
aws-sigv4 (1.0.2)
berkshelf (6.3.1)
buff-config (~> 2.0)
Expand Down Expand Up @@ -133,12 +133,12 @@ GEM
iostruct (0.0.4)
ipaddress (0.8.3)
iso8601 (0.9.1)
jmespath (1.3.1)
jmespath (1.4.0)
json (2.1.0)
kitchen-vagrant (0.21.1)
test-kitchen (~> 1.4)
libyajl2 (1.2.0)
license_scout (1.0.1)
license_scout (1.0.8)
ffi-yajl (~> 2.2)
mixlib-shellout (~> 2.2)
toml-rb (~> 1.0)
Expand Down Expand Up @@ -178,7 +178,7 @@ GEM
nori (2.6.0)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (13.8.0)
ohai (13.9.0)
chef-config (>= 12.5.0.alpha.1, < 14)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
Expand Down
12 changes: 6 additions & 6 deletions config/projects/td-agent3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
install_dir "#{default_root}/#{name}"
end

build_version "3.1.1"
build_version "3.2.0"
build_iteration 0

# creates required build directories
dependency "preparation"

override :ruby, :version => '2.4.2'
override :zlib, :version => '1.2.8'
override :ruby, :version => '2.4.4'
override :zlib, :version => '1.2.11'
override :jemalloc, :version => '4.5.0'
override :rubygems, :version => '2.6.7'
override :postgresql, :version => '9.6.6'
override :fluentd, :version => 'bc77372d0514964690e0e1a43c487e5cb7ef9033' # v1.0.2
override :rubygems, :version => '2.6.14'
override :postgresql, :version => '9.6.9'
override :fluentd, :version => 'c49959c87e207afb8a75a116da9af9ad86beabf1' # v1.2.2

# td-agent dependencies/components
dependency "td-agent"
Expand Down
4 changes: 4 additions & 0 deletions config/software/postgresql.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
source sha256: '399cdffcb872f785ba67e25d275463d74521566318cfef8fe219050d063c8154'
end

version '9.6.9' do
source sha256: 'b97952e3af02dc1e446f9c4188ff53021cc0eed7ed96f254ae6daf968c443e2e'
end

version "9.5.8" do
source sha256: "ade57068f134f36710fa953e1ef79185abd96572f8098741413132f79ed37202"
end
Expand Down
1 change: 1 addition & 0 deletions config/software/rubygems.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"2.6.7" => "9cd4c5bdc70b525dfacd96e471a64605",
"2.6.8" => "40b3250f28c1d0d5cb9ff5ab2b17df6e",
"2.6.13" => "e6f19b51614055d826e431549a12a80b",
"2.6.14" => "e0a6914ce03b91dfc6d448ebf292f145",
}
known_tarballs.each do |vsn, md5|
version vsn do
Expand Down
12 changes: 6 additions & 6 deletions core_gems.rb
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
dir 'core_gems'
download "bundler", "1.16.0"
download "bundler", "1.16.2"
download "msgpack", "1.2.4"
if td_agent_2?
download "cool.io", "1.5.1"
else
download "cool.io", "1.5.3"
end
download "http_parser.rb", "0.6.0"
download "yajl-ruby", "1.3.1"
download "yajl-ruby", "1.4.0"
download "sigdump", "0.2.4"
if td_agent_2?
download "oj", "2.18.5"
else
download "oj", "3.3.9"
end
download "tzinfo", "1.2.5"
download "tzinfo-data", "1.2018.4"
download "tzinfo-data", "1.2018.5"
unless td_agent_2?
download "dig_rb", "1.0.1"
download 'serverengine', '2.0.5'
download 'serverengine', '2.0.6'
end
if windows?
download 'ffi', '1.9.18'
download 'ffi', '1.9.25'
download 'ffi-win32-extensions', '1.0.3'
download 'win32-ipc', '0.7.0'
download 'win32-event', '0.6.3'
download 'win32-service', '0.8.10'
download 'windows-pr', '1.2.6'
download 'win32-api', '1.7.0-universal-mingw32'
download 'win32-api', '1.7.1-universal-mingw32'
download 'windows-api', '0.4.4'
end
31 changes: 17 additions & 14 deletions plugin_gems.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
download "td", "0.15.2"
download "fluent-plugin-td", "0.10.29"
else
download "td-client", "1.0.4"
download "td", "0.15.7"
download "td-client", "1.0.6"
download "td", "0.16.1"
download "fluent-plugin-td", "1.0.0"
end
if td_agent_2?
download "aws-sdk", "2.11.22"
download "fluent-plugin-s3", "0.8.7"
else
download "jmespath", "1.3.1"
download "aws-partitions", "1.42.0"
download "jmespath", "1.4.0"
download "aws-partitions", "1.87.0"
download "aws-sigv4", "1.0.2"
download "aws-sdk-core", "3.11.0"
download "aws-sdk-kms", "1.3.0"
download "aws-sdk-core", "3.21.2"
download "aws-sdk-kms", "1.5.0"
download "aws-sdk-sqs", "1.3.0"
download "aws-sdk-s3", "1.8.0"
download "fluent-plugin-s3", "1.1.0"
download "aws-sdk-s3", "1.13.0"
download "fluent-plugin-s3", "1.1.3"
end
if td_agent_2?
download "thrift", "0.8.0"
Expand All @@ -33,18 +33,21 @@
if td_agent_2?
download "fluent-plugin-webhdfs", "0.7.1"
else
download "fluent-plugin-webhdfs", "1.2.2"
download "fluent-plugin-webhdfs", "1.2.3"
end
if td_agent_2?
download "fluent-plugin-rewrite-tag-filter", "1.6.0"
else
download "fluent-plugin-rewrite-tag-filter", "2.0.1"
download "fluent-plugin-rewrite-tag-filter", "2.1.0"
end
download "ruby-kafka", "0.5.4"
download "fluent-plugin-kafka", "0.7.2"
download "ruby-kafka", "0.6.5"
download "fluent-plugin-kafka", "0.7.3"
unless td_agent_2?
download "elasticsearch", "5.0.4"
download "fluent-plugin-elasticsearch", "2.4.0"
download "elasticsearch", "6.0.2"
download "fluent-plugin-elasticsearch", "2.10.3"
end
unless td_agent_2?
download "fluent-plugin-record-modifier", "1.1.0"
end
download "fluent-plugin-td-monitoring", "0.2.4"
if windows?
Expand Down