Ivan Dyachkov 2 лет назад
Родитель
Сommit
f127bf53b3

+ 2 - 2
apps/emqx/include/emqx_release.hrl

@@ -32,7 +32,7 @@
 %% `apps/emqx/src/bpapi/README.md'
 
 %% Opensource edition
--define(EMQX_RELEASE_CE, "5.6.0-rc.4").
+-define(EMQX_RELEASE_CE, "5.6.0-rc.5").
 
 %% Enterprise edition
--define(EMQX_RELEASE_EE, "5.6.0-rc.4").
+-define(EMQX_RELEASE_EE, "5.6.0-rc.5").

+ 12 - 0
changes/e5.6.0.en.md

@@ -163,6 +163,15 @@
 
 - [#12746](https://github.com/emqx/emqx/pull/12746) Added `username` log field. If MQTT client is connected with a non-empty username the logs and traces will include `username` field.
 
+- [#12785](https://github.com/emqx/emqx/pull/12785) Added `timestamp_format` config option to log handers.
+
+This new option supports the following values:
+
+- `auto`: Automatically determines the timestamp format based on the log formatter being used.
+  Utilizes `rfc3339` format for text formatters, and `epoch` format for JSON formatters.
+- `epoch`: Represents timestamps in microseconds precision Unix epoch format.
+- `rfc3339`: Uses RFC3339 compliant format for date-time strings. For example: `2024-03-26T11:52:19.777087+00:00`.
+
 ## Bug Fixes
 
 - [#11868](https://github.com/emqx/emqx/pull/11868) Fixed a bug where will messages were not published after session takeover.
@@ -245,6 +254,9 @@ When the cluster is empty (more precisely, routing tables are empty), try to add
 
 The version also logs instructions for how to manually resolve if conflict is detected in a running cluster.
 
+- [#12786](https://github.com/emqx/emqx/pull/12786) Added a strict check that prevents replicant nodes from connecting to the core nodes running with a different version of EMQX application.
+Effectively it means that during the rolling upgrades the replicant nodes can only work if there is at least one core node with the matching EMQX release.
+
 ## Breaking Changes
 
 - [#12576](https://github.com/emqx/emqx/pull/12576) Starting from 5.6, the "Configuration Manual" document will no longer include the `bridges` config root.

+ 12 - 0
changes/v5.6.0.en.md

@@ -136,6 +136,15 @@
 
 - [#12746](https://github.com/emqx/emqx/pull/12746) Added `username` log field. If MQTT client is connected with a non-empty username the logs and traces will include `username` field.
 
+- [#12785](https://github.com/emqx/emqx/pull/12785) Added `timestamp_format` config option to log handers.
+
+This new option supports the following values:
+
+- `auto`: Automatically determines the timestamp format based on the log formatter being used.
+  Utilizes `rfc3339` format for text formatters, and `epoch` format for JSON formatters.
+- `epoch`: Represents timestamps in microseconds precision Unix epoch format.
+- `rfc3339`: Uses RFC3339 compliant format for date-time strings. For example: `2024-03-26T11:52:19.777087+00:00`.
+
 ## Bug Fixes
 
 - [#11868](https://github.com/emqx/emqx/pull/11868) Fixed a bug where will messages were not published after session takeover.
@@ -202,6 +211,9 @@ When the cluster is empty (more precisely, routing tables are empty), try to add
 
 The version also logs instructions for how to manually resolve if conflict is detected in a running cluster.
 
+- [#12786](https://github.com/emqx/emqx/pull/12786) Added a strict check that prevents replicant nodes from connecting to the core nodes running with a different version of EMQX application.
+Effectively it means that during the rolling upgrades the replicant nodes can only work if there is at least one core node with the matching EMQX release.
+
 ## Breaking Changes
 
 - [#12576](https://github.com/emqx/emqx/pull/12576) Starting from 5.6, the "Configuration Manual" document will no longer include the `bridges` config root.

+ 2 - 2
deploy/charts/emqx-enterprise/Chart.yaml

@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 5.6.0-rc.4
+version: 5.6.0-rc.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 5.6.0-rc.4
+appVersion: 5.6.0-rc.5

+ 2 - 2
deploy/charts/emqx/Chart.yaml

@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 5.6.0-rc.4
+version: 5.6.0-rc.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 5.6.0-rc.4
+appVersion: 5.6.0-rc.5