diff --git a/.github/workflows/artifacts.yaml b/.github/workflows/artifacts.yaml index f7a3171..6863330 100644 --- a/.github/workflows/artifacts.yaml +++ b/.github/workflows/artifacts.yaml @@ -18,9 +18,9 @@ jobs: fail-fast: false matrix: fluentd: - - v1.16 - v1.16-4.8 - v1.16-4.9 + - v1.16-4.10 image-type: - base - filters diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2a84868..cef4d10 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,9 +11,9 @@ jobs: fail-fast: false matrix: fluentd: - - v1.16 - v1.16-4.8 - v1.16-4.9 + - v1.16-4.10 image-type: - base - filters diff --git a/v1.16/Dockerfile b/v1.16-4.10/Dockerfile similarity index 91% rename from v1.16/Dockerfile rename to v1.16-4.10/Dockerfile index 9065d06..7b7b191 100644 --- a/v1.16/Dockerfile +++ b/v1.16-4.10/Dockerfile @@ -1,14 +1,15 @@ # TODO every time the base image is changed please make sure BASEIMAGEDEPS is updated (further down in this file) -FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:b44e3526ae59b558576de5695aa5d6b1bdd4e0a080372f0f25d77a4d2092a476 AS sumo +# https://gallery.ecr.aws/sumologic/kubernetes-fluentd +FROM public.ecr.aws/sumologic/kubernetes-fluentd:1.16.5-sumo-0-alpine as sumo -FROM ruby:3.2.4-alpine3.18 as base +FROM ruby:3.2.5-alpine3.20 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 \ + snappy-dev gnupg bash \ " RUN addgroup -S -g 101 fluent && adduser -S -G fluent -u 100 fluent \ @@ -34,15 +35,15 @@ RUN apk add --no-cache \ # need to rebuild these gems to have the extensions installed && fluent-gem install \ bigdecimal:1.4.4 \ - oj:3.15.0 \ + oj:3.16.1 \ google-protobuf:3.21.12 \ - nio4r:2.6.0 \ + nio4r:2.7.3 \ 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 \ + && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-label-router.git --ref 6d9d34a7e3fd73a400a31fb35513781802e7b36d \ && 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 diff --git a/v1.16/entrypoint.sh b/v1.16-4.10/entrypoint.sh similarity index 100% rename from v1.16/entrypoint.sh rename to v1.16-4.10/entrypoint.sh diff --git a/v1.16/filters/Gemfile b/v1.16-4.10/filters/Gemfile similarity index 94% rename from v1.16/filters/Gemfile rename to v1.16-4.10/filters/Gemfile index 72f9fd5..34e2622 100644 --- a/v1.16/filters/Gemfile +++ b/v1.16-4.10/filters/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'fluent-plugin-detect-exceptions', '0.0.15' -gem 'fluent-plugin-prometheus', '2.1.0' +gem 'fluent-plugin-prometheus', '2.2.0' gem 'fluent-plugin-dedot_filter', '1.0.0' gem 'fluent-plugin-geoip', '1.3.2' gem 'fluent-plugin-tag-normaliser', '0.1.3' diff --git a/v1.16/filters/Gemfile.lock b/v1.16-4.10/filters/Gemfile.lock similarity index 97% rename from v1.16/filters/Gemfile.lock rename to v1.16-4.10/filters/Gemfile.lock index 700fd3f..3528150 100644 --- a/v1.16/filters/Gemfile.lock +++ b/v1.16-4.10/filters/Gemfile.lock @@ -29,7 +29,7 @@ GEM fluent-plugin-parser-logfmt (0.0.0) fluentd (>= 1, < 2) logfmt (~> 0.0.8) - fluent-plugin-prometheus (2.1.0) + fluent-plugin-prometheus (2.2.0) fluentd (>= 1.9.1, < 2) prometheus-client (>= 2.1.0) fluent-plugin-record-modifier (2.2.0) @@ -90,7 +90,7 @@ DEPENDENCIES 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-prometheus (= 2.2.0) fluent-plugin-record-modifier (= 2.2.0) fluent-plugin-rewrite-tag-filter (= 2.4.0) fluent-plugin-tag-normaliser (= 0.1.3) diff --git a/v1.16/fluent.conf b/v1.16-4.10/fluent.conf similarity index 100% rename from v1.16/fluent.conf rename to v1.16-4.10/fluent.conf diff --git a/v1.16/healthy.sh b/v1.16-4.10/healthy.sh similarity index 100% rename from v1.16/healthy.sh rename to v1.16-4.10/healthy.sh diff --git a/v1.16/outputs/Gemfile b/v1.16-4.10/outputs/Gemfile similarity index 85% rename from v1.16/outputs/Gemfile rename to v1.16-4.10/outputs/Gemfile index b7c652b..a4e0f66 100644 --- a/v1.16/outputs/Gemfile +++ b/v1.16-4.10/outputs/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem 'fluent-plugin-aliyun-oss', '0.0.1' gem 'fluent-plugin-sumologic_output', '1.9.0' -gem 'fluent-plugin-kafka', '0.19.2' +gem 'fluent-plugin-kafka', '0.19.3' gem 'fluent-plugin-grafana-loki', '1.2.20' gem 'fluent-plugin-kinesis', '3.5.0' gem 'fluent-plugin-splunk-hec', '1.3.3' @@ -11,7 +11,7 @@ gem 'fluent-plugin-newrelic', '1.2.3' 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.3' +gem 'fluent-plugin-datadog', '0.14.4' gem 'fluent-plugin-redis', '0.3.5' gem 'fluent-plugin-sqs', '3.0.0' gem 'fluent-plugin-mattermost', '0.2.2' @@ -19,6 +19,7 @@ gem 'fluent-plugin-remote-syslog', '1.1.0' gem 'fluent-plugin-webhdfs', '1.6.0' gem 'fluent-plugin-vmware-loginsight', '1.4.2' gem 'fluent-plugin-vmware-log-intelligence', '2.0.8' -gem 'fluent-plugin-gelf-best', '1.3.3' +gem 'fluent-plugin-gelf-best', '1.3.4' +gem 'rdkafka', '0.16.0' #gem 'fluent-plugin-aws-elasticsearch-service', '2.4.1' #gem 'fluent-plugin-logdna', '~> 0.4.0' diff --git a/v1.16/outputs/Gemfile.lock b/v1.16-4.10/outputs/Gemfile.lock similarity index 94% rename from v1.16/outputs/Gemfile.lock rename to v1.16-4.10/outputs/Gemfile.lock index 460522c..a3d54d7 100644 --- a/v1.16/outputs/Gemfile.lock +++ b/v1.16-4.10/outputs/Gemfile.lock @@ -88,7 +88,7 @@ GEM fluent-plugin-cloudwatch-logs (0.14.3) aws-sdk-cloudwatchlogs (~> 1.0) fluentd (>= 1.8.0) - fluent-plugin-datadog (0.14.3) + fluent-plugin-datadog (0.14.4) fluentd (>= 1, < 2) net-http-persistent (~> 4.0.1) fluent-plugin-elasticsearch (5.4.3) @@ -97,18 +97,18 @@ GEM faraday (>= 2.0.0) faraday-excon (>= 2.0.0) fluentd (>= 0.14.22) - fluent-plugin-gelf-best (1.3.3) + fluent-plugin-gelf-best (1.3.4) fluentd (>= 1.0.0) gelf (>= 2.0.0) fluent-plugin-grafana-loki (1.2.20) fluentd (>= 1.9.3, < 2) - fluent-plugin-kafka (0.19.2) + fluent-plugin-kafka (0.19.3) fluentd (>= 0.10.58, < 2) ltsv ruby-kafka (>= 1.5.0, < 2) fluent-plugin-kinesis (3.5.0) - aws-sdk-firehose (~> 1, != 1.9, != 1.5, != 1.15) - aws-sdk-kinesis (~> 1, != 1.5, != 1.4, != 1.14) + aws-sdk-firehose (~> 1, != 1.5, != 1.9, != 1.15) + aws-sdk-kinesis (~> 1, != 1.4, != 1.5, != 1.14) fluentd (>= 0.14.22, < 2) google-protobuf (~> 3) fluent-plugin-logzio (0.2.2) @@ -176,7 +176,7 @@ GEM yajl-ruby (~> 1.0) gelf (3.1.0) json - google-protobuf (3.25.3) + google-protobuf (3.25.5) http (5.1.1) addressable (~> 2.8) http-cookie (~> 1.0) @@ -210,7 +210,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.1003) mini_mime (1.1.5) - mini_portile2 (2.8.6) + mini_portile2 (2.8.7) minitest (5.22.2) msgpack (1.7.2) multi_json (1.15.0) @@ -228,7 +228,7 @@ GEM net-smtp (0.4.0) net-protocol netrc (0.11.0) - nokogiri (1.16.5) + nokogiri (1.16.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) openid_connect (1.1.8) @@ -246,7 +246,7 @@ GEM multi_json (>= 1.0) prometheus-client (4.2.1) public_suffix (5.0.3) - racc (1.7.3) + racc (1.8.0) rack (3.0.9.1) rack-oauth2 (1.21.3) activesupport @@ -255,6 +255,10 @@ GEM json-jwt (>= 1.11.0) rack (>= 2.1.0) rake (13.0.6) + rdkafka (0.16.0) + ffi (~> 1.15) + mini_portile2 (~> 2.6) + rake (> 12) redis (3.3.5) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) @@ -304,11 +308,11 @@ PLATFORMS DEPENDENCIES fluent-plugin-aliyun-oss (= 0.0.1) fluent-plugin-cloudwatch-logs (= 0.14.3) - fluent-plugin-datadog (= 0.14.3) + fluent-plugin-datadog (= 0.14.4) fluent-plugin-elasticsearch (= 5.4.3) - fluent-plugin-gelf-best (= 1.3.3) + fluent-plugin-gelf-best (= 1.3.4) fluent-plugin-grafana-loki (= 1.2.20) - fluent-plugin-kafka (= 0.19.2) + fluent-plugin-kafka (= 0.19.3) fluent-plugin-kinesis (= 3.5.0) fluent-plugin-logzio (= 0.2.2) fluent-plugin-mattermost (= 0.2.2) @@ -322,6 +326,4 @@ DEPENDENCIES fluent-plugin-vmware-log-intelligence (= 2.0.8) fluent-plugin-vmware-loginsight (= 1.4.2) fluent-plugin-webhdfs (= 1.6.0) - -BUNDLED WITH - 2.5.11 + rdkafka (= 0.16.0)