yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13066 from keynslug/fix/s3-bridge/desc-html 

chore(s3-bridge): decrease default aggregation settings
This commit is contained in:
Andrew Mayorov 2024-05-17 19:43:19 +02:00 committed by GitHub
parent d37edd69ae 385ac268d7
commit fc3f525a67
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_bridge_s3/src/emqx_bridge_s3_upload.erl
View File

@ -161,7 +161,7 @@ fields(s3_aggregation) ->
emqx_schema:duration_s(), emqx_schema:duration_s(),
#{ #{
required => false, required => false,
default => <<"1h">>, default => <<"30m">>,
desc => ?DESC(s3_aggregation_interval) desc => ?DESC(s3_aggregation_interval)
} }
)}, )},
@ -170,7 +170,7 @@ fields(s3_aggregation) ->
pos_integer(), pos_integer(),
#{ #{
required => false, required => false,
default => <<"1000000">>, default => <<"100000">>,
desc => ?DESC(s3_aggregation_max_records) desc => ?DESC(s3_aggregation_max_records)
} }
)} )}

16
rel/i18n/emqx_bridge_s3_upload.hocon
View File

@ -73,17 +73,17 @@ s3_aggregated_upload_key.desc:
"""Template for the S3 object key of an aggregated upload.<br/> """Template for the S3 object key of an aggregated upload.<br/>
Template may contain placeholders for the following variables: Template may contain placeholders for the following variables:
<ul> <ul>
<li><code>${action}</code>: name of the action (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>${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): <li><code>${datetime.{format}}</code>: date and time when aggregation started, formatted according to the <code>{format}</code> string (required):
<ul> <ul>
<li><code>${datetime.rfc3339utc}</code>: RFC3339-formatted date and time in UTC,<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.rfc3339}</code>: RFC3339-formatted date and time in local timezone,</li>
<li><code>${datetime.unix}</code>: Unix timestamp.<li/> <li><code>${datetime.unix}</code>: Unix timestamp.</li>
</ul> </ul>
<li/> </li>
<li><code>${datetime_until.{format}}</code>: date and time when aggregation ended, with the same formatting options.<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><code>${sequence}</code>: sequence number of the aggregated upload within the same time interval (required).</li>
</ul> </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.""" 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."""