bump to 2.31.0

Signed-off-by: Matthew Fala <falamatt@amazon.com>
aws · Jan 19, 2023 · 21c287e · 21c287e
1 parent 41c8d93
commit 21c287e
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 3 deletions.
diff --git a/AWS_FLB_CHERRY_PICKS b/AWS_FLB_CHERRY_PICKS
@@ -5,3 +5,21 @@ https://github.com/matthewfala/fluent-bit.git ecs-datadog-sequential-revert 9831
 https://github.com/matthewfala/fluent-bit.git aoss-1.9 1633c49aadad55bac483c5e55772de0e6c29704a
 https://github.com/matthewfala/fluent-bit.git aoss-1.9 4dc5368502d22d5ed54f06e5700242a0138e3ff7
 https://github.com/matthewfala/fluent-bit.git aoss-1.9 f7be9ba54fca28a4f4d154f8ba55e53a81f31130
+
+# 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
+https://github.com/Claych/fluent-bit.git clay-aws_strftime_precision-1.9 e225ff7374fbc5e290b0090652158e3d2db5d8a6
+
+# S3 sync iO Commit
+https://github.com/PettitWesley/fluent-bit.git s3-always-sync 232367a705c3788aecdda827cc99a69f2b7a01ef
+
+# S3 log_key warn fix
+https://github.com/PettitWesley/fluent-bit.git s3-log-key-warn-1_9 308b73558fb2d3dafb3b80feb0c68dc9b2c18186
+
+# ECS Filter
+https://github.com/PettitWesley/fluent-bit.git ecs-empty-metadata-fix-one-commit 24934c938e8f63700edf1230a09e4483ac5df6a3
diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION
@@ -1 +1 @@
-2.30.0
+2.31.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+### 2.31.0
+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.30.0`, this release adds the following feature that we are working on getting accepted upstream:
+* 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)
+* 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)
+* Enhancement - Transition S3 to fully synchronous file uploads to improve plugin stability [fluent-bit:6573](https://github.com/fluent/fluent-bit/pull/6573)
+* 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)
+
+Same as `2.30.0`, this release includes the following fixes and features that we are working on getting accepted upstream:
+* Feature - Support OpenSearch Serverless data ingestion via OpenSearch plugin [fluent-bit:6448](https://github.com/fluent/fluent-bit/pull/6448)
+* 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)
+
 ### 2.30.0
 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.30.0",
+    "version": "2.31.0",
     "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.30.0",
+      "version": "2.31.0",
       "build": "1",
       "fluent-bit": "1.9.10",
       "kinesis-plugin": "v1.10.1",
@@ -12,6 +12,18 @@
       "latest": true,
       "stable": false
     },
+    {
+      "version": "2.30.0",
+      "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.29.1",
       "build": "1",