From 20befeeafb6bbe37fcd2e187a8c9065ab844f6b2 Mon Sep 17 00:00:00 2001 From: Peter Wilcsinszky Date: Wed, 27 Dec 2023 17:05:59 +0100 Subject: [PATCH 1/2] copy current version of v1.16 under new name Signed-off-by: Peter Wilcsinszky --- .github/workflows/artifacts.yaml | 1 + .github/workflows/ci.yaml | 1 + v1.16-ruby3.2/Dockerfile | 100 +++++++++ v1.16-ruby3.2/entrypoint.sh | 28 +++ v1.16-ruby3.2/filters/Gemfile | 17 ++ v1.16-ruby3.2/filters/Gemfile.lock | 101 +++++++++ v1.16-ruby3.2/fluent.conf | 8 + v1.16-ruby3.2/healthy.sh | 23 ++ v1.16-ruby3.2/outputs/Gemfile | 24 +++ v1.16-ruby3.2/outputs/Gemfile.lock | 328 +++++++++++++++++++++++++++++ 10 files changed, 631 insertions(+) create mode 100644 v1.16-ruby3.2/Dockerfile create mode 100755 v1.16-ruby3.2/entrypoint.sh create mode 100644 v1.16-ruby3.2/filters/Gemfile create mode 100644 v1.16-ruby3.2/filters/Gemfile.lock create mode 100644 v1.16-ruby3.2/fluent.conf create mode 100755 v1.16-ruby3.2/healthy.sh create mode 100644 v1.16-ruby3.2/outputs/Gemfile create mode 100644 v1.16-ruby3.2/outputs/Gemfile.lock diff --git a/.github/workflows/artifacts.yaml b/.github/workflows/artifacts.yaml index 03d8b91..98e5a07 100644 --- a/.github/workflows/artifacts.yaml +++ b/.github/workflows/artifacts.yaml @@ -19,6 +19,7 @@ jobs: matrix: fluentd: - v1.16 + - v1.16-ruby3.2 image-type: - base - filters diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b5596d3..af2ed12 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,6 +12,7 @@ jobs: matrix: fluentd: - v1.16 + - v1.16-ruby3.2 image-type: - base - filters diff --git a/v1.16-ruby3.2/Dockerfile b/v1.16-ruby3.2/Dockerfile new file mode 100644 index 0000000..e7d1a26 --- /dev/null +++ b/v1.16-ruby3.2/Dockerfile @@ -0,0 +1,100 @@ +FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:b44e3526ae59b558576de5695aa5d6b1bdd4e0a080372f0f25d77a4d2092a476 AS sumo + +# Adapted from https://github.com/SumoLogic/sumologic-kubernetes-fluentd/blob/main/alpine.Dockerfile#L102C1-L142C16 +FROM ruby:3.2.2-alpine3.18 as base + +ARG BUILD_DEPS=" \ + make gcc g++ libc-dev \ + wget bzip2 zlib-dev git linux-headers \ + automake autoconf libtool build-base \ + ruby-dev libc6-compat geoip-dev \ + snappy-dev gnupg \ + " + +RUN addgroup -S -g 101 fluent && adduser -S -G fluent -u 100 fluent \ + # for log storage (maybe shared with host) + && mkdir -p /fluentd/log \ + # configuration/plugins path (default: copied from .) + && mkdir -p /fluentd/etc /fluentd/plugins \ + && chown -R fluent /fluentd && chgrp -R fluent /fluentd \ + && mkdir -p /buffers && chown -R fluent /buffers + +COPY --from=sumo --chown=fluent:fluent /usr/local/bundle /usr/local/bundle + +RUN apk add --no-cache \ + ca-certificates \ + ruby ruby-irb ruby-etc \ + tini libmaxminddb geoip \ + snappy \ + && apk add --no-cache $BUILD_DEPS \ + && apk add --no-cache "libssl3>=3.1.4-r1" \ + && apk add --no-cache "libcrypto3>=3.1.4-r1" \ + && echo 'gem: --no-document' >> /etc/gemrc \ + # need to rebuild these gems to have the extensions installed + && fluent-gem install \ + bigdecimal:1.4.4 \ + oj:3.15.0 \ + google-protobuf:3.21.12 \ + nio4r:2.6.0 \ + snappy:0.3.0 \ + # The only required fluentd dependency is the label router + # kubeclient install is upgrading the one from the base image + && fluent-gem install specific_install -v 0.3.8 \ + && fluent-gem specific_install -l https://github.com/ManageIQ/kubeclient.git --ref 054bff2c5e31a555004be2b3c4d32fb9dc5e6a0f \ + && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-label-router.git --ref 2ff43789f895735b7852e0a1a809280e22d9e8ef \ + # TODO remove once the default version is greater than 0.12.1 https://avd.aquasec.com/nvd/2023/cve-2023-36617/ + && fluent-gem install uri -v 0.12.2 \ + && find /usr/local/bundle/gems/ -newer /etc/gemrc -exec chown fluent:fluent {} \; \ + && apk del $BUILD_DEPS \ + && rm -rf /usr/local/bundle/cache/* && find /usr/local/bundle -name '*.o' -delete + +COPY fluent.conf /fluentd/etc/ +COPY entrypoint.sh /bin/ +COPY healthy.sh /bin/ + +ENV FLUENTD_CONF="fluent.conf" +ENV LD_PRELOAD="" +EXPOSE 24224 5140 + +USER fluent + +ENTRYPOINT ["tini", "--", "/bin/entrypoint.sh"] +CMD ["fluentd"] + +### Image with all the filters +FROM base AS filters + +ADD ./filters/Gemfile /Gemfile.filters +ADD ./filters/Gemfile.lock /Gemfile.filters.lock + +USER root + +ENV BUNDLE_WITHOUT="output,test,development" + +RUN apk add --no-cache $BUILD_DEPS \ + && touch /etc/gemrc \ + && fluent-gem install --file Gemfile.filters \ + && find /usr/local/bundle/gems/ -newer /etc/gemrc -exec chown fluent:fluent {} \; \ + && apk del $BUILD_DEPS \ + && rm -rf /usr/local/bundle/cache/* && find /usr/local/bundle -name '*.o' -delete + +USER fluent + +### Image with all the filters and outputs +FROM filters as full + +ADD ./outputs/Gemfile /Gemfile.outputs +ADD ./outputs/Gemfile.lock /Gemfile.outputs.lock + +USER root + +RUN apk add --no-cache $BUILD_DEPS \ + && touch /etc/gemrc \ + && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-gcs.git --ref 71a0932e75509545a2d28e337642ee1f973cca90 \ + && fluent-gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \ + && fluent-gem install --file /Gemfile.outputs \ + && find /usr/local/bundle/gems/ -newer /etc/gemrc -exec chown fluent:fluent {} \; \ + && apk del $BUILD_DEPS \ + && rm -rf /usr/local/bundle/cache/* && find /usr/local/bundle -name '*.o' -delete + +USER fluent diff --git a/v1.16-ruby3.2/entrypoint.sh b/v1.16-ruby3.2/entrypoint.sh new file mode 100755 index 0000000..876b424 --- /dev/null +++ b/v1.16-ruby3.2/entrypoint.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +#source vars if file exists +DEFAULT=/etc/default/fluentd + +if [ -r $DEFAULT ]; then + set -o allexport + . $DEFAULT + set +o allexport +fi + +# If the user has supplied only arguments append them to `fluentd` command +if [ "${1#-}" != "$1" ]; then + set -- fluentd "$@" +fi + +# If user does not supply config file or plugins, use the default +if [ "$1" = "fluentd" ]; then + if ! echo $@ | grep ' \-c' ; then + set -- "$@" -c /fluentd/etc/${FLUENTD_CONF} + fi + + if ! echo $@ | grep ' \-p' ; then + set -- "$@" -p /fluentd/plugins + fi +fi + +exec "$@" diff --git a/v1.16-ruby3.2/filters/Gemfile b/v1.16-ruby3.2/filters/Gemfile new file mode 100644 index 0000000..504b1f8 --- /dev/null +++ b/v1.16-ruby3.2/filters/Gemfile @@ -0,0 +1,17 @@ +source 'https://rubygems.org' + +gem 'fluent-plugin-detect-exceptions', '0.0.15' +gem 'fluent-plugin-prometheus', '2.1.0' +gem 'fluent-plugin-dedot_filter', '1.0.0' +gem 'fluent-plugin-geoip', '1.3.2' +gem 'fluent-plugin-tag-normaliser', '0.1.2' +gem 'fluent-plugin-concat', '2.5.0' +gem 'fluent-plugin-parser-logfmt', '0.0.0' +gem 'fluent-plugin-record-modifier', '2.2.0' +gem 'fluent-plugin-kube-events-timestamp', '0.1.3' +gem 'fluent-plugin-throttle', '0.0.5' +gem 'fluent-plugin-rewrite-tag-filter', '2.4.0' +gem 'fluent-plugin-multi-format-parser', '1.1.0' +gem 'fluent-plugin-grok-parser', '2.6.2' +gem 'fluent-plugin-mysqlslowquery', '0.0.9' +gem 'fluent-plugin-ua-parser', '1.2.0' diff --git a/v1.16-ruby3.2/filters/Gemfile.lock b/v1.16-ruby3.2/filters/Gemfile.lock new file mode 100644 index 0000000..04f99a1 --- /dev/null +++ b/v1.16-ruby3.2/filters/Gemfile.lock @@ -0,0 +1,101 @@ +GEM + remote: https://rubygems.org/ + specs: + concurrent-ruby (1.2.2) + cool.io (1.8.0) + dig_rb (1.0.1) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) + fluent-plugin-concat (2.5.0) + fluentd (>= 0.14.0, < 2) + fluent-plugin-dedot_filter (1.0.0) + fluentd (>= 0.14.0, < 2) + fluent-plugin-detect-exceptions (0.0.15) + fluentd (>= 0.10) + fluent-plugin-geoip (1.3.2) + dig_rb + fluentd (>= 0.14.8, < 2) + geoip-c + geoip2_c + fluent-plugin-grok-parser (2.6.2) + fluentd (>= 0.14.6, < 2) + fluent-plugin-kube-events-timestamp (0.1.3) + fluentd (>= 0.14.0, < 2) + fluent-plugin-multi-format-parser (1.1.0) + fluentd (>= 0.14.0, < 2) + fluent-plugin-mysqlslowquery (0.0.9) + fluentd (>= 0.12.0, < 2) + myslog (~> 0.0) + fluent-plugin-parser-logfmt (0.0.0) + fluentd (>= 1, < 2) + logfmt (~> 0.0.8) + fluent-plugin-prometheus (2.1.0) + fluentd (>= 1.9.1, < 2) + prometheus-client (>= 2.1.0) + fluent-plugin-record-modifier (2.2.0) + fluentd (>= 1.1, < 2) + fluent-plugin-rewrite-tag-filter (2.4.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) + fluent-plugin-tag-normaliser (0.1.2) + fluentd (>= 0.14.10, < 2) + fluent-plugin-throttle (0.0.5) + fluentd (~> 1.1) + fluent-plugin-ua-parser (1.2.0) + fluentd (>= 0.14, < 2) + lru_redux (>= 1.0.0) + user_agent_parser (>= 2.2.0) + fluentd (1.16.3) + 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.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) + yajl-ruby (~> 1.0) + geoip-c (0.9.1) + geoip2_c (0.3.4) + http_parser.rb (0.8.0) + logfmt (0.0.10) + lru_redux (1.1.0) + msgpack (1.7.2) + myslog (0.1.1) + prometheus-client (4.2.1) + serverengine (2.3.2) + sigdump (~> 0.2.2) + sigdump (0.2.5) + strptime (0.2.5) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + tzinfo-data (1.2023.3) + tzinfo (>= 1.0.0) + user_agent_parser (2.16.0) + webrick (1.8.1) + yajl-ruby (1.4.3) + +PLATFORMS + ruby + +DEPENDENCIES + fluent-plugin-concat (= 2.5.0) + fluent-plugin-dedot_filter (= 1.0.0) + fluent-plugin-detect-exceptions (= 0.0.15) + fluent-plugin-geoip (= 1.3.2) + fluent-plugin-grok-parser (= 2.6.2) + fluent-plugin-kube-events-timestamp (= 0.1.3) + fluent-plugin-multi-format-parser (= 1.1.0) + fluent-plugin-mysqlslowquery (= 0.0.9) + fluent-plugin-parser-logfmt (= 0.0.0) + fluent-plugin-prometheus (= 2.1.0) + fluent-plugin-record-modifier (= 2.2.0) + fluent-plugin-rewrite-tag-filter (= 2.4.0) + fluent-plugin-tag-normaliser (= 0.1.2) + fluent-plugin-throttle (= 0.0.5) + fluent-plugin-ua-parser (= 1.2.0) + +BUNDLED WITH + 2.4.22 diff --git a/v1.16-ruby3.2/fluent.conf b/v1.16-ruby3.2/fluent.conf new file mode 100644 index 0000000..04959f1 --- /dev/null +++ b/v1.16-ruby3.2/fluent.conf @@ -0,0 +1,8 @@ +# This is the root config file, which only includes components of the actual configuration + +# Do not collect fluentd's own logs to avoid infinite loops. + + @type null + + +@include /fluentd/etc/conf.d/*.conf diff --git a/v1.16-ruby3.2/healthy.sh b/v1.16-ruby3.2/healthy.sh new file mode 100755 index 0000000..49587f9 --- /dev/null +++ b/v1.16-ruby3.2/healthy.sh @@ -0,0 +1,23 @@ +#!/bin/sh -x + +# Liveness probe is aimed to help in situations where fluentd +# silently hangs for no apparent reasons until manual restart. +# The idea of this probe is that if fluentd is not queueing or +# flushing chunks for 5 minutes, something is not right. If +# you want to change the fluentd configuration, reducing amount of +# logs fluentd collects, consider changing the threshold or turning +# liveness probe off completely. +# soiurce https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml#L58 + +BUFFER_PATH=${BUFFER_PATH}; +LIVENESS_THRESHOLD_SECONDS=${LIVENESS_THRESHOLD_SECONDS:-300}; + +if [ ! -e ${BUFFER_PATH} ]; +then + exit 1; +fi; +touch -d "@$(($(date +%s) - $LIVENESS_THRESHOLD_SECONDS))" /tmp/marker-liveness; +if [ -z "$(find ${BUFFER_PATH} -type d -newer /tmp/marker-liveness -print -quit)" ]; +then + exit 1; +fi; diff --git a/v1.16-ruby3.2/outputs/Gemfile b/v1.16-ruby3.2/outputs/Gemfile new file mode 100644 index 0000000..2041579 --- /dev/null +++ b/v1.16-ruby3.2/outputs/Gemfile @@ -0,0 +1,24 @@ +source 'https://rubygems.org' + +gem 'fluent-plugin-aliyun-oss', '0.0.1' +gem 'fluent-plugin-sumologic_output', '1.8.0' +gem 'fluent-plugin-kafka', '0.19.2' +gem 'fluent-plugin-grafana-loki', '1.2.20' +gem 'fluent-plugin-kinesis', '3.4.2' +gem 'fluent-plugin-splunk-hec', '1.3.3' +gem 'fluent-plugin-elasticsearch', '5.4.2' +gem 'fluent-plugin-newrelic', '1.2.2' +gem 'fluent-plugin-cloudwatch-logs', '0.14.3' +gem 'fluent-plugin-opensearch', '1.1.4' +gem 'fluent-plugin-logzio', '0.2.2' +gem 'fluent-plugin-datadog', '0.14.2' +gem 'fluent-plugin-redis', '0.3.5' +gem 'fluent-plugin-gelf-hs', '1.0.8' +gem 'fluent-plugin-sqs', '3.0.0' +gem 'fluent-plugin-mattermost', '0.2.2' +gem 'fluent-plugin-remote-syslog', '1.1.0' +gem 'fluent-plugin-webhdfs', '1.5.0' +gem 'fluent-plugin-vmware-loginsight', '1.4.2' +gem 'fluent-plugin-vmware-log-intelligence', '2.0.8' +#gem 'fluent-plugin-aws-elasticsearch-service', '2.4.1' +#gem 'fluent-plugin-logdna', '~> 0.4.0' diff --git a/v1.16-ruby3.2/outputs/Gemfile.lock b/v1.16-ruby3.2/outputs/Gemfile.lock new file mode 100644 index 0000000..383c865 --- /dev/null +++ b/v1.16-ruby3.2/outputs/Gemfile.lock @@ -0,0 +1,328 @@ +GEM + remote: https://rubygems.org/ + specs: + activemodel (7.1.1) + activesupport (= 7.1.1) + activesupport (7.1.1) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + aes_key_wrap (1.1.0) + aliyun-sdk (0.7.0) + nokogiri (~> 1.6) + rest-client (~> 2.0) + attr_required (1.0.1) + aws-eventstream (1.2.0) + aws-partitions (1.842.0) + aws-sdk-cloudwatchlogs (1.71.0) + aws-sdk-core (~> 3, >= 3.184.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.185.1) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-firehose (1.58.0) + aws-sdk-core (~> 3, >= 3.184.0) + aws-sigv4 (~> 1.1) + aws-sdk-kinesis (1.52.0) + aws-sdk-core (~> 3, >= 3.184.0) + aws-sigv4 (~> 1.1) + aws-sdk-sqs (1.64.0) + aws-sdk-core (~> 3, >= 3.184.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.6.1) + aws-eventstream (~> 1, >= 1.0.2) + base64 (0.2.0) + bigdecimal (3.1.4) + bindata (2.4.15) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) + cool.io (1.8.0) + date (3.3.3) + digest-crc (0.6.5) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + drb (2.1.1) + ruby2_keywords + elastic-transport (8.3.0) + faraday (< 3) + multi_json + elasticsearch (8.11.0) + elastic-transport (~> 8.3) + elasticsearch-api (= 8.11.0) + elasticsearch-api (8.11.0) + multi_json + excon (0.104.0) + faraday (2.7.12) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-excon (2.1.0) + excon (>= 0.27.4) + faraday (~> 2.0) + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-net_http (3.0.2) + faraday_middleware-aws-sigv4 (1.0.1) + aws-sigv4 (~> 1.0) + faraday (>= 2.0, < 3) + ffi (1.16.3) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + fluent-mixin-config-placeholders (0.4.0) + fluentd + uuidtools (>= 2.1.5) + fluent-plugin-aliyun-oss (0.0.1) + aliyun-sdk (= 0.7.0) + fluentd (>= 0.14.22, < 2) + fluent-plugin-cloudwatch-logs (0.14.3) + aws-sdk-cloudwatchlogs (~> 1.0) + fluentd (>= 1.8.0) + fluent-plugin-datadog (0.14.2) + fluentd (>= 1, < 2) + net-http-persistent (~> 4.0.1) + fluent-plugin-elasticsearch (5.4.2) + elasticsearch + excon + faraday (>= 2.0.0) + faraday-excon (>= 2.0.0) + fluentd (>= 0.14.22) + fluent-plugin-gelf-hs (1.0.8) + fluentd + gelf (>= 2.0.0) + fluent-plugin-grafana-loki (1.2.20) + fluentd (>= 1.9.3, < 2) + fluent-plugin-kafka (0.19.2) + fluentd (>= 0.10.58, < 2) + ltsv + ruby-kafka (>= 1.5.0, < 2) + fluent-plugin-kinesis (3.4.2) + aws-sdk-firehose (~> 1, != 1.9, != 1.5, != 1.15) + aws-sdk-kinesis (~> 1, != 1.5, != 1.4, != 1.14) + fluentd (>= 0.14.22, < 2) + google-protobuf (~> 3) + fluent-plugin-logzio (0.2.2) + fluentd (>= 0.14.0, < 2) + net-http-persistent (~> 4.0) + prometheus-client (>= 2.1.0) + fluent-plugin-mattermost (0.2.2) + fluentd (>= 0.14.10, < 2) + fluent-plugin-mysqlslowquery (0.0.9) + fluentd (>= 0.12.0, < 2) + myslog (~> 0.0) + fluent-plugin-newrelic (1.2.2) + fluentd (>= 1.0.0) + fluent-plugin-opensearch (1.1.4) + aws-sdk-core (~> 3) + excon + faraday (>= 2.0.0) + faraday-excon (>= 2.0.0) + faraday_middleware-aws-sigv4 (~> 1.0.1) + fluentd (>= 0.14.22) + opensearch-ruby + fluent-plugin-redis (0.3.5) + fluentd (>= 0.14.22, < 2) + redis (~> 3.3.0) + fluent-plugin-remote-syslog (1.1) + fluent-mixin-config-placeholders + fluentd + syslog_protocol + fluent-plugin-splunk-hec (1.3.3) + fluentd (>= 1.5) + json-jwt (~> 1.15.0) + multi_json (~> 1.13) + net-http-persistent (~> 4.0) + openid_connect (~> 1.1.8) + prometheus-client (>= 2.1.0) + rack-oauth2 (~> 1.19) + fluent-plugin-sqs (3.0.0) + aws-sdk-sqs (~> 1) + fluentd (>= 0.12.0, < 2) + yajl-ruby (~> 1.0) + fluent-plugin-sumologic_output (1.8.0) + fluentd (>= 0.14.12) + httpclient (~> 2.8.0) + fluent-plugin-vmware-log-intelligence (2.0.8) + fluent-plugin-mysqlslowquery (>= 0.0.9) + fluentd (>= 0.14.20) + http (>= 4.0) + myslog (~> 0.0) + fluent-plugin-vmware-loginsight (1.4.2) + fluentd (>= 0.14.10, < 2) + fluent-plugin-webhdfs (1.5.0) + fluentd (>= 0.14.22) + webhdfs (>= 0.10.0) + fluentd (1.16.3) + 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.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) + yajl-ruby (~> 1.0) + gelf (3.1.0) + json + google-protobuf (3.24.4) + http (5.1.1) + addressable (~> 2.8) + http-cookie (~> 1.0) + http-form_data (~> 2.2) + llhttp-ffi (~> 0.4.0) + http-accept (1.7.0) + http-cookie (1.0.5) + domain_name (~> 0.5) + http-form_data (2.3.0) + http_parser.rb (0.8.0) + httpclient (2.8.3) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + jmespath (1.6.2) + json (2.6.3) + json-jwt (1.15.3) + activesupport (>= 4.2) + aes_key_wrap + bindata + httpclient + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) + ltsv (0.1.2) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + mime-types (3.5.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2023.1003) + mini_mime (1.1.5) + mini_portile2 (2.8.5) + minitest (5.20.0) + msgpack (1.7.2) + multi_json (1.15.0) + mutex_m (0.1.2) + myslog (0.1.1) + net-http-persistent (4.0.2) + connection_pool (~> 2.2) + net-imap (0.4.2) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.4.0) + net-protocol + netrc (0.11.0) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + openid_connect (1.1.8) + activemodel + attr_required (>= 1.0.0) + json-jwt (>= 1.5.0) + rack-oauth2 (>= 1.6.1) + swd (>= 1.0.0) + tzinfo + validate_email + validate_url + webfinger (>= 1.0.1) + opensearch-ruby (3.0.1) + faraday (>= 1.0, < 3) + multi_json (>= 1.0) + prometheus-client (4.2.1) + public_suffix (5.0.3) + racc (1.7.1) + rack (3.0.8) + rack-oauth2 (1.21.3) + activesupport + attr_required + httpclient + json-jwt (>= 1.11.0) + rack (>= 2.1.0) + rake (13.0.6) + redis (3.3.5) + 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) + ruby-kafka (1.5.0) + digest-crc + ruby2_keywords (0.0.5) + serverengine (2.3.2) + sigdump (~> 0.2.2) + sigdump (0.2.5) + strptime (0.2.5) + swd (2.0.2) + activesupport (>= 3) + attr_required (>= 0.0.5) + faraday (~> 2.0) + faraday-follow_redirects + syslog_protocol (0.9.2) + timeout (0.4.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + tzinfo-data (1.2023.3) + tzinfo (>= 1.0.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + uuidtools (2.2.0) + validate_email (0.1.6) + activemodel (>= 3.0) + mail (>= 2.2.5) + validate_url (1.0.15) + activemodel (>= 3.0.0) + public_suffix + webfinger (2.1.2) + activesupport + faraday (~> 2.0) + faraday-follow_redirects + webhdfs (0.10.2) + addressable + webrick (1.8.1) + yajl-ruby (1.4.3) + +PLATFORMS + ruby + +DEPENDENCIES + fluent-plugin-aliyun-oss (= 0.0.1) + fluent-plugin-cloudwatch-logs (= 0.14.3) + fluent-plugin-datadog (= 0.14.2) + fluent-plugin-elasticsearch (= 5.4.2) + fluent-plugin-gelf-hs (= 1.0.8) + fluent-plugin-grafana-loki (= 1.2.20) + fluent-plugin-kafka (= 0.19.2) + fluent-plugin-kinesis (= 3.4.2) + fluent-plugin-logzio (= 0.2.2) + fluent-plugin-mattermost (= 0.2.2) + fluent-plugin-newrelic (= 1.2.2) + fluent-plugin-opensearch (= 1.1.4) + fluent-plugin-redis (= 0.3.5) + fluent-plugin-remote-syslog (= 1.1.0) + fluent-plugin-splunk-hec (= 1.3.3) + fluent-plugin-sqs (= 3.0.0) + fluent-plugin-sumologic_output (= 1.8.0) + fluent-plugin-vmware-log-intelligence (= 2.0.8) + fluent-plugin-vmware-loginsight (= 1.4.2) + fluent-plugin-webhdfs (= 1.5.0) + +BUNDLED WITH + 2.4.21 From b0cfcc48890f5b83137a8550f22d7a0f47e2bf14 Mon Sep 17 00:00:00 2001 From: Peter Wilcsinszky Date: Wed, 27 Dec 2023 17:06:49 +0100 Subject: [PATCH 2/2] upgrade to ruby 3.3 and alpine 3.19 Signed-off-by: Peter Wilcsinszky --- v1.16/Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/v1.16/Dockerfile b/v1.16/Dockerfile index e7d1a26..13dcb3c 100644 --- a/v1.16/Dockerfile +++ b/v1.16/Dockerfile @@ -1,7 +1,7 @@ FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:b44e3526ae59b558576de5695aa5d6b1bdd4e0a080372f0f25d77a4d2092a476 AS sumo # Adapted from https://github.com/SumoLogic/sumologic-kubernetes-fluentd/blob/main/alpine.Dockerfile#L102C1-L142C16 -FROM ruby:3.2.2-alpine3.18 as base +FROM ruby:3.3.0-alpine3.19 as base ARG BUILD_DEPS=" \ make gcc g++ libc-dev \ @@ -27,8 +27,6 @@ RUN apk add --no-cache \ tini libmaxminddb geoip \ snappy \ && apk add --no-cache $BUILD_DEPS \ - && apk add --no-cache "libssl3>=3.1.4-r1" \ - && apk add --no-cache "libcrypto3>=3.1.4-r1" \ && echo 'gem: --no-document' >> /etc/gemrc \ # need to rebuild these gems to have the extensions installed && fluent-gem install \ @@ -42,8 +40,6 @@ RUN apk add --no-cache \ && fluent-gem install specific_install -v 0.3.8 \ && fluent-gem specific_install -l https://github.com/ManageIQ/kubeclient.git --ref 054bff2c5e31a555004be2b3c4d32fb9dc5e6a0f \ && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-label-router.git --ref 2ff43789f895735b7852e0a1a809280e22d9e8ef \ - # TODO remove once the default version is greater than 0.12.1 https://avd.aquasec.com/nvd/2023/cve-2023-36617/ - && fluent-gem install uri -v 0.12.2 \ && find /usr/local/bundle/gems/ -newer /etc/gemrc -exec chown fluent:fluent {} \; \ && apk del $BUILD_DEPS \ && rm -rf /usr/local/bundle/cache/* && find /usr/local/bundle -name '*.o' -delete