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

Jump to bottom

WIP: LOG-1033 Update Fluentd to 1.14.1 #2189

Closed
wants to merge 1 commit into from
Closed

WIP: LOG-1033 Update Fluentd to 1.14.1 #2189

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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions fluentd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

#@follow_tag(registry.redhat.io/ubi8/ruby-25:latest)
FROM registry.ci.openshift.org/ocp/builder:ubi8.ruby.25
ENV BUILD_VERSION=1.7.4
ENV BUILD_VERSION=1.14.1
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}

MAINTAINER OpenShift Development <dev@lists.openshift.redhat.com>

ARG DATA_VERSION_VALUE=1.6.0
ARG FLUENTD_VERSION_VALUE=1.7.4
ARG FLUENTD_VERSION_VALUE=1.14.1
ARG HOME_VALUE=/opt/app-root/src
ARG PATH_VALUE=/opt/app-root/src/bin:/opt/app-root/bin
ARG LOGGING_FILE_PATH_VALUE=/var/log/fluentd/fluentd.log
Expand Down Expand Up @@ -104,5 +104,5 @@ LABEL \
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
version=v1.7.4
version=v1.14.1

6 changes: 3 additions & 3 deletions fluentd/Dockerfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ FROM registry.redhat.io/ubi8/ruby-25:1-164
## EXCLUDE BEGIN ##
ARG upstream_code=upstream_code/fluentd
## EXCLUDE END ##
ENV BUILD_VERSION=1.7.4
ENV BUILD_VERSION=1.14.1
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}

MAINTAINER OpenShift Development <dev@lists.openshift.redhat.com>

ARG DATA_VERSION_VALUE=1.6.0
ARG FLUENTD_VERSION_VALUE=1.7.4
ARG FLUENTD_VERSION_VALUE=1.14.1
ARG HOME_VALUE=/opt/app-root/src
ARG PATH_VALUE=/opt/app-root/src/bin:/opt/app-root/bin
ARG LOGGING_FILE_PATH_VALUE=/var/log/fluentd/fluentd.log
Expand Down Expand Up @@ -122,4 +122,4 @@ LABEL \
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
version=v1.7.4
version=v1.14.1
13 changes: 8 additions & 5 deletions fluentd/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
source "https://rubygems.org"
gem 'fluentd', ENV['FLUENTD_VERSION'], :source=>"https://rubygems.org"
gem 'fluentd', ENV['FLUENTD_VERSION']
gem 'elasticsearch-transport'
gem 'elasticsearch-api'
gem 'elasticsearch'
gem 'fluent-plugin-kubernetes_metadata_filter', '2.7.1'
gem 'fluent-plugin-kubernetes_metadata_filter'
gem 'fluent-plugin-cloudwatch-logs'
gem 'fluent-plugin-concat'
gem 'fluent-plugin-detect-exceptions', "0.0.14"
gem 'fluent-plugin-detect-exceptions'
gem 'fluent-plugin-elasticsearch'
gem 'fluent-plugin-kafka'
gem 'fluent-plugin-grafana-loki'
Expand All @@ -25,6 +25,9 @@ gem 'bigdecimal'
#Below gem(and two of its dependencies) are moved to O_A_L/fluentd/lib, but its dependencies still exist in O_A_L/fluentd/vendored_gem_src/
#gem 'fluent-plugin-remote_syslog', '1.0.0'

gem 'ffi', '1.11.3'
gem 'uuidtools', '2.1.5'
gem 'ffi'
gem 'uuidtools'
gem 'rake'

gem 'async'
gem 'async-http'
Loading