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.

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

chore(deps): update all dependencies #139

Merged
merged 1 commit into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
target: ${{ matrix.image-type }}

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.23.0
uses: aquasecurity/trivy-action@0.24.0
with:
image-ref: "ghcr.io/${{ github.repository_owner }}/fluentd:${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}"
format: "sarif"
Expand Down
2 changes: 1 addition & 1 deletion v1.16-4.8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# 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.3.1-alpine3.18 as base

ARG BUILD_DEPS=" \
make gcc g++ libc-dev \
Expand Down
2 changes: 1 addition & 1 deletion v1.16-4.8/filters/Gemfile
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
21 changes: 14 additions & 7 deletions v1.16-4.8/filters/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
GEM
remote: https://rubygems.org/
specs:
concurrent-ruby (1.2.3)
cool.io (1.8.0)
base64 (0.2.0)
concurrent-ruby (1.3.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)
Expand All @@ -29,7 +32,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)
Expand All @@ -45,9 +48,12 @@ GEM
fluentd (>= 0.14, < 2)
lru_redux (>= 1.0.0)
user_agent_parser (>= 2.2.0)
fluentd (1.16.3)
fluentd (1.17.0)
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)
msgpack (>= 1.3.1, < 2.0.0)
serverengine (>= 2.3.2, < 3.0.0)
Expand All @@ -64,14 +70,15 @@ GEM
lru_redux (1.1.0)
msgpack (1.7.2)
myslog (0.1.1)
prometheus-client (4.2.1)
prometheus-client (4.2.3)
base64
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-data (1.2024.1)
tzinfo (>= 1.0.0)
user_agent_parser (2.16.0)
webrick (1.8.1)
Expand All @@ -90,7 +97,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)
Expand Down
4 changes: 2 additions & 2 deletions v1.16-4.8/outputs/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
12 changes: 6 additions & 6 deletions v1.16-4.8/outputs/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ GEM
bindata (2.5.0)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
cool.io (1.8.0)
cool.io (1.8.1)
date (3.3.3)
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
Expand Down Expand Up @@ -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)
Expand All @@ -102,7 +102,7 @@ GEM
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)
Expand Down Expand Up @@ -162,7 +162,7 @@ GEM
fluent-plugin-webhdfs (1.6.0)
fluentd (>= 0.14.22)
webhdfs (>= 0.11.0)
fluentd (1.16.3)
fluentd (1.16.5)
bundler
cool.io (>= 1.4.5, < 2.0.0)
http_parser.rb (>= 0.5.1, < 0.9.0)
Expand Down Expand Up @@ -304,11 +304,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-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)
Expand Down
2 changes: 1 addition & 1 deletion v1.16-4.9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# 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.3.1-alpine3.18 as base

ARG BUILD_DEPS=" \
make gcc g++ libc-dev \
Expand Down
2 changes: 1 addition & 1 deletion v1.16-4.9/filters/Gemfile
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
21 changes: 14 additions & 7 deletions v1.16-4.9/filters/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
GEM
remote: https://rubygems.org/
specs:
concurrent-ruby (1.2.3)
cool.io (1.8.0)
base64 (0.2.0)
concurrent-ruby (1.3.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)
Expand All @@ -29,7 +32,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)
Expand All @@ -45,9 +48,12 @@ GEM
fluentd (>= 0.14, < 2)
lru_redux (>= 1.0.0)
user_agent_parser (>= 2.2.0)
fluentd (1.16.3)
fluentd (1.17.0)
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)
msgpack (>= 1.3.1, < 2.0.0)
serverengine (>= 2.3.2, < 3.0.0)
Expand All @@ -64,14 +70,15 @@ GEM
lru_redux (1.1.0)
msgpack (1.7.2)
myslog (0.1.1)
prometheus-client (4.2.1)
prometheus-client (4.2.3)
base64
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-data (1.2024.1)
tzinfo (>= 1.0.0)
user_agent_parser (2.16.0)
webrick (1.8.1)
Expand All @@ -90,7 +97,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)
Expand Down
6 changes: 3 additions & 3 deletions v1.16-4.9/outputs/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -20,6 +20,6 @@ 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 'rdkafka', '0.16.0'
gem 'rdkafka', '0.17.0'
#gem 'fluent-plugin-aws-elasticsearch-service', '2.4.1'
#gem 'fluent-plugin-logdna', '~> 0.4.0'
19 changes: 11 additions & 8 deletions v1.16-4.9/outputs/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -102,13 +102,13 @@ GEM
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.5, != 1.9, != 1.15)
aws-sdk-kinesis (~> 1, != 1.4, != 1.5, != 1.14)
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)
Expand Down Expand Up @@ -255,7 +255,7 @@ GEM
json-jwt (>= 1.11.0)
rack (>= 2.1.0)
rake (13.0.6)
rdkafka (0.16.0)
rdkafka (0.17.0)
ffi (~> 1.15)
mini_portile2 (~> 2.6)
rake (> 12)
Expand Down Expand Up @@ -308,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-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)
Expand All @@ -326,4 +326,7 @@ DEPENDENCIES
fluent-plugin-vmware-log-intelligence (= 2.0.8)
fluent-plugin-vmware-loginsight (= 1.4.2)
fluent-plugin-webhdfs (= 1.6.0)
rdkafka (= 0.16.0)
rdkafka (= 0.17.0)

BUNDLED WITH
2.5.17
4 changes: 2 additions & 2 deletions v1.16/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 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
FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:dc65b35632c35168ae181a8886dd0269ca80e4bdda852b63081ba110538f3dc3 AS sumo

FROM ruby:3.2.4-alpine3.18 as base
FROM ruby:3.3.1-alpine3.18 as base

ARG BUILD_DEPS=" \
make gcc g++ libc-dev \
Expand Down
2 changes: 1 addition & 1 deletion v1.16/filters/Gemfile
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Loading