From a50da1b20e22bc2c8fdee81d7508975018953b2d Mon Sep 17 00:00:00 2001 From: Zhonghui Hu Date: Fri, 28 Jan 2022 16:50:57 -0800 Subject: [PATCH] Bump version to 2.22.0 --- AWS_FLB_CHERRY_PICKS | 16 ++++++---------- AWS_FOR_FLUENT_BIT_VERSION | 2 +- CHANGELOG.md | 19 +++++++++++++++++++ Dockerfile | 2 +- Dockerfile.plugins | 4 ++-- 5 files changed, 29 insertions(+), 14 deletions(-) diff --git a/AWS_FLB_CHERRY_PICKS b/AWS_FLB_CHERRY_PICKS index f7eac9685..a1381aab2 100644 --- a/AWS_FLB_CHERRY_PICKS +++ b/AWS_FLB_CHERRY_PICKS @@ -1,17 +1,13 @@ -# Fix return value from tls_net_read (https://github.com/fluent/fluent-bit/pull/4100) -# Commit 1 -- b0177f53 tls: Issue #4098 Fix error handling for OpenSSL apis -https://github.com/krispraws/fluent-bit.git aws_tls_fix 8d1cfeb5ba830b360fe6e1228190ed900842a3ea - # Downgrade mbedtls to 2.24.0 to fix the performance regression issue (https://github.com/fluent/fluent-bit/issues/4110) -# Commit 2 -- eccd4171 downgrade mbedtls to 2.24.0 -https://github.com/zhonghui12/fluent-bit.git custom-1.8.7 30fc6305695623cbc95d51df07ae185dfec8bff2 +# Commit 1 -- eccd4171 downgrade mbedtls to 2.24.0 +https://github.com/zhonghui12/fluent-bit.git immutable-1.8-mbedtls-2.24.0-cherry-pick e4060aaf8c377614484e2ce36fe05542d6e5fd51 # Support timeout on synchronous network calls (https://github.com/fluent/fluent-bit/pull/4184) -# Commit 3 -- io: revised support timeout on synchronous calls -# Commit 4 -- io: default to old net_io_read -https://github.com/matthewfala/fluent-bit.git immutable-1.8-imds-r2-cherry-picks-r3 ccb018b05fd69b1c4aee0de3cf6cb38d5ff29c7c +# Commit 2 -- io: revised support timeout on synchronous calls +# Commit 3 -- io: default to old net_io_read +https://github.com/matthewfala/fluent-bit.git immutable-1.8-sync-timeout-12-r2 b07c5b07573983b78b27e0d48d7a3081aa8c4f3b https://github.com/matthewfala/fluent-bit.git immutable-1.8-imds-r2-cherry-picks-r3 7088680dac1059ab39a875630771c0304045ad93 # IMDS graceful fallback from IMDSv2 to IMDSv1 (https://github.com/aws/aws-for-fluent-bit/issues/259) -# Commit 5 -- aws: revised imds fallback to v1 if token request fails +# Commit 4 -- aws: revised imds fallback to v1 if token request fails https://github.com/matthewfala/fluent-bit.git immutable-1.8-imds-r2-cherry-picks-r3 5a9ad8e43dfbdd93fa5f621f607d9548450eb23a diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION index 87eec9f5d..f1270b4e4 100644 --- a/AWS_FOR_FLUENT_BIT_VERSION +++ b/AWS_FOR_FLUENT_BIT_VERSION @@ -1 +1 @@ -2.21.6 \ No newline at end of file +2.22.0 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 5669f9b45..801e4dfd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,23 @@ # Changelog +### 2.22.0 +This release includes: +* An Amazon Linux 2 Base +* Fluent Bit [1.8.12](https://fluentbit.io/announcements/v1.8.12/) +* Amazon CloudWatch Logs for Fluent Bit 1.7.0 +* Amazon Kinesis Streams for Fluent Bit 1.8.1 +* Amazon Kinesis Firehose for Fluent Bit 1.6.1 + +Compared to `2.21.6` this release adds: +* Feature - Add support for external_id in AWS output plugins [aws-for-fluent-bit:171](https://github.com/aws/aws-for-fluent-bit/issues/171) +* Bug - Fix truncation issue after compression [kinesis:183](https://github.com/aws/amazon-kinesis-streams-for-fluent-bit/issues/183) + +Same as `2.21.6`, this release includes the following fix for AWS customers that has been accepted by upstream: +* Bug - Fix return value from `tls_net_read` [fluentbit:4098](https://github.com/fluent/fluent-bit/issues/4098) + +Same as `2.21.6`, this release includes the following fixes for AWS customers that we are working on getting accepted upstream: +* Bug - Downgrade `mbedtls` to 2.24.0 to fix the performance regression issue in `mbedtls` 2.26.0 [fluentbit:4110](https://github.com/fluent/fluent-bit/issues/4110) +* Bug - Resolve IMDSv1 fallback error introduced in 2.21.0 [aws-for-fluent-bit:259](https://github.com/aws/aws-for-fluent-bit/issues/259) + ### 2.21.6 This release includes: * An Amazon Linux 2 Base diff --git a/Dockerfile b/Dockerfile index 73ecbb075..77a60221d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM public.ecr.aws/amazonlinux/amazonlinux:latest as builder # Fluent Bit version; update these for each release -ENV FLB_VERSION 1.8.11 +ENV FLB_VERSION 1.8.12 # branch to pull parsers from in github.com/fluent/fluent-bit-docker-image ENV FLB_DOCKER_BRANCH 1.8 diff --git a/Dockerfile.plugins b/Dockerfile.plugins index 9946294c4..ba6179763 100644 --- a/Dockerfile.plugins +++ b/Dockerfile.plugins @@ -10,13 +10,13 @@ ENV GO111MODULE on RUN go env -w GOPROXY=direct ARG KINESIS_PLUGIN_CLONE_URL=https://github.com/aws/amazon-kinesis-streams-for-fluent-bit.git -ARG KINESIS_PLUGIN_TAG=v1.8.0 +ARG KINESIS_PLUGIN_TAG=v1.8.1 ARG KINESIS_PLUGIN_BRANCH="" ARG FIREHOSE_PLUGIN_CLONE_URL=https://github.com/aws/amazon-kinesis-firehose-for-fluent-bit.git ARG FIREHOSE_PLUGIN_TAG=v1.6.1 ARG FIREHOSE_PLUGIN_BRANCH="" ARG CLOUDWATCH_PLUGIN_CLONE_URL=https://github.com/aws/amazon-cloudwatch-logs-for-fluent-bit.git -ARG CLOUDWATCH_PLUGIN_TAG=v1.6.4 +ARG CLOUDWATCH_PLUGIN_TAG=v1.7.0 ARG CLOUDWATCH_PLUGIN_BRANCH="" # Kinesis Streams