Skip to content

Commit

Permalink
Update to use latest fluentd (#242)
Browse files Browse the repository at this point in the history
  • Loading branch information
jcantrill committed Jul 1, 2020
1 parent 940296b commit 1b67682
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 25 deletions.
49 changes: 26 additions & 23 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PATH
remote: .
specs:
fluent-plugin-kubernetes_metadata_filter (2.4.6)
fluentd (>= 0.14.0, < 1.10)
fluent-plugin-kubernetes_metadata_filter (2.5.0)
fluentd (>= 0.14.0, < 1.12)
kubeclient (< 5)
lru_redux

Expand All @@ -11,7 +11,7 @@ GEM
specs:
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.0)
ast (2.4.1)
bump (0.9.0)
charlock_holmes (0.7.7)
codeclimate-test-reporter (0.6.0)
Expand All @@ -26,11 +26,11 @@ GEM
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
escape_utils (1.2.1)
ffi (1.12.2)
ffi (1.13.1)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
fluentd (1.9.3)
fluentd (1.11.1)
cool.io (>= 1.4.5, < 2.0.0)
http_parser.rb (>= 0.5.1, < 0.7.0)
msgpack (>= 1.3.1, < 2.0.0)
Expand All @@ -40,7 +40,7 @@ GEM
tzinfo (>= 1.0, < 3.0)
tzinfo-data (~> 1.0)
yajl-ruby (~> 1.0)
github-linguist (7.8.0)
github-linguist (7.9.0)
charlock_holmes (~> 0.7.6)
escape_utils (~> 1.2.0)
mini_mime (~> 1.0)
Expand All @@ -58,44 +58,47 @@ GEM
http-parser (1.2.1)
ffi-compiler (>= 1.0, < 2.0)
http_parser.rb (0.6.0)
jaro_winkler (1.5.4)
kubeclient (4.6.0)
kubeclient (4.7.0)
http (>= 3.0, < 5.0)
recursive-open-struct (~> 1.0, >= 1.0.4)
recursive-open-struct (~> 1.1, >= 1.1.1)
rest-client (~> 2.0)
lru_redux (1.1.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2020.0425)
mime-types-data (3.2020.0512)
mini_mime (1.0.2)
minitest (4.7.5)
msgpack (1.3.3)
netrc (0.11.0)
parallel (1.19.1)
parser (2.7.0.4)
ast (~> 2.4.0)
power_assert (1.1.6)
public_suffix (4.0.3)
parallel (1.19.2)
parser (2.7.1.4)
ast (~> 2.4.1)
power_assert (1.2.0)
public_suffix (4.0.5)
rainbow (3.0.0)
rake (13.0.1)
recursive-open-struct (1.1.1)
recursive-open-struct (1.1.2)
regexp_parser (1.7.1)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.4)
rr (1.2.1)
rubocop (0.80.1)
jaro_winkler (~> 1.5.1)
rubocop (0.86.0)
parallel (~> 1.10)
parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
rexml
rubocop-ast (>= 0.0.3, < 1.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.1.0)
parser (>= 2.7.0.1)
ruby-progressbar (1.10.1)
rugged (0.99.0)
rugged (1.0.1)
safe_yaml (1.0.5)
serverengine (2.2.1)
sigdump (~> 0.2.2)
Expand All @@ -104,7 +107,7 @@ GEM
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov-html (0.12.2)
strptime (0.2.3)
strptime (0.2.4)
test-unit (3.0.9)
power_assert
test-unit-rr (1.0.5)
Expand All @@ -117,8 +120,8 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unicode-display_width (1.6.1)
vcr (5.1.0)
unicode-display_width (1.7.0)
vcr (6.0.0)
webmock (3.8.3)
addressable (>= 2.3.6)
crack (>= 0.3.2)
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ that rely on the authenticity of the namespace for proper log isolation.

| fluent-plugin-kubernetes_metadata_filter | fluentd | ruby |
|-------------------|---------|------|
| >= 2.5.0 | >= v1.10.0 | >= 2.5 |
| >= 2.0.0 | >= v0.14.20 | >= 2.1 |
| < 2.0.0 | >= v0.12.0 | >= 1.9 |

Expand Down
4 changes: 2 additions & 2 deletions fluent-plugin-kubernetes_metadata_filter.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)

Gem::Specification.new do |gem|
gem.name = "fluent-plugin-kubernetes_metadata_filter"
gem.version = "2.4.6"
gem.version = "2.5.0"
gem.authors = ["Jimmi Dyson"]
gem.email = ["jimmidyson@gmail.com"]
gem.description = %q{Filter plugin to add Kubernetes metadata}
Expand All @@ -19,7 +19,7 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = '>= 2.1.0'

gem.add_runtime_dependency 'fluentd', ['>= 0.14.0', '< 1.10']
gem.add_runtime_dependency 'fluentd', ['>= 0.14.0', '< 1.12']
gem.add_runtime_dependency "lru_redux"
gem.add_runtime_dependency "kubeclient", '< 5'

Expand Down

0 comments on commit 1b67682

Please sign in to comment.