From af403de788dcebe175f1fe5f3d0249a80de81bf1 Mon Sep 17 00:00:00 2001 From: Matthew Fala Date: Thu, 28 Oct 2021 18:42:30 -0700 Subject: [PATCH] Bump version to 2.21.1 Signed-off-by: Matthew Fala --- AWS_FOR_FLUENT_BIT_VERSION | 2 +- CHANGELOG.md | 16 ++++++++++++++++ Dockerfile | 6 +++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION index 971e119ac..bd9c55994 100644 --- a/AWS_FOR_FLUENT_BIT_VERSION +++ b/AWS_FOR_FLUENT_BIT_VERSION @@ -1 +1 @@ -2.21.0 \ No newline at end of file +2.21.1 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 5657a2385..e71ab3792 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +### 2.21.1 +This release includes: +* An Amazon Linux 2 Base +* Fluent Bit [1.8.9](https://fluentbit.io/announcements/v1.8.9/) +* Amazon CloudWatch Logs for Fluent Bit 1.6.3 +* Amazon Kinesis Streams for Fluent Bit 1.8.0 +* Amazon Kinesis Firehose for Fluent Bit 1.6.1 + +Compared to `2.21.0` this release adds: +* Bug - Avoid double free for multiline msgpack buffer [fluentbit:4243](https://github.com/fluent/fluent-bit/pull/4243) +* Bug - On Multiline handling, use file inode as stream_id [fluentbit:3886](https://github.com/fluent/fluent-bit/issues/3886) + +Same as `2.21.0`, this release includes the following fixes for AWS customers that we are working on getting accepted upstream: +* Bug - Fix return value from `tls_net_read` [fluentbit:4098](https://github.com/fluent/fluent-bit/issues/4098) +* 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) + ### 2.21.0 This release includes: * An Amazon Linux 2 Base diff --git a/Dockerfile b/Dockerfile index 753c6864d..387f588e8 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.8 +ENV FLB_VERSION 1.8.9 # branch to pull parsers from in github.com/fluent/fluent-bit-docker-image ENV FLB_DOCKER_BRANCH 1.8 @@ -41,9 +41,9 @@ ENV PATH ${PATH}:/home/.gimme/versions/go1.17.linux.arm64/bin:/home/.gimme/versi RUN go version WORKDIR /tmp/fluent-bit-$FLB_VERSION/ -RUN git clone https://github.com/PettitWesley/fluent-bit.git /tmp/fluent-bit-$FLB_VERSION/ +RUN git clone https://github.com/matthewfala/fluent-bit.git /tmp/fluent-bit-$FLB_VERSION/ WORKDIR /tmp/fluent-bit-$FLB_VERSION/build/ -RUN git fetch origin && git checkout 1_8_8_patch && git status +RUN git fetch origin && git checkout 1_8_9_patch && git status RUN cmake -DFLB_RELEASE=On \ -DFLB_TRACE=Off \ -DFLB_JEMALLOC=On \