From fc2ddc634955192b053e463305e6d31fae3f961b Mon Sep 17 00:00:00 2001 From: Zhongwen Deng Date: Wed, 15 Mar 2023 20:36:09 +0800 Subject: [PATCH 1/3] chore: add changelog for configuration information on Dashboard is garbled --- changes/ce/fix-10130.en.md | 4 ++++ changes/ce/fix-10130.zh.md | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 changes/ce/fix-10130.en.md create mode 100644 changes/ce/fix-10130.zh.md diff --git a/changes/ce/fix-10130.en.md b/changes/ce/fix-10130.en.md new file mode 100644 index 000000000..d829e2c72 --- /dev/null +++ b/changes/ce/fix-10130.en.md @@ -0,0 +1,4 @@ +Fix the EMQX node started by environment variable configuration cannot get the correct configuration information through HTTP API. +For example: `EMQX_STATSD__SERVER='127.0.0.1:8124' . /bin/emqx start` +and the Statsd configuration information on Dashboard is garbled (not '127.0.0.1:8124'). +Related PR: [HOCON:234](https://github.com/emqx/hocon/pull/234). diff --git a/changes/ce/fix-10130.zh.md b/changes/ce/fix-10130.zh.md new file mode 100644 index 000000000..19c092fdf --- /dev/null +++ b/changes/ce/fix-10130.zh.md @@ -0,0 +1,3 @@ +修复通过环境变量配置启动的 EMQX 节点无法通过HTTP API获取到正确的配置信息。 +比如：`EMQX_STATSD__SERVER='127.0.0.1:8124' ./bin/emqx start` 后通过 Dashboard看到的 Statsd 配置信息是乱码。 +相关 PR: [HOCON:234](https://github.com/emqx/hocon/pull/234). From 60677bc4009732e5409e0d7c263e99f34c0ff574 Mon Sep 17 00:00:00 2001 From: Zhongwen Deng Date: Wed, 15 Mar 2023 20:36:40 +0800 Subject: [PATCH 2/3] chore: remove unuse code --- apps/emqx_management/src/emqx_mgmt_api_configs.erl | 1 - apps/emqx_plugins/src/emqx_plugins_sup.erl | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/apps/emqx_management/src/emqx_mgmt_api_configs.erl b/apps/emqx_management/src/emqx_mgmt_api_configs.erl index de93a1071..2e6aac849 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_configs.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_configs.erl @@ -49,7 +49,6 @@ <<"authorization">>, <<"authentication">>, <<"rpc">>, - <<"db">>, <<"connectors">>, <<"slow_subs">>, <<"psk_authentication">>, diff --git a/apps/emqx_plugins/src/emqx_plugins_sup.erl b/apps/emqx_plugins/src/emqx_plugins_sup.erl index 31427aaf6..f22daa9b8 100644 --- a/apps/emqx_plugins/src/emqx_plugins_sup.erl +++ b/apps/emqx_plugins/src/emqx_plugins_sup.erl @@ -26,18 +26,6 @@ start_link() -> supervisor:start_link({local, ?MODULE}, ?MODULE, []). init([]) -> - %% TODO: Add monitor plugins change. - Monitor = emqx_plugins_monitor, - _Children = [ - #{ - id => Monitor, - start => {Monitor, start_link, []}, - restart => permanent, - shutdown => brutal_kill, - type => worker, - modules => [Monitor] - } - ], SupFlags = #{ strategy => one_for_one, From 597bfbe310896649c2eb14c21cca07763425d309 Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Wed, 15 Mar 2023 20:48:29 +0800 Subject: [PATCH 3/3] chore: update changes/ce/fix-10130.en.md Co-authored-by: Zaiming (Stone) Shi --- changes/ce/fix-10130.en.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/changes/ce/fix-10130.en.md b/changes/ce/fix-10130.en.md index d829e2c72..98484e38f 100644 --- a/changes/ce/fix-10130.en.md +++ b/changes/ce/fix-10130.en.md @@ -1,4 +1,3 @@ -Fix the EMQX node started by environment variable configuration cannot get the correct configuration information through HTTP API. -For example: `EMQX_STATSD__SERVER='127.0.0.1:8124' . /bin/emqx start` -and the Statsd configuration information on Dashboard is garbled (not '127.0.0.1:8124'). -Related PR: [HOCON:234](https://github.com/emqx/hocon/pull/234). +Fix garbled config display in dashboard when the value is originally from environment variables. +For example, `env EMQX_STATSD__SERVER='127.0.0.1:8124' . /bin/emqx start` results in unreadable string (not '127.0.0.1:8124') displayed in Dashboard's Statsd settings page. +Related PR: [HOCON#234](https://github.com/emqx/hocon/pull/234).