Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LOG-4241: upgrade to fluentd v1.16.2 to address file handle issue #96

Merged
merged 1 commit into from
Aug 10, 2023
Merged

LOG-4241: upgrade to fluentd v1.16.2 to address file handle issue #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions fluentd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ FROM registry.access.redhat.com/ubi9/ruby-31 AS runtime
ENV REMOTE_SOURCES=${REMOTE_SOURCES:-"."}
ENV upstream_code=${upstream_code:-"."}

ENV BUILD_VERSION=1.14.6
ENV BUILD_VERSION=1.16.2
ENV OS_GIT_MAJOR=1
ENV OS_GIT_MINOR=14
ENV OS_GIT_PATCH=6
ENV OS_GIT_MINOR=16
ENV OS_GIT_PATCH=2

ARG DATA_VERSION_VALUE=1.6.0
ARG FLUENTD_VERSION_VALUE=1.14.6
ARG FLUENTD_VERSION_VALUE=1.16.2
ARG CONTAINER_VALUE=oci

ENV DATA_VERSION=$DATA_VERSION_VALUE \
Expand Down Expand Up @@ -66,9 +66,7 @@ RUN mv /usr/share/gems/aws-sdk-core.source0001.patch /usr/share/gems/gems/aws-s
cd /usr/share/gems/gems/aws-sdk-core-*/ && patch -p1 < aws-sdk-core.source0001.patch && \
cd /usr/share/gems && \
mv /usr/share/gems/fluent-plugin-detect-exceptions.source0001.patch /usr/share/gems/gems/fluent-plugin-detect-exceptions-*/ && \
cd /usr/share/gems/gems/fluent-plugin-detect-exceptions-*/ && patch -p1 < fluent-plugin-detect-exceptions.source0001.patch && \
mv /usr/share/gems/fluentd.source0001.patch /usr/share/gems/gems/fluentd-*/ && \
cd /usr/share/gems/gems/fluentd-*/ && patch -p1 < fluentd.source0001.patch
cd /usr/share/gems/gems/fluent-plugin-detect-exceptions-*/ && patch -p1 < fluent-plugin-detect-exceptions.source0001.patch

RUN mkdir -p /etc/fluent/configs.d/user && \
chmod 777 /etc/fluent/configs.d/user && \
Expand All @@ -86,6 +84,7 @@ LABEL \
name="openshift-logging/fluentd" \
com.redhat.component="logging-fluentd-container" \
io.openshift.maintainer.product="OpenShift Container Platform" \
version=v1.14.6
io.openshift.logging.fluentd.version=v1.16.2 \
version=v1.16.2


4 changes: 2 additions & 2 deletions fluentd/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source "https://rubygems.org"
gem 'fluentd', ENV['FLUENTD_VERSION'], :source=>"https://rubygems.org"
gem 'fluentd', '1.16.2'
gem 'elasticsearch', '< 8.0'
gem 'fluent-plugin-kubernetes_metadata_filter', '3.1.2'
gem 'fluent-plugin-kubernetes_metadata_filter', '3.2.0'
gem 'fluent-plugin-cloudwatch-logs', "0.14.2"
gem 'fluent-plugin-concat'
gem 'fluent-plugin-detect-exceptions', "0.0.14"
Expand Down
50 changes: 25 additions & 25 deletions fluentd/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ PATH
remote: lib
specs:
filter_elasticsearch_genid_ext (0.0.2)
fluentd (= 1.14.6)
fluentd (= 1.16.2)
filter_parse_json_field (0.0.2)
fluentd (= 1.14.6)
fluentd (= 1.16.2)
fluent-plugin-collected (1.1.0)
fluentd (= 1.14.6)
fluentd (= 1.16.2)
prometheus-client (>= 2.1.0)
fluent-plugin-remote-syslog (1.2)
fluent-mixin-config-placeholders
fluentd (= 1.14.6)
fluentd (= 1.16.2)
syslog_protocol
fluent-plugin-remote_syslog (1.0.0)
fluentd (= 1.14.6)
fluentd (= 1.16.2)
fluent-plugin-viaq_data_model (0.0.23)
fluentd (= 1.14.6)
fluentd (= 1.16.2)
formatter-single-json-value (0.0.1)
fluentd (= 1.14.6)
fluentd (= 1.16.2)
parser_viaq_host_audit (0.0.2)
fluentd (= 1.14.6)
fluentd (= 1.16.2)
remote_syslog_sender (1.2.1)
syslog_protocol
syslog_protocol (0.9.2)
Expand Down Expand Up @@ -68,11 +68,11 @@ GEM
aws-eventstream (~> 1, >= 1.0.2)
bigdecimal (3.1.2)
bindata (2.4.15)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
console (1.15.0)
fiber-local
cool.io (1.7.1)
cool.io (1.8.0)
date (3.3.3)
digest-crc (0.6.4)
rake (>= 12.0.0, < 14.0.0)
Expand Down Expand Up @@ -141,8 +141,8 @@ GEM
fluentd (>= 0.10.58, < 2)
ltsv
ruby-kafka (>= 1.5.0, < 2)
fluent-plugin-kubernetes_metadata_filter (3.1.2)
fluentd (>= 0.14.0, < 1.16)
fluent-plugin-kubernetes_metadata_filter (3.2.0)
fluentd (>= 0.14.0, < 1.17)
kubeclient (>= 4.0.0, < 5.0.0)
lru_redux
fluent-plugin-label-router (0.2.10)
Expand All @@ -169,17 +169,17 @@ GEM
fluent-plugin-systemd (1.0.5)
fluentd (>= 0.14.11, < 2)
systemd-journal (~> 1.4.2)
fluentd (1.14.6)
fluentd (1.16.2)
bundler
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)
sigdump (~> 0.2.2)
serverengine (>= 2.3.2, < 3.0.0)
sigdump (~> 0.2.5)
strptime (>= 0.2.4, < 1.0.0)
tzinfo (>= 1.0, < 3.0)
tzinfo-data (~> 1.0)
webrick (>= 1.4.2, < 1.8.0)
webrick (~> 1.4)
yajl-ruby (~> 1.0)
http (4.4.1)
addressable (~> 2.3)
Expand Down Expand Up @@ -222,7 +222,7 @@ GEM
mime-types-data (3.2022.0105)
mini_mime (1.1.2)
minitest (5.18.1)
msgpack (1.5.4)
msgpack (1.7.2)
multi_json (1.15.0)
multipart-post (2.1.1)
net-http-persistent (4.0.2)
Expand Down Expand Up @@ -275,9 +275,9 @@ GEM
ruby-kafka (1.5.0)
digest-crc
ruby2_keywords (0.0.5)
serverengine (2.3.0)
serverengine (2.3.2)
sigdump (~> 0.2.2)
sigdump (0.2.4)
sigdump (0.2.5)
strptime (0.2.5)
swd (1.3.0)
activesupport (>= 3)
Expand All @@ -290,9 +290,9 @@ GEM
traces (0.4.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (2.0.5)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2022.3)
tzinfo-data (1.2023.3)
tzinfo (>= 1.0.0)
unf (0.1.4)
unf_ext
Expand All @@ -308,7 +308,7 @@ GEM
activesupport
faraday (~> 1.7)
faraday_middleware (~> 1.1)
webrick (1.7.0)
webrick (1.8.1)
yajl-ruby (1.4.3)

PLATFORMS
Expand All @@ -329,7 +329,7 @@ DEPENDENCIES
fluent-plugin-elasticsearch
fluent-plugin-grafana-loki
fluent-plugin-kafka (= 0.19.0)
fluent-plugin-kubernetes_metadata_filter (= 3.1.2)
fluent-plugin-kubernetes_metadata_filter (= 3.2.0)
fluent-plugin-label-router
fluent-plugin-multi-format-parser
fluent-plugin-prometheus
Expand All @@ -340,7 +340,7 @@ DEPENDENCIES
fluent-plugin-splunk-hec (= 1.3.2)
fluent-plugin-systemd
fluent-plugin-viaq_data_model (= 0.0.23)!
fluentd (= 1.14.6)!
fluentd (= 1.16.2)
formatter-single-json-value!
kubeclient
libxml-ruby
Expand All @@ -353,4 +353,4 @@ DEPENDENCIES
uuidtools

BUNDLED WITH
2.1.4
2.3.7
148 changes: 0 additions & 148 deletions fluentd/fluentd.source0001.patch
View file
Open in desktop

This file was deleted.

16 changes: 8 additions & 8 deletions fluentd/lib/filter_elasticsearch_genid_ext/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: .
specs:
filter_elasticsearch_genid_ext (0.0.2)
fluentd (= 1.14.6)
fluentd (= 1.16.2)

GEM
remote: https://rubygems.org/
Expand All @@ -12,27 +12,27 @@ GEM
concurrent-ruby (1.2.0)
cool.io (1.7.1)
docile (1.1.5)
fluentd (1.14.6)
fluentd (1.16.2)
bundler
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)
sigdump (~> 0.2.2)
serverengine (>= 2.3.2, < 3.0.0)
sigdump (~> 0.2.5)
strptime (>= 0.2.4, < 1.0.0)
tzinfo (>= 1.0, < 3.0)
tzinfo-data (~> 1.0)
webrick (>= 1.4.2, < 1.8.0)
webrick (~> 1.4)
yajl-ruby (~> 1.0)
http_parser.rb (0.8.0)
json (2.6.1)
msgpack (1.6.0)
power_assert (2.0.1)
rake (11.3.0)
rr (1.2.1)
serverengine (2.3.1)
serverengine (2.3.2)
sigdump (~> 0.2.2)
sigdump (0.2.4)
sigdump (0.2.5)
simplecov (0.13.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
Expand Down Expand Up @@ -64,4 +64,4 @@ DEPENDENCIES
test-unit-rr (~> 1.0)

BUNDLED WITH
2.3.16
2.4.18
Loading