From 2a7411bd5f6ea44f59904c770219f94e052c7dc8 Mon Sep 17 00:00:00 2001
From: Matthew Fala <falamatt@amazon.com>
Date: Fri, 29 Mar 2024 15:51:38 -0700
Subject: [PATCH] 2.32.2: Release new version with rollback

Signed-off-by: Matthew Fala <falamatt@amazon.com>
---
 AWS_FOR_FLUENT_BIT_VERSION |  2 +-
 CHANGELOG.md               | 13 +++++++++++++
 linux.version              |  2 +-
 windows.versions           | 26 +++++++++++++++++++++++++-
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION
index 9e1c9389b..544fe5d43 100644
--- a/AWS_FOR_FLUENT_BIT_VERSION
+++ b/AWS_FOR_FLUENT_BIT_VERSION
@@ -1 +1 @@
-2.32.0.20240304
+2.32.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5506c970b..aee9ae701 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+### 2.32.2
+*This release is a rollback to version 2.32.0.20231031 after issues are detected in 2.32.1*
+*This release has the same Fluent Bit contents as 2.32.0, and is simply a linux-only re-build for recent patches in dependencies installed in the image. Th
+ere are no windows images for this release.*
+* Amazon Linux Base: [2.0.20231024.1](https://docs.aws.amazon.com/AL2/latest/relnotes/relnotes-20231024.html)
+
+### 2.32.1
+This release includes:
+* Fluent Bit [1.9.10](https://github.com/fluent/fluent-bit/tree/v1.9.10)
+* Amazon CloudWatch Logs for Fluent Bit 1.9.4
+* Amazon Kinesis Streams for Fluent Bit 1.10.2
+* Amazon Kinesis Firehose for Fluent Bit 1.7.2
+
 ### 2.32.0.20240304 Linux re-build
 
 *This release has the same Fluent Bit contents as 2.32.0, and is simply a linux-only re-build for recent patches in dependencies installed in the image. There are no windows images for this release.* 
diff --git a/linux.version b/linux.version
index b27f976b5..262cdeb78 100644
--- a/linux.version
+++ b/linux.version
@@ -1,6 +1,6 @@
 {
   "linux": {
-    "version": "2.32.0.20240304",
+    "version": "2.32.2",
     "latest": "true",
     "build": "1",
     "fluent-bit": "1.9.10",
diff --git a/windows.versions b/windows.versions
index fd2ece42a..cfecb4be4 100644
--- a/windows.versions
+++ b/windows.versions
@@ -1,7 +1,7 @@
 {
   "windows": [
     {
-      "version": "2.32.0",
+      "version": "2.32.2",
       "build": "1",
       "fluent-bit": "1.9.10",
       "kinesis-plugin": "v1.10.2",
@@ -12,6 +12,30 @@
       "latest": true,
       "stable": false
     },
+    {
+      "version": "2.32.1",
+      "build": "1",
+      "fluent-bit": "1.9.10",
+      "kinesis-plugin": "v1.10.2",
+      "firehose-plugin": "v1.7.2",
+      "cloudwatch-plugin": "v1.9.4",
+      "openssl": "3.0.7",
+      "flexBison": "2.5.22",
+      "latest": false,
+      "stable": false
+    },
+    {
+      "version": "2.32.0",
+      "build": "1",
+      "fluent-bit": "1.9.10",
+      "kinesis-plugin": "v1.10.2",
+      "firehose-plugin": "v1.7.2",
+      "cloudwatch-plugin": "v1.9.4",
+      "openssl": "3.0.7",
+      "flexBison": "2.5.22",
+      "latest": false,
+      "stable": false
+    },
     {
       "version": "2.31.12",
       "build": "1",