Bump to 2.24.0

matthewfala · matthewfala · commit e5ca66a2953c · 2022-05-06T12:37:01.000-07:00
Signed-off-by: Matthew Fala &lt;falamatt@amazon.com&gt;
diff --git a/AWS_FLB_CHERRY_PICKS b/AWS_FLB_CHERRY_PICKS
@@ -1,9 +1 @@
-# Support timeout on synchronous network calls (https://github.com/fluent/fluent-bit/pull/4184)
-# Commit 1 -- io: revised support timeout on synchronous calls
-# Commit 2 -- 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 3 -- 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
+# No AWS cherry picks in this release
diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION
@@ -1 +1 @@
-2.23.4
+2.24.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+### 2.24.0
+This release includes:
+* An Amazon Linux 2 Base
+* Fluent Bit [1.9.3](https://fluentbit.io/announcements/v1.9.3/)
+* Amazon CloudWatch Logs for Fluent Bit 1.7.0
+* Amazon Kinesis Streams for Fluent Bit 1.9.0
+* Amazon Kinesis Firehose for Fluent Bit 1.6.1
+
+Compared to `2.23.4` this release adds:
+* 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)
+* Bug - Cloudwatch Fix integer overflow on 32 bit systems when converting tv_sec to millis [fluentbit:3640](https://github.com/fluent/fluent-bit/issues/3640)
+* Enhancement - Only create Cloudwatch Logs log group if it does not already exist to prevent throttling [fluentbit:4826](https://github.com/fluent/fluent-bit/pull/4826)
+* Enhancement - Implement docker log driver partial message support for multiline buffered mode [fluentbit:4671](https://github.com/fluent/fluent-bit/pull/4671)
+* Enhancement - Gracefully handle Cloudwatch Logs DataAlreadyAcceptedException [fluentbit:4948](https://github.com/fluent/fluent-bit/pull/4948)
+* Feature - Add sigv4 authentication options to HTTP output plugin [fluentbit:5165](https://github.com/fluent/fluent-bit/pull/5165)
+* Feature - Add Firehose compression configuration options [fluentbit:4371](https://github.com/fluent/fluent-bit/pull/4371)
+* New Plugin - [`opensearch` plugin in Fluent Bit core](https://docs.fluentbit.io/manual/pipeline/outputs/opensearch)
+
 ### 2.23.4
 This release includes:
 * An Amazon Linux 2 Base
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
 FROM public.ecr.aws/amazonlinux/amazonlinux:latest as builder
 
 # Fluent Bit version; update these for each release
-ENV FLB_VERSION 1.8.15
+ENV FLB_VERSION 1.9.3
 # branch to pull parsers from in github.com/fluent/fluent-bit-docker-image
-ENV FLB_DOCKER_BRANCH 1.8
+ENV FLB_DOCKER_BRANCH 1.9
 
 ENV FLB_TARBALL http://github.com/fluent/fluent-bit/archive/v$FLB_VERSION.zip
 RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log /tmp/fluent-bit-master/
@@ -52,14 +52,19 @@ RUN git config --global user.email "aws-firelens@amazon.com" \
 COPY AWS_FLB_CHERRY_PICKS \
   /AWS_FLB_CHERRY_PICKS
 
-RUN cat /AWS_FLB_CHERRY_PICKS | sed '/^#/d' \
-  | xargs -l bash -c 'git fetch $0 $1 && git cherry-pick $2'
-
-RUN echo "Cherry Pick Patch Summary:"; \
-  git log --oneline \
-  -`cat /AWS_FLB_CHERRY_PICKS | sed '/^#/d' | sed '/^\s*$/d' | wc -l | awk '{ print $1+1 }'` \
-  | tac | awk '{ print "Commit",NR-1,"--",$0 }'; sleep 2
-
+RUN AWS_FLB_CHERRY_PICKS_COUNT=`cat /AWS_FLB_CHERRY_PICKS | sed '/^#/d' | sed '/^\s*$/d' | wc -l | awk '{ print $1 }'`; \
+  if [ $AWS_FLB_CHERRY_PICKS_COUNT -gt 0 ]; \
+  then \
+    cat /AWS_FLB_CHERRY_PICKS | sed '/^#/d' \
+    | xargs -l bash -c 'git fetch $0 $1 && git cherry-pick $2'; \
+    \
+    echo "Cherry Pick Patch Summary:"; \
+    git log --oneline \
+    -$((AWS_FLB_CHERRY_PICKS_COUNT+1)) \
+    | tac | awk '{ print "Commit",NR-1,"--",$0 }'; sleep 2; \
+  fi
+
+# Build Fluent Bit
 RUN cmake -DFLB_RELEASE=On \
           -DFLB_TRACE=Off \
           -DFLB_JEMALLOC=On \
diff --git a/Dockerfile.debug b/Dockerfile.debug
@@ -1,9 +1,9 @@
 FROM public.ecr.aws/amazonlinux/amazonlinux:latest as builder
 
 # Fluent Bit version; update these for each release
-ENV FLB_VERSION 1.8.15
+ENV FLB_VERSION 1.9.3
 # branch to pull parsers from in github.com/fluent/fluent-bit-docker-image
-ENV FLB_DOCKER_BRANCH 1.8
+ENV FLB_DOCKER_BRANCH 1.9
 
 ENV FLB_TARBALL http://github.com/fluent/fluent-bit/archive/v$FLB_VERSION.zip
 RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log /tmp/fluent-bit-master/
@@ -53,14 +53,19 @@ RUN git config --global user.email "aws-firelens@amazon.com" \
 COPY AWS_FLB_CHERRY_PICKS \
   /AWS_FLB_CHERRY_PICKS
 
-RUN cat /AWS_FLB_CHERRY_PICKS | sed '/^#/d' \
-  | xargs -l bash -c 'git fetch $0 $1 && git cherry-pick $2'
-
-RUN echo "Cherry Pick Patch Summary:"; \
-  git log --oneline \
-  -`cat /AWS_FLB_CHERRY_PICKS | sed '/^#/d' | sed '/^\s*$/d' | wc -l | awk '{ print $1+1 }'` \
-  | tac | awk '{ print "Commit",NR-1,"--",$0 }'; sleep 2
-
+RUN AWS_FLB_CHERRY_PICKS_COUNT=`cat /AWS_FLB_CHERRY_PICKS | sed '/^#/d' | sed '/^\s*$/d' | wc -l | awk '{ print $1 }'`; \
+  if [ $AWS_FLB_CHERRY_PICKS_COUNT -gt 0 ]; \
+  then \
+    cat /AWS_FLB_CHERRY_PICKS | sed '/^#/d' \
+    | xargs -l bash -c 'git fetch $0 $1 && git cherry-pick $2'; \
+    \
+    echo "Cherry Pick Patch Summary:"; \
+    git log --oneline \
+    -$((AWS_FLB_CHERRY_PICKS_COUNT+1)) \
+    | tac | awk '{ print "Commit",NR-1,"--",$0 }'; sleep 2; \
+  fi
+
+# Build Fluent Bit
 RUN cmake -DFLB_DEBUG=On \
           -DFLB_DEV=On \
           -DFLB_VALGRIND=On \
