Bump to 2.6.0

aws · Jul 24, 2020 · 66c256f · 66c256f
1 parent f330818
commit 66c256f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION
@@ -1 +1 @@
-2.5.0
+2.6.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+### 2.6.0
+This release includes:
+* An Amazon Linux 2 Base
+* Fluent Bit [1.5.1](https://fluentbit.io/announcements/v1.5.1/)
+* Amazon CloudWatch Logs for Fluent Bit 1.3.1
+* Amazon Kinesis Streams for Fluent Bit 1.5.0
+* Amazon Kinesis Firehose for Fluent Bit 1.4.0
+
+Compared to `2.5.0` this release adds:
+* Feature - Add `log_key` option support to `firehose`, and `kinesis` plugins.
+* Bug - Add an empty check before sending log events to destinations for `firehose` and `cloudwatch` plugins.
+
 ### 2.5.0
 
 This release includes:

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM amazonlinux:latest as builder
 
 # Fluent Bit version; update these for each release
-ENV FLB_VERSION 1.5.0
+ENV FLB_VERSION 1.5.1
 # branch to pull parsers from in github.com/fluent/fluent-bit-docker-image
 ENV FLB_DOCKER_BRANCH 1.5
 
@@ -41,7 +41,7 @@ RUN yum install -y  \
 WORKDIR /tmp/fluent-bit-$FLB_VERSION/
 RUN git clone https://github.com/fluent/fluent-bit.git /tmp/fluent-bit-$FLB_VERSION/
 WORKDIR /tmp/fluent-bit-$FLB_VERSION/build/
-RUN git fetch && git checkout aws-patch-1_5_0
+RUN git fetch && git checkout ${FLB_DOCKER_BRANCH}
 RUN cmake -DFLB_DEBUG=On \
           -DFLB_TRACE=Off \
           -DFLB_JEMALLOC=On \