From 631ab214b92d46f3df32c1c5f6b18d73594a0921 Mon Sep 17 00:00:00 2001
From: Wesley Pettit <wppttt@amazon.com>
Date: Thu, 18 May 2023 17:33:48 -0700
Subject: [PATCH] Bump to 2.32.0

Signed-off-by: Wesley Pettit <wppttt@amazon.com>
---
 AWS_FLB_CHERRY_PICKS       |  9 +++++++++
 AWS_FOR_FLUENT_BIT_VERSION |  2 +-
 CHANGELOG.md               | 12 ++++++++++++
 linux.version              |  2 +-
 windows.versions           | 14 +++++++++++++-
 5 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/AWS_FLB_CHERRY_PICKS b/AWS_FLB_CHERRY_PICKS
index 979529498..7c04b7c00 100644
--- a/AWS_FLB_CHERRY_PICKS
+++ b/AWS_FLB_CHERRY_PICKS
@@ -92,3 +92,12 @@ https://github.com/fluent/fluent-bit.git 1.9 d3a0697c3c4a876250cc6c2c4ff44cd7790
 # windows: fix time zone offset https://github.com/fluent/fluent-bit/pull/6368
 https://github.com/fluent/fluent-bit.git 1.9 cae9a8f9cb6eab7449f14d914f9ba1d8d4e93cf0
 
+# quick fix for S3 key $INDEX bug https://github.com/aws/aws-for-fluent-bit/issues/653
+https://github.com/PettitWesley/fluent-bit.git index_s3_key_format_quick_fix 5e48218670681aef152aeedcf90a4593ac623470
+
+# Feature: AWS Profile support: https://github.com/fluent/fluent-bit/pull/7127
+https://github.com/PettitWesley/fluent-bit.git aws_distro_profile_support d7b5603aa69bc2fd57695748f9a0bf70330fd800
+
+# Feature: Amazon Managed Prometheus Support: https://github.com/fluent/fluent-bit/pull/6989/commits
+https://github.com/Claych/fluent-bit.git AMP-for-auth-1.9 8eb9212b7f53ee14b42bd51bfbe0231afe90fb12
+
diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION
index 349e970b5..02c7ff42d 100644
--- a/AWS_FOR_FLUENT_BIT_VERSION
+++ b/AWS_FOR_FLUENT_BIT_VERSION
@@ -1 +1 @@
-2.31.11
\ No newline at end of file
+2.32.0
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dc370fbc..52ce798f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+### 2.32.0
+This release includes:
+* Fluent Bit [1.9.10](https://fluentbit.io/announcements/v1.9.10/)
+* Amazon CloudWatch Logs for Fluent Bit 1.9.3
+* Amazon Kinesis Streams for Fluent Bit 1.10.2
+* Amazon Kinesis Firehose for Fluent Bit 1.7.2
+
+Compared to `2.31.11` this release adds:
+* Bug - Fix incorrect decrementing of s3_key_format $INDEX on Multipart Upload failure [aws-for-fluent-bit:653](https://github.com/aws/aws-for-fluent-bit/issues/653)
+* Feature - Support for Amazon Managed Prometheus in prometheus output [fluent-bit:6989](https://github.com/fluent/fluent-bit/pull/6989)
+* Feature - Support using a specific AWS Profile in each output definition [fluent-bit:7127](https://github.com/fluent/fluent-bit/pull/7127)
+
 ### 2.31.11
 This release includes:
 * Fluent Bit [1.9.10](https://fluentbit.io/announcements/v1.9.10/)
diff --git a/linux.version b/linux.version
index 3ba48d2e8..6c4cf4006 100644
--- a/linux.version
+++ b/linux.version
@@ -1,6 +1,6 @@
 {
   "linux": {
-    "version": "2.31.11",
+    "version": "2.32.0",
     "latest": "true",
     "build": "1",
     "fluent-bit": "1.9.10",
diff --git a/windows.versions b/windows.versions
index 104670d40..7d92c3a3b 100644
--- a/windows.versions
+++ b/windows.versions
@@ -1,7 +1,7 @@
 {
   "windows": [
     {
-      "version": "2.31.11",
+      "version": "2.32.0",
       "build": "1",
       "fluent-bit": "1.9.10",
       "kinesis-plugin": "v1.10.2",
@@ -12,6 +12,18 @@
       "latest": true,
       "stable": false
     },
+    {
+      "version": "2.31.11",
+      "build": "1",
+      "fluent-bit": "1.9.10",
+      "kinesis-plugin": "v1.10.2",
+      "firehose-plugin": "v1.7.2",
+      "cloudwatch-plugin": "v1.9.3",
+      "openssl": "3.0.7",
+      "flexBison": "2.5.22",
+      "latest": false,
+      "stable": false
+    },
     {
       "version": "2.31.10",
       "build": "1",