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.

Sign up for GitHub

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

Bump version to 2.22.0 #291

Merged
merged 1 commit into from
Feb 2, 2022
Merged

Bump version to 2.22.0 #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 6 additions & 10 deletions AWS_FLB_CHERRY_PICKS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion AWS_FOR_FLUENT_BIT_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.21.6
2.22.0
19 changes: 19 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
zhonghui12 marked this conversation as resolved.
Show resolved Hide resolved

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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.plugins
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down