From 235bcb66fa35a1f5d35052699b0d64dec8a2d693 Mon Sep 17 00:00:00 2001 From: Bence Csati Date: Wed, 8 Jan 2025 13:39:50 +0100 Subject: [PATCH] chore: pull-in fluentd images Signed-off-by: Bence Csati --- images/fluentd/README.md | 57 +++ images/fluentd/v1.16-4.10/Dockerfile | 102 +++++ images/fluentd/v1.16-4.10/entrypoint.sh | 28 ++ images/fluentd/v1.16-4.10/filters/Gemfile | 17 + .../fluentd/v1.16-4.10/filters/Gemfile.lock | 111 +++++ images/fluentd/v1.16-4.10/fluent.conf | 8 + images/fluentd/v1.16-4.10/healthy.sh | 23 + images/fluentd/v1.16-4.10/outputs/Gemfile | 25 ++ .../fluentd/v1.16-4.10/outputs/Gemfile.lock | 332 +++++++++++++++ images/fluentd/v1.17-5.0/Dockerfile | 80 ++++ images/fluentd/v1.17-5.0/entrypoint.sh | 28 ++ images/fluentd/v1.17-5.0/filters/Gemfile | 17 + images/fluentd/v1.17-5.0/filters/Gemfile.lock | 109 +++++ images/fluentd/v1.17-5.0/fluent.conf | 8 + images/fluentd/v1.17-5.0/healthy.sh | 23 + images/fluentd/v1.17-5.0/outputs/Gemfile | 26 ++ images/fluentd/v1.17-5.0/outputs/Gemfile.lock | 400 ++++++++++++++++++ renovate.json | 12 + 18 files changed, 1406 insertions(+) create mode 100644 images/fluentd/README.md create mode 100644 images/fluentd/v1.16-4.10/Dockerfile create mode 100755 images/fluentd/v1.16-4.10/entrypoint.sh create mode 100644 images/fluentd/v1.16-4.10/filters/Gemfile create mode 100644 images/fluentd/v1.16-4.10/filters/Gemfile.lock create mode 100644 images/fluentd/v1.16-4.10/fluent.conf create mode 100755 images/fluentd/v1.16-4.10/healthy.sh create mode 100644 images/fluentd/v1.16-4.10/outputs/Gemfile create mode 100644 images/fluentd/v1.16-4.10/outputs/Gemfile.lock create mode 100644 images/fluentd/v1.17-5.0/Dockerfile create mode 100755 images/fluentd/v1.17-5.0/entrypoint.sh create mode 100644 images/fluentd/v1.17-5.0/filters/Gemfile create mode 100644 images/fluentd/v1.17-5.0/filters/Gemfile.lock create mode 100644 images/fluentd/v1.17-5.0/fluent.conf create mode 100755 images/fluentd/v1.17-5.0/healthy.sh create mode 100644 images/fluentd/v1.17-5.0/outputs/Gemfile create mode 100644 images/fluentd/v1.17-5.0/outputs/Gemfile.lock diff --git a/images/fluentd/README.md b/images/fluentd/README.md new file mode 100644 index 000000000..8e7feba97 --- /dev/null +++ b/images/fluentd/README.md @@ -0,0 +1,57 @@ +# [Fluentd](https://www.fluentd.org/) container images for the [Logging operator](https://github.com/kube-logging/logging-operator) + +This repository publishes [Fluentd](https://www.fluentd.org/) container images to be used with the [Logging operator](https://github.com/kube-logging/logging-operator). + +## Usage + +Pick Fluentd version (either full semver or a shortened major-minor version). +Pick an image type (`filters` contains filter plugins only, `full` has output plugins as well). +Image tags are constructed according to the following pattern: + +```sh +ghcr.io/kube-logging/fluentd:VERSION-IMAGE-TYPE +``` + +To ensure that subsequent builds don't break your production environment, +you may want to pin your image to a specific build: + +```sh +ghcr.io/kube-logging/fluentd:VERSION-IMAGE-TYPE-build.BUILD_NUMBER +``` + +While the tag in the first example is a moving tag (subsequent builds of the same versions produce the same tags), +build number annotated tags are immutable. + +### Add new plugins + +If you wish to add a new plugin, use this image as a base image in your `Dockerfile`: + +```dockerfile +FROM ghcr.io/kube-logging/fluentd:VERSION-IMAGE-TYPE-build.BUILD_NUMBER +``` + +Then add your plugin: + +```dockerfile +RUN fluent-gem install PLUGIN_NAME -v PLUGIN_VERSION +``` + +## Version Support Policy + +According to the Logging Operators release-cycle (6 weeks) we maintain the corresponding fluentd image version, which we support for the last 3 releases. + +## Maintenance + +Whenever a new Fluentd version is released, check the supported versions and add/remove versions in this repository accordingly. + +The versioned directories in the repository root are Fluentd versions. + +When a new Fluentd minor version is released, copy the directory of an earlier version and update the version numbers in it. +Based on the supported Fluentd versions, you may drop old versions from the repository. + +When adding and deleting versions from this repository, don't forget to update the build matrix in [.github/workflows/depdency-images.yaml](../../.github/workflows/dependency-images.yaml). + +Dockerfiles in this repository are not generated and they don't use build args to keep things simple. +We may revisit that decision in the future. + +Patch versions are automatically updated by renovate. diff --git a/images/fluentd/v1.16-4.10/Dockerfile b/images/fluentd/v1.16-4.10/Dockerfile new file mode 100644 index 000000000..d8c70fc73 --- /dev/null +++ b/images/fluentd/v1.16-4.10/Dockerfile @@ -0,0 +1,102 @@ +# TODO every time the base image is changed please make sure BASEIMAGEDEPS is updated (further down in this file) +# 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.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 bash openssl-dev \ + " + +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 \ + # BASEIMAGEDEPS + # need to rebuild these gems to have the extensions installed + && fluent-gem install \ + bigdecimal:1.4.4 \ + oj:3.16.1 \ + google-protobuf:3.25.5 \ + nio4r:2.7.3 \ + snappy:0.3.0 \ + webrick:1.8.2 \ + # 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 namespace-label \ + && 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 \ + # TODO get rid of this by submitting the patch upstream + && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-gcs.git --ref ad6a7cb0f166e2c1648954a928e1e9b8cdcbf93d \ + && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-syslog_rfc5424.git --ref 4ab9f7df3757b0e31e4bc209acab05a518efdce3 \ + && 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/images/fluentd/v1.16-4.10/entrypoint.sh b/images/fluentd/v1.16-4.10/entrypoint.sh new file mode 100755 index 000000000..876b4244f --- /dev/null +++ b/images/fluentd/v1.16-4.10/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/images/fluentd/v1.16-4.10/filters/Gemfile b/images/fluentd/v1.16-4.10/filters/Gemfile new file mode 100644 index 000000000..004f7a6b1 --- /dev/null +++ b/images/fluentd/v1.16-4.10/filters/Gemfile @@ -0,0 +1,17 @@ +source 'https://rubygems.org' + +gem 'fluent-plugin-detect-exceptions', '0.0.16' +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' +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/images/fluentd/v1.16-4.10/filters/Gemfile.lock b/images/fluentd/v1.16-4.10/filters/Gemfile.lock new file mode 100644 index 000000000..0207cddde --- /dev/null +++ b/images/fluentd/v1.16-4.10/filters/Gemfile.lock @@ -0,0 +1,111 @@ +GEM + remote: https://rubygems.org/ + specs: + concurrent-ruby (1.2.3) + console (1.23.7) + fiber-annotation + fiber-local + json + cool.io (1.8.1) + dig_rb (1.0.1) + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) + 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.16) + fluentd (>= 1.14.2) + 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.2.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.3) + 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.6) + bundler + console (< 1.24) + 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) + json (2.9.0) + logfmt (0.0.10) + lru_redux (1.1.0) + msgpack (1.7.5) + 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.4) + tzinfo (>= 1.0.0) + user_agent_parser (2.16.0) + webrick (1.8.2) + 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.16) + 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.2.0) + fluent-plugin-record-modifier (= 2.2.0) + fluent-plugin-rewrite-tag-filter (= 2.4.0) + fluent-plugin-tag-normaliser (= 0.1.3) + fluent-plugin-throttle (= 0.0.5) + fluent-plugin-ua-parser (= 1.2.0) + +BUNDLED WITH + 2.4.22 diff --git a/images/fluentd/v1.16-4.10/fluent.conf b/images/fluentd/v1.16-4.10/fluent.conf new file mode 100644 index 000000000..04959f17a --- /dev/null +++ b/images/fluentd/v1.16-4.10/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/images/fluentd/v1.16-4.10/healthy.sh b/images/fluentd/v1.16-4.10/healthy.sh new file mode 100755 index 000000000..49587f980 --- /dev/null +++ b/images/fluentd/v1.16-4.10/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/images/fluentd/v1.16-4.10/outputs/Gemfile b/images/fluentd/v1.16-4.10/outputs/Gemfile new file mode 100644 index 000000000..27bbf21f8 --- /dev/null +++ b/images/fluentd/v1.16-4.10/outputs/Gemfile @@ -0,0 +1,25 @@ +source 'https://rubygems.org' + +gem 'fluent-plugin-aliyun-oss', '0.0.1' +gem 'fluent-plugin-sumologic_output', '1.10.0' +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' +gem 'fluent-plugin-elasticsearch', '5.4.3' +gem 'fluent-plugin-newrelic', '1.2.3' +gem 'fluent-plugin-cloudwatch-logs', '0.14.3' +gem 'fluent-plugin-opensearch', '1.1.5' +gem 'fluent-plugin-logzio', '0.2.2' +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' +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.4' +gem 'rdkafka', '0.19.0' +#gem 'fluent-plugin-aws-elasticsearch-service', '2.4.1' +#gem 'fluent-plugin-logdna', '~> 0.4.0' diff --git a/images/fluentd/v1.16-4.10/outputs/Gemfile.lock b/images/fluentd/v1.16-4.10/outputs/Gemfile.lock new file mode 100644 index 000000000..319e1b7af --- /dev/null +++ b/images/fluentd/v1.16-4.10/outputs/Gemfile.lock @@ -0,0 +1,332 @@ +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.3.0) + aws-partitions (1.896.0) + aws-sdk-cloudwatchlogs (1.71.0) + aws-sdk-core (~> 3, >= 3.184.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.191.3) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.8) + jmespath (~> 1, >= 1.6.1) + aws-sdk-firehose (1.65.0) + aws-sdk-core (~> 3, >= 3.191.0) + aws-sigv4 (~> 1.1) + aws-sdk-kinesis (1.55.0) + aws-sdk-core (~> 3, >= 3.191.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.8.0) + aws-eventstream (~> 1, >= 1.0.2) + base64 (0.2.0) + bigdecimal (3.1.6) + bindata (2.5.0) + concurrent-ruby (1.2.3) + 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.2.1) + 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.4) + fluentd (>= 1, < 2) + net-http-persistent (~> 4.0.1) + fluent-plugin-elasticsearch (5.4.3) + elasticsearch + excon + faraday (>= 2.0.0) + faraday-excon (>= 2.0.0) + fluentd (>= 0.14.22) + 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.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) + 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.3) + fluentd (>= 1.0.0) + fluent-plugin-opensearch (1.1.5) + 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 (>= 3.0.1) + 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.10.0) + fluentd + httpclient + 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.6.0) + fluentd (>= 0.14.22) + webhdfs (>= 0.11.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.25.5) + 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.4) + concurrent-ruby (~> 1.0) + jmespath (1.6.2) + json (2.6.3) + json-jwt (1.15.3.1) + 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.7) + minitest (5.22.2) + msgpack (1.7.2) + multi_json (1.15.0) + mutex_m (0.2.0) + 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.16.6) + 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.8.0) + rack (3.0.9.1) + rack-oauth2 (1.21.3) + activesupport + attr_required + httpclient + json-jwt (>= 1.11.0) + rack (>= 2.1.0) + rake (13.0.6) + rdkafka (0.19.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) + 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.2024.1) + 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.11.0) + addressable + webrick (1.8.2) + 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.4) + fluent-plugin-elasticsearch (= 5.4.3) + fluent-plugin-gelf-best (= 1.3.4) + fluent-plugin-grafana-loki (= 1.2.20) + fluent-plugin-kafka (= 0.19.3) + fluent-plugin-kinesis (= 3.5.0) + fluent-plugin-logzio (= 0.2.2) + fluent-plugin-mattermost (= 0.2.2) + fluent-plugin-newrelic (= 1.2.3) + fluent-plugin-opensearch (= 1.1.5) + 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.10.0) + fluent-plugin-vmware-log-intelligence (= 2.0.8) + fluent-plugin-vmware-loginsight (= 1.4.2) + fluent-plugin-webhdfs (= 1.6.0) + rdkafka (= 0.19.0) + +BUNDLED WITH + 2.6.0 diff --git a/images/fluentd/v1.17-5.0/Dockerfile b/images/fluentd/v1.17-5.0/Dockerfile new file mode 100644 index 000000000..61421cbab --- /dev/null +++ b/images/fluentd/v1.17-5.0/Dockerfile @@ -0,0 +1,80 @@ +FROM ruby:3.3.6-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 bash openssl-dev \ + " + +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 \ + && apk add --no-cache \ + ca-certificates \ + ruby ruby-irb ruby-etc \ + tini libmaxminddb geoip \ + snappy libssl3 libcrypto3 \ + && apk add --no-cache $BUILD_DEPS \ + && echo 'gem: --no-document' >> /etc/gemrc \ + && gem install fluentd -v 1.17.1 \ + && fluent-gem install specific_install -v 0.3.8 \ + && fluent-gem install fluent-plugin-label-router -v 0.4.0 \ + && 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-syslog_rfc5424.git --ref 4ab9f7df3757b0e31e4bc209acab05a518efdce3 \ + && 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/images/fluentd/v1.17-5.0/entrypoint.sh b/images/fluentd/v1.17-5.0/entrypoint.sh new file mode 100755 index 000000000..876b4244f --- /dev/null +++ b/images/fluentd/v1.17-5.0/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/images/fluentd/v1.17-5.0/filters/Gemfile b/images/fluentd/v1.17-5.0/filters/Gemfile new file mode 100644 index 000000000..ecd5b493c --- /dev/null +++ b/images/fluentd/v1.17-5.0/filters/Gemfile @@ -0,0 +1,17 @@ +source 'https://index.rubygems.org' + +gem 'fluent-plugin-detect-exceptions', '0.0.16' +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' +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/images/fluentd/v1.17-5.0/filters/Gemfile.lock b/images/fluentd/v1.17-5.0/filters/Gemfile.lock new file mode 100644 index 000000000..a368ed213 --- /dev/null +++ b/images/fluentd/v1.17-5.0/filters/Gemfile.lock @@ -0,0 +1,109 @@ +GEM + remote: https://index.rubygems.org/ + specs: + base64 (0.2.0) + concurrent-ruby (1.2.3) + cool.io (1.8.1) + csv (3.3.0) + dig_rb (1.0.1) + drb (2.2.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.16) + fluentd (>= 1.14.2) + 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.2.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.3) + 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.17.1) + base64 (~> 0.2) + bundler + cool.io (>= 1.4.5, < 2.0.0) + csv (~> 3.2) + drb (~> 2.2) + http_parser.rb (>= 0.5.1, < 0.9.0) + logger (~> 1.6) + 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) + logger (1.6.2) + lru_redux (1.1.0) + msgpack (1.7.5) + 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.4) + tzinfo (>= 1.0.0) + user_agent_parser (2.16.0) + webrick (1.9.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.16) + 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.2.0) + fluent-plugin-record-modifier (= 2.2.0) + fluent-plugin-rewrite-tag-filter (= 2.4.0) + fluent-plugin-tag-normaliser (= 0.1.3) + fluent-plugin-throttle (= 0.0.5) + fluent-plugin-ua-parser (= 1.2.0) + +BUNDLED WITH + 2.5.23 diff --git a/images/fluentd/v1.17-5.0/fluent.conf b/images/fluentd/v1.17-5.0/fluent.conf new file mode 100644 index 000000000..04959f17a --- /dev/null +++ b/images/fluentd/v1.17-5.0/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/images/fluentd/v1.17-5.0/healthy.sh b/images/fluentd/v1.17-5.0/healthy.sh new file mode 100755 index 000000000..49587f980 --- /dev/null +++ b/images/fluentd/v1.17-5.0/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/images/fluentd/v1.17-5.0/outputs/Gemfile b/images/fluentd/v1.17-5.0/outputs/Gemfile new file mode 100644 index 000000000..4879a39ae --- /dev/null +++ b/images/fluentd/v1.17-5.0/outputs/Gemfile @@ -0,0 +1,26 @@ +source 'https://index.rubygems.org' + +gem 'fluent-plugin-aliyun-oss', '0.0.1' +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' +gem 'fluent-plugin-elasticsearch', '5.4.3' +gem 'fluent-plugin-newrelic', '1.2.3' +gem 'fluent-plugin-cloudwatch-logs', '0.14.3' +gem 'fluent-plugin-opensearch', '1.1.5' +gem 'fluent-plugin-logzio', '0.2.2' +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' +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.4' +gem 'fluent-plugin-s3', '1.8.2' +gem 'fluent-plugin-gcs', '0.4.4' +gem 'rdkafka', '0.19.0' +#gem 'fluent-plugin-aws-elasticsearch-service', '2.4.1' +#gem 'fluent-plugin-logdna', '~> 0.4.0' diff --git a/images/fluentd/v1.17-5.0/outputs/Gemfile.lock b/images/fluentd/v1.17-5.0/outputs/Gemfile.lock new file mode 100644 index 000000000..4c404c5f7 --- /dev/null +++ b/images/fluentd/v1.17-5.0/outputs/Gemfile.lock @@ -0,0 +1,400 @@ +GEM + remote: https://index.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.7) + public_suffix (>= 2.0.2, < 7.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.3.0) + aws-partitions (1.1001.0) + aws-sdk-cloudwatchlogs (1.71.0) + aws-sdk-core (~> 3, >= 3.184.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.212.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + jmespath (~> 1, >= 1.6.1) + aws-sdk-firehose (1.65.0) + aws-sdk-core (~> 3, >= 3.191.0) + aws-sigv4 (~> 1.1) + aws-sdk-kinesis (1.55.0) + aws-sdk-core (~> 3, >= 3.191.0) + aws-sigv4 (~> 1.1) + aws-sdk-kms (1.95.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.169.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sdk-sqs (1.64.0) + aws-sdk-core (~> 3, >= 3.184.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.10.1) + aws-eventstream (~> 1, >= 1.0.2) + base64 (0.2.0) + bigdecimal (3.1.6) + bindata (2.5.0) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + cool.io (1.8.1) + csv (3.3.1) + date (3.3.3) + declarative (0.0.20) + 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.2.1) + 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.4) + fluentd (>= 1, < 2) + net-http-persistent (~> 4.0.1) + fluent-plugin-elasticsearch (5.4.3) + elasticsearch + excon + faraday (>= 2.0.0) + faraday-excon (>= 2.0.0) + fluentd (>= 0.14.22) + fluent-plugin-gcs (0.4.4) + fluentd (>= 0.14.22, < 2) + google-cloud-storage (~> 1.1) + fluent-plugin-gelf-best (1.3.4) + fluentd (>= 1.0.0) + gelf (>= 3.1.0) + fluent-plugin-grafana-loki (1.2.20) + fluentd (>= 1.9.3, < 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) + 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.3) + fluentd (>= 1.0.0) + fluent-plugin-opensearch (1.1.5) + 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 (>= 3.0.1) + 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-s3 (1.8.2) + aws-sdk-s3 (~> 1.60) + aws-sdk-sqs (~> 1.23) + fluentd (>= 0.14.22, < 2) + 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-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.6.0) + fluentd (>= 0.14.22) + webhdfs (>= 0.11.0) + fluentd (1.17.1) + base64 (~> 0.2) + bundler + cool.io (>= 1.4.5, < 2.0.0) + csv (~> 3.2) + drb (~> 2.2) + http_parser.rb (>= 0.5.1, < 0.9.0) + logger (~> 1.6) + 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-apis-core (0.15.1) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 1.9) + httpclient (>= 2.8.3, < 3.a) + mini_mime (~> 1.0) + mutex_m + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + google-apis-iamcredentials_v1 (0.22.0) + google-apis-core (>= 0.15.0, < 2.a) + google-apis-storage_v1 (0.47.0) + google-apis-core (>= 0.15.0, < 2.a) + google-cloud-core (1.7.1) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (2.2.1) + faraday (>= 1.0, < 3.a) + google-cloud-errors (1.4.0) + google-cloud-storage (1.52.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-core (~> 0.13) + google-apis-iamcredentials_v1 (~> 0.18) + google-apis-storage_v1 (~> 0.38) + google-cloud-core (~> 1.6) + googleauth (~> 1.9) + mini_mime (~> 1.0) + google-protobuf (3.25.5) + googleauth (1.11.2) + faraday (>= 1.0, < 3.a) + google-cloud-env (~> 2.1) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + 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.4) + concurrent-ruby (~> 1.0) + jmespath (1.6.2) + json (2.6.3) + json-jwt (1.15.3.1) + activesupport (>= 4.2) + aes_key_wrap + bindata + httpclient + jwt (2.9.3) + base64 + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) + logger (1.6.3) + 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.7) + minitest (5.22.2) + msgpack (1.7.5) + multi_json (1.15.0) + mutex_m (0.2.0) + 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.16.6) + 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) + os (1.1.4) + prometheus-client (4.2.1) + public_suffix (5.0.3) + racc (1.8.0) + rack (3.0.9.1) + rack-oauth2 (1.21.3) + activesupport + attr_required + httpclient + json-jwt (>= 1.11.0) + rack (>= 2.1.0) + rake (13.0.6) + rdkafka (0.19.0) + ffi (~> 1.15) + mini_portile2 (~> 2.6) + rake (> 12) + redis (3.3.5) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + 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) + retriable (3.1.2) + ruby-kafka (1.5.0) + digest-crc + ruby2_keywords (0.0.5) + serverengine (2.3.2) + sigdump (~> 0.2.2) + sigdump (0.2.5) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + 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) + trailblazer-option (0.1.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + tzinfo-data (1.2024.2) + tzinfo (>= 1.0.0) + uber (0.1.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.11.0) + addressable + webrick (1.9.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.4) + fluent-plugin-elasticsearch (= 5.4.3) + fluent-plugin-gcs (= 0.4.4) + fluent-plugin-gelf-best (= 1.3.4) + fluent-plugin-grafana-loki (= 1.2.20) + fluent-plugin-kafka (= 0.19.3) + fluent-plugin-kinesis (= 3.5.0) + fluent-plugin-logzio (= 0.2.2) + fluent-plugin-mattermost (= 0.2.2) + fluent-plugin-newrelic (= 1.2.3) + fluent-plugin-opensearch (= 1.1.5) + fluent-plugin-redis (= 0.3.5) + fluent-plugin-remote-syslog (= 1.1.0) + fluent-plugin-s3 (= 1.8.2) + fluent-plugin-splunk-hec (= 1.3.3) + fluent-plugin-sqs (= 3.0.0) + fluent-plugin-vmware-log-intelligence (= 2.0.8) + fluent-plugin-vmware-loginsight (= 1.4.2) + fluent-plugin-webhdfs (= 1.6.0) + rdkafka (= 0.19.0) + +BUNDLED WITH + 2.5.23 diff --git a/renovate.json b/renovate.json index 80f2d9e7f..dde3bec34 100644 --- a/renovate.json +++ b/renovate.json @@ -76,6 +76,18 @@ "Add build label to PRs which are related to build tools defined in Makefiles.", "Group Makefile dependency updates in single PR." ] + }, + { + "matchPaths": ["images/fluentd/v1.16-4.10/**"], + "additionalBranchPrefix": "v1.16-4.10-", + "commitMessagePrefix": "v1.16-4.10:", + "enabled": false + }, + { + "matchPaths": ["images/fluentd/v1.17-5.0/**"], + "additionalBranchPrefix": "v1.17-5.0-", + "commitMessagePrefix": "v1.17-5.0:", + "enabled": false } ], "postUpdateOptions": [