From b7815b4cacb64786f5d8f280d13b3f986134c5d7 Mon Sep 17 00:00:00 2001 From: Wesley Pettit Date: Mon, 10 Apr 2023 22:26:11 -0700 Subject: [PATCH 1/5] Changelog and cherry picks for 2.31.9 Signed-off-by: Wesley Pettit --- AWS_FLB_CHERRY_PICKS | 17 +++++++++++++++++ CHANGELOG.md | 13 +++++++++++++ 2 files changed, 30 insertions(+) diff --git a/AWS_FLB_CHERRY_PICKS b/AWS_FLB_CHERRY_PICKS index cff191de6..125cc837e 100644 --- a/AWS_FLB_CHERRY_PICKS +++ b/AWS_FLB_CHERRY_PICKS @@ -52,3 +52,20 @@ https://github.com/PettitWesley/fluent-bit.git s3-str-fixes 38303131e04926527788 https://github.com/fluent/fluent-bit.git master b725d6b8b289fccde4e9b31d3f3ac61f13711ef9 # use total_chunks_up in max_chunks_up memory overlimit warn message https://github.com/fluent/fluent-bit.git master 9c72f3ac6510b701277936897cd9701ffce3646e + +# CloudWatch Logs options for connecting to CWL test destinations: tls verify and port +https://github.com/matthewfala/fluent-bit.git immutable-cwl-net-options 5d9692f00b5295728bf0340d332896a7cc450a7e + +# Go exit fix +https://github.com/PettitWesley/fluent-bit.git go-exit-fix-1_9-one-commit ce5739c20b972320dc485587d56c8b6b21f61934 + +# sds printf off by 1 fix: https://github.com/fluent/fluent-bit/issues/7143 +# from PR: https://github.com/fluent/fluent-bit/pull/7148/commits +https://github.com/PettitWesley/fluent-bit.git sds-off-by-1-1_9 e7ba91a6c05d884cc6745d8e49faeb1a92909679 +https://github.com/PettitWesley/fluent-bit.git sds-off-by-1-1_9 6c9e49a627931bd1bdbd8d965a64bfd5c325e01d +https://github.com/PettitWesley/fluent-bit.git sds-off-by-1-1_9 f45b3027dfd0ebac20e35df16bed14020718b780 + +# cw mem leak fix (leak is only a few bytes no matter the runtime/throughput) https://github.com/fluent/fluent-bit/pull/7158/commits +https://github.com/PettitWesley/fluent-bit.git cw-stream-free-fix 8e7809ee9f4e7837a5fff75842a47ca5fd42b526 + + diff --git a/CHANGELOG.md b/CHANGELOG.md index c3fadc95d..adffec197 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,20 @@ # Changelog +### 2.31.8 +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 * Enhancement - Add clear info message when chunks are removed because `storage.total_limit_size` is reached [fluent-bit:6719](https://github.com/fluent/fluent-bit/pull/6719) +<<<<<<< HEAD +======= +* Bug - Fix S3 ARN parsing in [init image](https://github.com/aws/aws-for-fluent-bit/blob/mainline/use_cases/init-process-for-fluent-bit/README.md) that prevents it from being used in US Gov Cloud and China partitions [aws-for-fluent-bit:617](https://github.com/aws/aws-for-fluent-bit/issues/617) +* Bug - Fix SIGSEGV on shutdown when multiple instances of the same go plugin are configured [aws-for-fluent-bit:613](https://github.com/aws/aws-for-fluent-bit/issues/613) +* Bug - Fix off by one error that can lead to SDS string truncation [fluent-bit:7143](https://github.com/fluent/fluent-bit/issues/7143) +* Bug - fix minor memory leak in cloudwatch_logs that leads no more than ~1KB of un-freed memory when the `log_stream_name` option is configured. +>>>>>>> Changelog and cherry picks for 2.31.9 ### 2.31.8 From bdcad709c3bf860d0b52593570db3b3fa0d501fd Mon Sep 17 00:00:00 2001 From: Wesley Pettit Date: Mon, 10 Apr 2023 22:26:32 -0700 Subject: [PATCH 2/5] Revert "Revert "init: fix S3 ARN parsing #617"" This reverts commit 760bfed37ebc1e3ed0fe7c03a36e0a2c774c0656. --- init/fluent_bit_init_process.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/init/fluent_bit_init_process.go b/init/fluent_bit_init_process.go index afff69863..b65161d41 100644 --- a/init/fluent_bit_init_process.go +++ b/init/fluent_bit_init_process.go @@ -195,17 +195,20 @@ func processConfigFile(path string) { } } -func getS3ConfigFile(arn string) string { +func getS3ConfigFile(userInput string) string { // Preparation for downloading S3 config files if !s3ClientCreated { createS3Client() } // e.g. "arn:aws:s3:::user-bucket/s3_parser.conf" - arnBucketFile := arn[13:] - bucketAndFile := strings.SplitN(arnBucketFile, "/", 2) + s3ARN, err := arn.Parse(userInput) + if err != nil { + logrus.Fatalf("[FluentBit Init Process] Could not parse arn: %s\n", userInput) + } + bucketAndFile := strings.SplitN(s3ARN.Resource, "/", 2) if len(bucketAndFile) != 2 { - logrus.Fatalf("[FluentBit Init Process] Unrecognizable arn: %s\n", arn) + logrus.Fatalf("[FluentBit Init Process] Could not parse arn: %s\n", userInput) } bucketName := bucketAndFile[0] From b7fe13270e6a1c68589af331486e8d963db6c5e8 Mon Sep 17 00:00:00 2001 From: Wesley Pettit Date: Mon, 10 Apr 2023 22:27:46 -0700 Subject: [PATCH 3/5] Bump to 2.31.9 Signed-off-by: Wesley Pettit --- AWS_FLB_CHERRY_PICKS | 2 ++ CHANGELOG.md | 2 +- linux.version | 2 +- windows.versions | 14 +++++++++++++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/AWS_FLB_CHERRY_PICKS b/AWS_FLB_CHERRY_PICKS index 125cc837e..e19eed445 100644 --- a/AWS_FLB_CHERRY_PICKS +++ b/AWS_FLB_CHERRY_PICKS @@ -58,6 +58,8 @@ https://github.com/matthewfala/fluent-bit.git immutable-cwl-net-options 5d9692f0 # Go exit fix https://github.com/PettitWesley/fluent-bit.git go-exit-fix-1_9-one-commit ce5739c20b972320dc485587d56c8b6b21f61934 +# fix build warning from original go fix +https://github.com/PettitWesley/fluent-bit.git fix-proxy-go-destroy 79e4e10f31b7468496d4dddb784b502b3ba9e353 # sds printf off by 1 fix: https://github.com/fluent/fluent-bit/issues/7143 # from PR: https://github.com/fluent/fluent-bit/pull/7148/commits diff --git a/CHANGELOG.md b/CHANGELOG.md index adffec197..32fee4207 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -### 2.31.8 +### 2.31.9 This release includes: * Fluent Bit [1.9.10](https://fluentbit.io/announcements/v1.9.10/) * Amazon CloudWatch Logs for Fluent Bit 1.9.3 diff --git a/linux.version b/linux.version index d05070d28..f85bd0f02 100644 --- a/linux.version +++ b/linux.version @@ -1,6 +1,6 @@ { "linux": { - "version": "2.31.8", + "version": "2.31.9", "latest": "true", "build": "1", "fluent-bit": "1.9.10", diff --git a/windows.versions b/windows.versions index 683987ce6..92900db6e 100644 --- a/windows.versions +++ b/windows.versions @@ -1,7 +1,7 @@ { "windows": [ { - "version": "2.31.8", + "version": "2.31.9", "build": "1", "fluent-bit": "1.9.10", "kinesis-plugin": "v1.10.2", @@ -12,6 +12,18 @@ "latest": true, "stable": false }, + { + "version": "2.31.8", + "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.7", "build": "1", From 16d34a10d36b6ed292732ea41bca2b9a02f598e1 Mon Sep 17 00:00:00 2001 From: Wesley Pettit Date: Wed, 12 Apr 2023 21:33:47 -0700 Subject: [PATCH 4/5] Revert "2.31.8 CVE - Revert "cherry-picks: add go plugin exit fix"" This reverts commit 8cf0c5633f789e84952a07bafcd0e97a475290d0. --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32fee4207..3a2911e90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,13 +8,11 @@ This release includes: * Amazon Kinesis Firehose for Fluent Bit 1.7.2 * Enhancement - Add clear info message when chunks are removed because `storage.total_limit_size` is reached [fluent-bit:6719](https://github.com/fluent/fluent-bit/pull/6719) -<<<<<<< HEAD -======= * Bug - Fix S3 ARN parsing in [init image](https://github.com/aws/aws-for-fluent-bit/blob/mainline/use_cases/init-process-for-fluent-bit/README.md) that prevents it from being used in US Gov Cloud and China partitions [aws-for-fluent-bit:617](https://github.com/aws/aws-for-fluent-bit/issues/617) * Bug - Fix SIGSEGV on shutdown when multiple instances of the same go plugin are configured [aws-for-fluent-bit:613](https://github.com/aws/aws-for-fluent-bit/issues/613) * Bug - Fix off by one error that can lead to SDS string truncation [fluent-bit:7143](https://github.com/fluent/fluent-bit/issues/7143) * Bug - fix minor memory leak in cloudwatch_logs that leads no more than ~1KB of un-freed memory when the `log_stream_name` option is configured. ->>>>>>> Changelog and cherry picks for 2.31.9 +* Bug - Fix SIGSEGV on shutdown when multiple instances of the same go plugin are configured [aws-for-fluent-bit:613](https://github.com/aws/aws-for-fluent-bit/issues/613) ### 2.31.8 From cb541c8f143b4c992b6fb5968c2a128d165f0d49 Mon Sep 17 00:00:00 2001 From: Wesley Pettit Date: Thu, 13 Apr 2023 18:34:30 -0700 Subject: [PATCH 5/5] 2.31.9 Signed-off-by: Wesley Pettit --- AWS_FOR_FLUENT_BIT_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION index b1af3c7a7..9467d6ebb 100644 --- a/AWS_FOR_FLUENT_BIT_VERSION +++ b/AWS_FOR_FLUENT_BIT_VERSION @@ -1 +1 @@ -2.31.8 \ No newline at end of file +2.31.9 \ No newline at end of file