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

Merge pull request #8364 from emqx/sync-4.3 

Sync from 4.3
This commit is contained in:
zhouzb 2022-06-30 21:48:44 +08:00 committed by GitHub
parent 9d50e8f66b 9539446ca6
commit c74bbae22b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
priv/emqx.schema
View File

@ -1249,7 +1249,6 @@ end}.
%% @doc Whether the Server supports Exclusive Subscriptions. %% @doc Whether the Server supports Exclusive Subscriptions.
{mapping, "zone.$name.exclusive_subscription", "emqx.zones", [ {mapping, "zone.$name.exclusive_subscription", "emqx.zones", [
{default, false},
{datatype, {enum, [true, false]}} {datatype, {enum, [true, false]}}
]}. ]}.
@ -2603,6 +2602,10 @@ end}.
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Operating System Monitor %% Operating System Monitor
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
{mapping, "os_mon.memsup_improved_system_memory_data", "os_mon.memsup_improved_system_memory_data", [
{default, true},
{datatype, {enum, [true, false]}}
]}.
{mapping, "os_mon.cpu_check_interval", "emqx.os_mon", [ {mapping, "os_mon.cpu_check_interval", "emqx.os_mon", [
{default, 60}, {default, 60},