From 4f0aacbb2436e440cd809b13c3bff7d372322fde Mon Sep 17 00:00:00 2001
From: Drew Zhang <zhayuzhu@amazon.com>
Date: Mon, 8 Mar 2021 15:40:42 -0800
Subject: [PATCH] Bump version to v2.12.0

Signed-off-by: Drew Zhang <zhayuzhu@amazon.com>
---
 AWS_FOR_FLUENT_BIT_VERSION |  2 +-
 CHANGELOG.md               | 11 +++++++++++
 Dockerfile                 |  2 +-
 Dockerfile.plugins         |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION
index 46b81d815..d8b698973 100644
--- a/AWS_FOR_FLUENT_BIT_VERSION
+++ b/AWS_FOR_FLUENT_BIT_VERSION
@@ -1 +1 @@
-2.11.0
+2.12.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b4f3e0ee..dedde2498 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+### 2.12.0
+This release includes:
+* An Amazon Linux 2 Base
+* Fluent Bit [1.7.2](https://fluentbit.io/announcements/v1.7.2/)
+* Amazon CloudWatch Logs for Fluent Bit 1.6.0
+* Amazon Kinesis Streams for Fluent Bit 1.7.1
+* Amazon Kinesis Firehose for Fluent Bit 1.6.0
+
+Compared to `2.11.0` this release adds:
+* Enhancement - Add an option to send multiple log events as a record  [firehose:12](https://github.com/aws/amazon-kinesis-firehose-for-fluent-bit/issues/12)
+
 ### 2.11.0
 This release includes:
 * An Amazon Linux 2 Base
diff --git a/Dockerfile b/Dockerfile
index 50367d784..733f6289c 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.6.10
+ENV FLB_VERSION 1.7.2
 # branch to pull parsers from in github.com/fluent/fluent-bit-docker-image
 ENV FLB_DOCKER_BRANCH 1.6
 
diff --git a/Dockerfile.plugins b/Dockerfile.plugins
index 199e4b7a6..b5672d531 100644
--- a/Dockerfile.plugins
+++ b/Dockerfile.plugins
@@ -13,7 +13,7 @@ ARG KINESIS_PLUGIN_CLONE_URL=https://github.com/aws/amazon-kinesis-streams-for-f
 ARG KINESIS_PLUGIN_TAG=v1.7.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.5.1
+ARG FIREHOSE_PLUGIN_TAG=v1.6.0
 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.0