bump to 2.31.4

Signed-off-by: Matthew Fala <[email protected]>
aws · Feb 28, 2023 · 9bb03be · 9bb03be
1 parent c1d80ba
commit 9bb03be
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 10 deletions.
diff --git a/AWS_FLB_CHERRY_PICKS b/AWS_FLB_CHERRY_PICKS
@@ -6,10 +6,6 @@ https://github.com/matthewfala/fluent-bit.git aoss-1.9 1633c49aadad55bac483c5e55
 https://github.com/matthewfala/fluent-bit.git aoss-1.9 e1301bc52e209b6c6de8602bff12e0a98aefa0c0
 https://github.com/matthewfala/fluent-bit.git aoss-1.9 1917a7760d1bd400ac987620661b48e1bbc001ae
 
-# Various Features
-# S3 filename from log timestamp
-https://github.com/Claych/fluent-bit.git clay-s3-time-stamp-1.9 cd70b5e0f0e5efb5ecdd7a22742388ad687d197c
-
 # Kinesis time format
 https://github.com/Claych/fluent-bit.git clay-aws_strftime_precision-1.9 dfeff9de13ba7f1bbebe08fef24ec993dee7e392
 https://github.com/Claych/fluent-bit.git clay-aws_strftime_precision-1.9 66e85a11590f0045294a3d1b104baf73569a1dd0
@@ -31,9 +27,6 @@ https://github.com/matthewfala/fluent-bit.git ecs-datadog-sequential-revert ac30
 # Datadog Partial Fix Patch
 https://github.com/matthewfala/fluent-bit.git datadog-ecs-patch 3c1ad69ada5bb6f2e448c6f39a1a0ea6a6f4ff17
 
-# S3 retry limit configuration option -- Cherrypick from combined branch that resolves s3 merge conflict
-https://github.com/matthewfala/fluent-bit.git 2.31.1-all-cherrypicks 26c0b0c779b1747a1c751c05d96a597e443bf29a
-
 # Resolve cloudwatch_logs duplicate tag match SIGSEGV issue
 https://github.com/matthewfala/fluent-bit.git sync-scheduler-fix-1.9 2614c46af3a051b2758bef57f01f6b10a8e73b62
 

diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION
@@ -1 +1 @@
-2.31.3
+2.31.4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+### 2.31.4
+This release includes:
+* Fluent Bit [1.9.10](https://fluentbit.io/announcements/v1.9.10/)
+* Amazon CloudWatch Logs for Fluent Bit 1.9.1
+* Amazon Kinesis Streams for Fluent Bit 1.10.1
+* Amazon Kinesis Firehose for Fluent Bit 1.7.1
+
+Compared to `2.31.3`, this release removes the following fixes that may introduce instabilities to the S3 plugin:
+* Bug - Support Retry_Limit option in S3 plugin to set retries [fluent-bit:6475](https://github.com/fluent/fluent-bit/pull/6475)
+* Bug - Format S3 filename with timestamp from the first log in uploaded file, rather than the time the first log was buffered by the s3 output [aws-for-fluent-bit:459](https://github.com/aws/aws-for-fluent-bit/issues/459)
+
+Same as `2.31.3`, this release includes the following fixes and features that we are working on getting accepted upstream:
+* Bug - Resolve cloudwatch_logs duplicate tag match SIGSEGV issue introduced in 2.29.0 [aws-for-fluent-bit:542](https://github.com/aws/aws-for-fluent-bit/issues/542)
+* Feature - Add `kinesis_firehose` and `kinesis_streams` support for `time_key_format` milliseconds with `%3N` option, and nanoseconds `9N` and `%L` options [fluent-bit:2831](https://github.com/fluent/fluent-bit/issues/2831)
+* Feature - Support OpenSearch Serverless data ingestion via OpenSearch plugin [fluent-bit:6448](https://github.com/fluent/fluent-bit/pull/6448)
+* Enhancement - Transition S3 to fully synchronous file uploads to improve plugin stability [fluent-bit:6573](https://github.com/fluent/fluent-bit/pull/6573)
+* Bug - Mitigate Datadog output plugin issue by reverting recent PR [aws-for-fluent-bit:491](https://github.com/aws/aws-for-fluent-bit/issues/491)
+* Bug - Resolve S3 logic to display `log_key` missing warning message if the configured `log_key` field is missing from log payload [fluent-bit:6557](https://github.com/fluent/fluent-bit/pull/6557)
+* Bug - ECS Metadata filter gracefuly handle task metadata query errors and cache metadata processing state to improve performance [aws-for-fluent-bit:505](https://github.com/aws/aws-for-fluent-bit/issues/505)
+* Bug - Resolve a rare Datadog segfault that occurs when remapping tags [aws-for-fluent-bit:491](https://github.com/aws/aws-for-fluent-bit/issues/491)
+* Bug - Resolve `net.keepalive` SIGSEGV issue and priority event loop corruption bug [aws-for-fluent-bit:542](https://github.com/aws/aws-for-fluent-bit/issues/542)
+
 ### 2.31.3
 This release includes:
 * Fluent Bit [1.9.10](https://fluentbit.io/announcements/v1.9.10/)

diff --git a/linux.version b/linux.version
@@ -1,6 +1,6 @@
 {
   "linux": {
-    "version": "2.31.3",
+    "version": "2.31.4",
     "build": "1",
     "fluent-bit": "1.9.10",
     "kinesis-plugin": "v1.10.1",

diff --git a/windows.versions b/windows.versions
@@ -1,7 +1,7 @@
 {
   "windows": [
     {
-      "version": "2.31.3",
+      "version": "2.31.4",
       "build": "1",
       "fluent-bit": "1.9.10",
       "kinesis-plugin": "v1.10.1",
@@ -12,6 +12,18 @@
       "latest": true,
       "stable": false
     },
+    {
+      "version": "2.31.3",
+      "build": "1",
+      "fluent-bit": "1.9.10",
+      "kinesis-plugin": "v1.10.1",
+      "firehose-plugin": "v1.7.1",
+      "cloudwatch-plugin": "v1.9.1",
+      "openssl": "3.0.7",
+      "flexBison": "2.5.22",
+      "latest": false,
+      "stable": false
+    },
     {
       "version": "2.31.2",
       "build": "1",