Bump to 2.26.0

aws · Jun 9, 2022 · 0f715dd · 0f715dd
1 parent e5e561f
commit 0f715dd
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/AWS_FLB_CHERRY_PICKS b/AWS_FLB_CHERRY_PICKS
@@ -1,4 +1 @@
-# kube_token_ttl 
-https://github.com/PettitWesley/fluent-bit.git kube_token_ttl bfce41f48c0f1cc39bf67f7804e6134ccfc3ecb6
-https://github.com/PettitWesley/fluent-bit.git kube_token_ttl c28c5506177beb3b40130b62ac9add243d534e7f
-https://github.com/PettitWesley/fluent-bit.git kube_token_ttl 03276f84723b74ef3d3b3c83c2b71f0216ce561b
+# No AWS cherry picks in this release
diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION
@@ -1 +1 @@
-2.25.1
+2.26.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+### 2.26.0
+This release includes:
+* An Amazon Linux 2 Base
+* Fluent Bit [1.9.4](https://fluentbit.io/announcements/v1.9.4/)
+* Amazon CloudWatch Logs for Fluent Bit 1.8.0
+* Amazon Kinesis Streams for Fluent Bit 1.9.0
+* Amazon Kinesis Firehose for Fluent Bit 1.6.1
+
+Compared to `2.25.1` this release adds:
+* Feature - Add `auto_create_stream ` option [cloudwatch:257](https://github.com/aws/amazon-cloudwatch-logs-for-fluent-bit/pull/257)
+* Enhancement - Add debug logs to check batch sizes [fluentbit:5428](https://github.com/fluent/fluent-bit/pull/5428)
+* Enhancement - Set 1 worker as default for `cloudwatch_logs` plugin [fluentbit:5417](https://github.com/fluent/fluent-bit/pull/5417)
+* Bug - Allow recovery from a stream being deleted and created by a user [cloudwatch:257](https://github.com/aws/amazon-cloudwatch-logs-for-fluent-bit/pull/257)
+
+Same as `2.25.1`, this release includes the following enhancement for AWS customers that has been accepted by upstream:
+* Enhancement - Add `kube_token_ttl` option to kubernetes filter to support refreshing the service account token used to talk to the API server. Prior to this change Fluent Bit would only read the token on startup. [fluentbit:5332](https://github.com/fluent/fluent-bit/issues/5332)
+
 ### 2.25.1
 This release includes:
 * An Amazon Linux 2 Base
@@ -8,7 +25,7 @@ This release includes:
 * Amazon Kinesis Streams for Fluent Bit 1.9.0
 * Amazon Kinesis Firehose for Fluent Bit 1.6.1
 
-Compared to `2.24.0` this release adds:
+Compared to `2.25.0` this release adds:
 * Bug - Fix new `kube_token_ttl` option in kubernetes filter to correctly parse TTL as a time value [aws-for-fluent-bit:353](https://github.com/aws/aws-for-fluent-bit/issues/353)
 
 ### 2.25.0

diff --git 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.9.3
+ENV FLB_VERSION 1.9.4
 # branch to pull parsers from in github.com/fluent/fluent-bit-docker-image
 ENV FLB_DOCKER_BRANCH master
 

diff --git a/Dockerfile.debug b/Dockerfile.debug
@@ -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.9.3
+ENV FLB_VERSION 1.9.4
 # branch to pull parsers from in github.com/fluent/fluent-bit-docker-image
 ENV FLB_DOCKER_BRANCH master
 

diff --git a/Dockerfile.plugins b/Dockerfile.plugins
@@ -16,7 +16,7 @@ ARG FIREHOSE_PLUGIN_CLONE_URL=https://github.com/aws/amazon-kinesis-firehose-for
 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.7.0
+ARG CLOUDWATCH_PLUGIN_TAG=v1.8.0
 ARG CLOUDWATCH_PLUGIN_BRANCH=""
 
 # Kinesis Streams