From f127bf53b362a140f398d49ded7e6e911303d660 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Tue, 26 Mar 2024 17:51:15 +0100 Subject: [PATCH] chore: 5.6.0-rc.5 --- apps/emqx/include/emqx_release.hrl | 4 ++-- changes/e5.6.0.en.md | 12 ++++++++++++ changes/v5.6.0.en.md | 12 ++++++++++++ deploy/charts/emqx-enterprise/Chart.yaml | 4 ++-- deploy/charts/emqx/Chart.yaml | 4 ++-- 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index 44326830c..84161719d 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/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"). diff --git a/changes/e5.6.0.en.md b/changes/e5.6.0.en.md index c0ddc66ba..514271569 100644 --- a/changes/e5.6.0.en.md +++ b/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. diff --git a/changes/v5.6.0.en.md b/changes/v5.6.0.en.md index cb71558ff..3c19b84ed 100644 --- a/changes/v5.6.0.en.md +++ b/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. diff --git a/deploy/charts/emqx-enterprise/Chart.yaml b/deploy/charts/emqx-enterprise/Chart.yaml index 5eb83eb9c..cbd490f37 100644 --- a/deploy/charts/emqx-enterprise/Chart.yaml +++ b/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 diff --git a/deploy/charts/emqx/Chart.yaml b/deploy/charts/emqx/Chart.yaml index 67c2098ce..2b6a28586 100644 --- a/deploy/charts/emqx/Chart.yaml +++ b/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