Bump to 2.31.3

Signed-off-by: Wesley Pettit <[email protected]>
aws · Feb 24, 2023 · 2451a16 · 2451a16
1 parent 0bba79a
commit 2451a16
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 4 deletions.
diff --git a/AWS_FLB_CHERRY_PICKS b/AWS_FLB_CHERRY_PICKS
@@ -40,4 +40,11 @@ https://github.com/matthewfala/fluent-bit.git sync-scheduler-fix-1.9 2614c46af3a
 # resolve user agent wrong type
 https://github.com/PettitWesley/fluent-bit.git user-agent-type-fix 0642f42e8097c159d7364f1ff97c0196484815ce
 https://github.com/PettitWesley/fluent-bit.git user-agent-type-fix ed21492a94e8ca156897afc32c73bcdc37bc6b0f
-https://github.com/PettitWesley/fluent-bit.git user-agent-type-fix 7c16af941bed91da9558e4e6b8cea98d3ef1fa0d
+https://github.com/PettitWesley/fluent-bit.git user-agent-type-fix 7c16af941bed91da9558e4e6b8cea98d3ef1fa0d
+
+# Resolve keepalive and priority scheduler issue
+https://github.com/PettitWesley/fluent-bit.git sync-io-keepalive-fix 7b4550486b7e8e02b773894d31a08b0cb18154e3
+
+https://github.com/PettitWesley/fluent-bit.git mk_event_inject_conn_fix 0f5efc921950feeee99d9251cb330b27d3639863
+
+https://github.com/PettitWesley/fluent-bit.git mk_event_add_corruption-one-commit 33651cca41e9f84ce8930a9bca9d3d7319e50fbd
diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION
@@ -1 +1 @@
-2.31.2-test-disable-imdsv1-no-release
+2.31.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+### 2.31.3
+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.2`, this release adds the following fix that we are working on getting accepted upstream:
+* 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)
+
+Same as `2.31.2`, 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 - 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)
+* 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 - Support Retry_Limit option in S3 plugin to set retries [fluent-bit:6475](https://github.com/fluent/fluent-bit/pull/6475)
+* 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)
+
 ### 2.31.2
 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.2",
+    "version": "2.31.3",
     "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.2",
+      "version": "2.31.3",
       "build": "1",
       "fluent-bit": "1.9.10",
       "kinesis-plugin": "v1.10.1",
@@ -12,6 +12,18 @@
       "latest": true,
       "stable": false
     },
+    {
+      "version": "2.31.2",
+      "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.1",
       "build": "1",