From 7e6f61f818f0bc4bed88fd0c46b6ef44b1673af2 Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <encube.ul@gmail.com>
Date: Fri, 17 May 2024 14:13:49 +0200
Subject: [PATCH 1/3] fix(s3-bridge): properly format bulleted list in field
 description

---
 rel/i18n/emqx_bridge_s3_upload.hocon | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/rel/i18n/emqx_bridge_s3_upload.hocon b/rel/i18n/emqx_bridge_s3_upload.hocon
index 8b3768078..dbda1d6ce 100644
--- a/rel/i18n/emqx_bridge_s3_upload.hocon
+++ b/rel/i18n/emqx_bridge_s3_upload.hocon
@@ -73,17 +73,17 @@ s3_aggregated_upload_key.desc:
 """Template for the S3 object key of an aggregated upload.<br/>
 Template may contain placeholders for the following variables:
 <ul>
-<li><code>${action}</code>: name of the action (required).<li/>
-<li><code>${node}</code>: name of the EMQX node conducting the upload (required).<li/>
+<li><code>${action}</code>: name of the action (required).</li>
+<li><code>${node}</code>: name of the EMQX node conducting the upload (required).</li>
 <li><code>${datetime.{format}}</code>: date and time when aggregation started, formatted according to the <code>{format}</code> string (required):
     <ul>
-    <li><code>${datetime.rfc3339utc}</code>: RFC3339-formatted date and time in UTC,<li/>
-    <li><code>${datetime.rfc3339}</code>: RFC3339-formatted date and time in local timezone,<li/>
-    <li><code>${datetime.unix}</code>: Unix timestamp.<li/>
+    <li><code>${datetime.rfc3339utc}</code>: RFC3339-formatted date and time in UTC,</li>
+    <li><code>${datetime.rfc3339}</code>: RFC3339-formatted date and time in local timezone,</li>
+    <li><code>${datetime.unix}</code>: Unix timestamp.</li>
     </ul>
-<li/>
-<li><code>${datetime_until.{format}}</code>: date and time when aggregation ended, with the same formatting options.<li/>
-<li><code>${sequence}</code>: sequence number of the aggregated upload within the same time interval (required).<li/>
+</li>
+<li><code>${datetime_until.{format}}</code>: date and time when aggregation ended, with the same formatting options.</li>
+<li><code>${sequence}</code>: sequence number of the aggregated upload within the same time interval (required).</li>
 </ul>
 All other placeholders are considered invalid. Note that placeholders marked as required will be added as a path suffix to the S3 object key if they are missing from the template."""
 

From c348f759afb300f9064d50e6abd66560d1ebbedc Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <encube.ul@gmail.com>
Date: Fri, 17 May 2024 14:19:59 +0200
Subject: [PATCH 2/3] chore(s3-bridge): decrease default aggreg limit to 100K
 records

---
 apps/emqx_bridge_s3/src/emqx_bridge_s3_upload.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/emqx_bridge_s3/src/emqx_bridge_s3_upload.erl b/apps/emqx_bridge_s3/src/emqx_bridge_s3_upload.erl
index 6f79de907..c15f4af0e 100644
--- a/apps/emqx_bridge_s3/src/emqx_bridge_s3_upload.erl
+++ b/apps/emqx_bridge_s3/src/emqx_bridge_s3_upload.erl
@@ -170,7 +170,7 @@ fields(s3_aggregation) ->
                 pos_integer(),
                 #{
                     required => false,
-                    default => <<"1000000">>,
+                    default => <<"100000">>,
                     desc => ?DESC(s3_aggregation_max_records)
                 }
             )}

From 385ac268d70431ca19ad532f1d19a9fca329b190 Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <encube.ul@gmail.com>
Date: Fri, 17 May 2024 14:49:18 +0200
Subject: [PATCH 3/3] chore(s3-bridge): decrease default aggreg interval to 30
 minutes

---
 apps/emqx_bridge_s3/src/emqx_bridge_s3_upload.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/emqx_bridge_s3/src/emqx_bridge_s3_upload.erl b/apps/emqx_bridge_s3/src/emqx_bridge_s3_upload.erl
index c15f4af0e..c1a6ee6f7 100644
--- a/apps/emqx_bridge_s3/src/emqx_bridge_s3_upload.erl
+++ b/apps/emqx_bridge_s3/src/emqx_bridge_s3_upload.erl
@@ -161,7 +161,7 @@ fields(s3_aggregation) ->
                 emqx_schema:duration_s(),
                 #{
                     required => false,
-                    default => <<"1h">>,
+                    default => <<"30m">>,
                     desc => ?DESC(s3_aggregation_interval)
                 }
             )},