Update to sysmon_handler 1.1.0

Also ensure that sane defaults are used for sysmon_handler if not set by the user

5 files changed, 204 insertions, 795 deletions

diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema
index 570c335ee4..9bccb9a89e 100644
--- a/priv/schema/rabbit.schema
+++ b/priv/schema/rabbit.schema
@@ -1363,95 +1363,152 @@ end}.
 %% that are overly busy. Processes with large heaps or that take a
 %% long time to garbage collect will count toward this threshold.
 {mapping, "sysmon_handler.thresholds.busy_processes", "sysmon_handler.process_limit", [
-  {default, 30},
-  {datatype, integer},
-  hidden
+    {datatype, integer},
+    hidden
 ]}.
 
+{translation, "sysmon_handler.process_limit",
+    fun(Conf) ->
+            case cuttlefish:conf_get("sysmon_handler.thresholds.busy_processes", Conf, undefined) of
+                undefined ->
+                    cuttlefish:unset();
+                Int when is_integer(Int) ->
+                    Int;
+                _ ->
+                    cuttlefish:invalid("should be a non-negative integer")
+            end
+    end
+}.
+
 %% @doc The threshold at which to warn about the number of ports that
 %% are overly busy. Ports with full input buffers count toward this
 %% threshold.
 {mapping, "sysmon_handler.thresholds.busy_ports", "sysmon_handler.port_limit", [
-  {default, 2},
   {datatype, integer},
   hidden
 ]}.
 
+{translation, "sysmon_handler.port_limit",
+    fun(Conf) ->
+            case cuttlefish:conf_get("sysmon_handler.thresholds.busy_ports", Conf, undefined) of
+                undefined ->
+                    cuttlefish:unset();
+                Int when is_integer(Int) ->
+                    Int;
+                _ ->
+                    cuttlefish:invalid("should be a non-negative integer")
+            end
+    end
+}.
+
 %% @doc A process will become busy when it exceeds this amount of time
 %% doing garbage collection.
-%%
-%% NOTE: Enabling this setting can cause performance problems on
-%% multi-core systems.
 %% @see sysmon_handler.thresholds.busy_processes
 {mapping, "sysmon_handler.triggers.process.garbage_collection", "sysmon_handler.gc_ms_limit", [
-  {default, off},
   {datatype, [{atom, off},
               {duration, ms}]},
   hidden
 ]}.
 
 {translation, "sysmon_handler.gc_ms_limit",
- fun(Conf) ->
-     case cuttlefish:conf_get("sysmon_handler.triggers.process.garbage_collection", Conf) of
-         off -> 0;
-         Int -> Int
-     end
- end}.
+    fun(Conf) ->
+            case cuttlefish:conf_get("sysmon_handler.triggers.process.garbage_collection", Conf, undefined) of
+                undefined ->
+                    cuttlefish:unset();
+                off ->
+                    0;
+                Int when is_integer(Int) ->
+                    Int;
+                _ ->
+                    cuttlefish:invalid("should be a non-negative integer")
+            end
+    end
+}.
 
 %% @doc A process will become busy when it exceeds this amount of time
 %% during a single process scheduling & execution cycle.
 {mapping, "sysmon_handler.triggers.process.long_scheduled_execution", "sysmon_handler.schedule_ms_limit", [
-  {default, off},
   {datatype, [{atom, off},
               {duration, ms}]},
   hidden
 ]}.
 
 {translation, "sysmon_handler.schedule_ms_limit",
- fun(Conf) ->
-     case cuttlefish:conf_get("sysmon_handler.triggers.process.long_scheduled_execution", Conf) of
-         off -> 0;
-         Int -> Int
-     end
- end}.
+    fun(Conf) ->
+            case cuttlefish:conf_get("sysmon_handler.triggers.process.long_scheduled_execution", Conf, undefined) of
+                undefined ->
+                    cuttlefish:unset();
+                off ->
+                    0;
+                Int when is_integer(Int) ->
+                    Int;
+                _ ->
+                    cuttlefish:invalid("should be a non-negative integer")
+            end
+    end
+}.
 
 %% @doc A process will become busy when its heap exceeds this size.
 %% @see sysmon_handler.thresholds.busy_processes
 {mapping, "sysmon_handler.triggers.process.heap_size", "sysmon_handler.heap_word_limit", [
-  {default, "160444000"},
-  {datatype, [bytesize, {atom, off}]},
+  {datatype, [{atom, off},
+              bytesize]},
   hidden
 ]}.
 
 {translation, "sysmon_handler.heap_word_limit",
- fun(Conf) ->
-    case cuttlefish:conf_get("sysmon_handler.triggers.process.heap_size", Conf) of
-        off -> 0;
-        Bytes ->
-            WordSize = erlang:system_info(wordsize),
-            Bytes div WordSize
+    fun(Conf) ->
+            case cuttlefish:conf_get("sysmon_handler.triggers.process.heap_size", Conf, undefined) of
+                undefined ->
+                    cuttlefish:unset();
+                off ->
+                    0;
+                Bytes when is_integer(Bytes) ->
+                    WordSize = erlang:system_info(wordsize),
+                    Bytes div WordSize;
+                _ ->
+                    cuttlefish:invalid("should be a non-negative integer")
+            end
     end
-end}.
+}.
 
 %% @doc Whether ports with full input buffers will be counted as
 %% busy. Ports can represent open files or network sockets.
 %% @see sysmon_handler.thresholds.busy_ports
 {mapping, "sysmon_handler.triggers.port", "sysmon_handler.busy_port", [
-  {default, on},
   {datatype, flag},
   hidden
 ]}.
 
+{translation, "sysmon_handler.busy_port",
+    fun(Conf) ->
+            case cuttlefish:conf_get("sysmon_handler.triggers.port", Conf, undefined) of
+                undefined ->
+                    cuttlefish:unset();
+                Val -> Val
+            end
+    end
+}.
+
 %% @doc Whether distribution ports with full input buffers will be
 %% counted as busy. Distribution ports connect Erlang nodes within a
 %% single cluster.
 %% @see sysmon_handler.thresholds.busy_ports
 {mapping, "sysmon_handler.triggers.distribution_port", "sysmon_handler.busy_dist_port", [
-  {default, on},
   {datatype, flag},
   hidden
 ]}.
 
+{translation, "sysmon_handler.busy_dist_port",
+    fun(Conf) ->
+            case cuttlefish:conf_get("sysmon_handler.triggers.distribution_port", Conf, undefined) of
+                undefined ->
+                    cuttlefish:unset();
+                Val -> Val
+            end
+    end
+}.
+
 % ===============================
 % Validators
 % ===============================
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk
index 6d43e68ac7..0cc6bd544a 100644
--- a/rabbitmq-components.mk
+++ b/rabbitmq-components.mk
@@ -115,7 +115,7 @@ dep_lager = hex 3.6.5
 dep_ra = git https://github.com/rabbitmq/ra.git master
 dep_ranch = hex 1.7.1
 dep_recon = hex 2.3.6
-dep_sysmon_handler = hex 1.0.0
+dep_sysmon_handler = hex 1.1.0
 
 RABBITMQ_COMPONENTS = amqp_client \
 		      amqp10_common \
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 2a37d0ba75..980b629a19 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -523,6 +523,7 @@ start_apps(Apps) ->
 
 start_apps(Apps, RestartTypes) ->
     app_utils:load_applications(Apps),
+    ensure_sysmon_handler_app_config(),
     ConfigEntryDecoder = case application:get_env(rabbit, config_entry_decoder) of
         undefined ->
             [];
@@ -553,7 +554,6 @@ start_apps(Apps, RestartTypes) ->
         PassPhrase
     },
     decrypt_config(Apps, Algo),
-
     OrderedApps = app_utils:app_dependency_order(Apps, false),
     case lists:member(rabbit, Apps) of
         false -> rabbit_boot_steps:run_boot_steps(Apps); %% plugin activation
@@ -563,6 +563,30 @@ start_apps(Apps, RestartTypes) ->
                                       handle_app_error(could_not_start),
                                       RestartTypes).
 
+%% rabbitmq/rabbitmq-server#952
+%% This function is to be called after configuration has been optionally generated
+%% and the sysmon_handler application loaded, but not started. It will ensure that
+%% sane defaults are used for configuration settings that haven't been set by the
+%% user
+ensure_sysmon_handler_app_config() ->
+    Defaults = [
+                {process_limit, 100},
+                {port_limit, 100},
+                {gc_ms_limit, 0},
+                {schedule_ms_limit, 0},
+                {heap_word_limit, 10485760},
+                {busy_port, false},
+                {busy_dist_port, true}
+               ],
+    lists:foreach(fun({K, V}) ->
+                          case application:get_env(sysmon_handler, K) of
+                              undefined ->
+                                  application:set_env(sysmon_handler, K, V);
+                              _ ->
+                                  ok
+                          end
+                  end, Defaults).
+
 %% This function retrieves the correct IoDevice for requesting
 %% input. The problem with using the default IoDevice is that
 %% the Erlang shell prevents us from getting the input.
diff --git a/src/rabbit_sysmon_handler.erl b/src/rabbit_sysmon_handler.erl
index 4e878f618d..17625faeca 100644
--- a/src/rabbit_sysmon_handler.erl
+++ b/src/rabbit_sysmon_handler.erl
@@ -91,6 +91,11 @@ handle_event({monitor, PidOrPort, Type, Info}, State=#state{timer_ref=TimerRef})
     {Fmt, Args} = format_pretty_proc_or_port_info(PidOrPort),
     rabbit_log:warning("~p ~w ~w " ++ Fmt ++ " ~w", [?MODULE, Type, PidOrPort] ++ Args ++ [Info]),
     {ok, State#state{timer_ref=NewTimerRef}};
+handle_event({suppressed, Type, Info}, State=#state{timer_ref=TimerRef}) ->
+    %% Reset the inactivity timeout
+    NewTimerRef = reset_timer(TimerRef),
+    rabbit_log:debug("~p ~w ~w", [?MODULE, Type, Info]),
+    {ok, State#state{timer_ref=NewTimerRef}};
 handle_event(Event, State=#state{timer_ref=TimerRef}) ->
     NewTimerRef = reset_timer(TimerRef),
     rabbit_log:warning("~p unhandled event: ~p", [?MODULE, Event]),
diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets
index 8752d56590..0cd274b757 100644
--- a/test/config_schema_SUITE_data/rabbit.snippets
+++ b/test/config_schema_SUITE_data/rabbit.snippets
@@ -1,56 +1,24 @@
 [{internal_auth_backend,
   "auth_backends.1 = internal",
-  [{rabbit,[{auth_backends,[rabbit_auth_backend_internal]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{auth_backends,[rabbit_auth_backend_internal]}]}],
   []},
  {ldap_auth_backend,
   "auth_backends.1 = ldap",
-  [{rabbit,[{auth_backends,[rabbit_auth_backend_ldap]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{auth_backends,[rabbit_auth_backend_ldap]}]}],
   []},
  {multiple_auth_backends,
  "auth_backends.1 = ldap
 auth_backends.2 = internal",
   [{rabbit,
        [{auth_backends,
-            [rabbit_auth_backend_ldap,rabbit_auth_backend_internal]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+            [rabbit_auth_backend_ldap,rabbit_auth_backend_internal]}]}],
   []},
  {full_name_auth_backend,
   "auth_backends.1 = ldap
 # uses module name instead of a short alias, \"http\"
 auth_backends.2 = rabbit_auth_backend_http",
   [{rabbit,
-       [{auth_backends,[rabbit_auth_backend_ldap,rabbit_auth_backend_http]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{auth_backends,[rabbit_auth_backend_ldap,rabbit_auth_backend_http]}]}],
   []},
  {third_party_auth_backend,
   "auth_backends.1.authn = internal
@@ -58,30 +26,14 @@ auth_backends.2 = rabbit_auth_backend_http",
 auth_backends.1.authz = rabbit_auth_backend_ip_range",
   [{rabbit,
        [{auth_backends,
-            [{rabbit_auth_backend_internal,rabbit_auth_backend_ip_range}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+            [{rabbit_auth_backend_internal,rabbit_auth_backend_ip_range}]}]}],
   []},
  {authn_authz_backend,
  "auth_backends.1.authn = ldap
 auth_backends.1.authz = internal",
   [{rabbit,
        [{auth_backends,
-            [{rabbit_auth_backend_ldap,rabbit_auth_backend_internal}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+            [{rabbit_auth_backend_ldap,rabbit_auth_backend_internal}]}]}],
   []},
  {authn_authz_multiple_backends,
   "auth_backends.1.authn = ldap
@@ -90,29 +42,13 @@ auth_backends.2       = internal",
   [{rabbit,
        [{auth_backends,
             [{rabbit_auth_backend_ldap,rabbit_auth_backend_internal},
-             rabbit_auth_backend_internal]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             rabbit_auth_backend_internal]}]}],
   []},
  {authn_backend_only,
   "auth_backends.1.authn = ldap",
   [{rabbit,
        [{auth_backends,
-            [{rabbit_auth_backend_ldap,rabbit_auth_backend_ldap}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+            [{rabbit_auth_backend_ldap,rabbit_auth_backend_ldap}]}]}],
   []},
  {ssl_options,
   "ssl_options.cacertfile          = test/config_schema_SUITE_data/certs/cacert.pem
@@ -126,50 +62,15 @@ ssl_options.fail_if_no_peer_cert = true",
              {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
              {verify,verify_peer},
-             {fail_if_no_peer_cert,true}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {fail_if_no_peer_cert,true}]}]}],
   []},
  {tcp_listener,
   "listeners.tcp.default = 5673",
-    [{rabbit,[{tcp_listeners,[5673]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
- []},
+    [{rabbit,[{tcp_listeners,[5673]}]}],[]},
  {ssl_listener,
-  "listeners.ssl = none",[{rabbit,[{ssl_listeners,[]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
- []},
+  "listeners.ssl = none",[{rabbit,[{ssl_listeners,[]}]}],[]},
  {num_acceptors,
-  "num_acceptors.ssl = 1",[{rabbit,[{num_ssl_acceptors,1}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
- []},
+  "num_acceptors.ssl = 1",[{rabbit,[{num_ssl_acceptors,1}]}],[]},
  {default_user_settings,
   "default_user = guest
 default_pass = guest
@@ -181,15 +82,7 @@ default_permissions.write = .*",
        [{default_user,<<"guest">>},
         {default_pass,<<"guest">>},
         {default_user_tags,[administrator]},
-        {default_permissions,[<<".*">>,<<".*">>,<<".*">>]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+        {default_permissions,[<<".*">>,<<".*">>,<<".*">>]}]}],
   []},
  {cluster_formation,
   "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
@@ -200,15 +93,7 @@ cluster_formation.node_type = disc",
        [{cluster_formation,
             [{peer_discovery_backend,rabbit_peer_discovery_classic_config},
              {node_type,disc}]},
-        {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+        {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]}],
   []},
  {cluster_formation_disK,
   "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
@@ -219,262 +104,92 @@ cluster_formation.node_type = disc",
        [{cluster_formation,
             [{peer_discovery_backend,rabbit_peer_discovery_classic_config},
              {node_type,disc}]},
-        {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+        {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]}],
   []},
  {cluster_formation_ram_ignored,
-  "cluster_formation.node_type = ram",[
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],[]},
+  "cluster_formation.node_type = ram",[],[]},
  {tcp_listen_options,
   "tcp_listen_options.backlog = 128
 tcp_listen_options.nodelay = true
 tcp_listen_options.exit_on_close = false",
   [{rabbit,
        [{tcp_listen_options,
-            [{backlog,128},{nodelay,true},{exit_on_close,false}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+            [{backlog,128},{nodelay,true},{exit_on_close,false}]}]}],
   []},
  {vm_memory_watermark_absolute,
   "vm_memory_high_watermark.absolute = 1073741824",
-  [{rabbit,[{vm_memory_high_watermark,{absolute,1073741824}}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{vm_memory_high_watermark,{absolute,1073741824}}]}],
   []},
  {vm_memory_watermark_absolute_units,
   "vm_memory_high_watermark.absolute = 1024MB",
-  [{rabbit,[{vm_memory_high_watermark,{absolute,"1024MB"}}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{vm_memory_high_watermark,{absolute,"1024MB"}}]}],
   []},
  {vm_memory_watermark_paging_ratio,
   "vm_memory_high_watermark_paging_ratio = 0.75
    vm_memory_high_watermark.relative = 0.4",
   [{rabbit,
        [{vm_memory_high_watermark_paging_ratio,0.75},
-        {vm_memory_high_watermark,0.4}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+        {vm_memory_high_watermark,0.4}]}],
   []},
  {memory_monitor_interval, "memory_monitor_interval = 5000",
   [{rabbit,
-       [{memory_monitor_interval, 5000}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{memory_monitor_interval, 5000}]}],
   []},
  {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = rss",
   [{rabbit,
-       [{vm_memory_calculation_strategy, rss}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{vm_memory_calculation_strategy, rss}]}],
   []},
  {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = erlang",
   [{rabbit,
-       [{vm_memory_calculation_strategy, erlang}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{vm_memory_calculation_strategy, erlang}]}],
   []},
  {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = allocated",
   [{rabbit,
-       [{vm_memory_calculation_strategy, allocated}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{vm_memory_calculation_strategy, allocated}]}],
   []},
  {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = legacy",
   [{rabbit,
-       [{vm_memory_calculation_strategy, legacy}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{vm_memory_calculation_strategy, legacy}]}],
   []},
  {total_memory_available_override_value,
   "total_memory_available_override_value = 1000000000",
-  [{rabbit,[{total_memory_available_override_value, 1000000000}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{total_memory_available_override_value, 1000000000}]}],
   []},
  {total_memory_available_override_value_units,
   "total_memory_available_override_value = 1024MB",
-  [{rabbit,[{total_memory_available_override_value, "1024MB"}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{total_memory_available_override_value, "1024MB"}]}],
   []},
  {connection_max,
   "connection_max = 999",
-  [{rabbit,[{connection_max, 999}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{connection_max, 999}]}],
   []},
  {connection_max,
   "connection_max = infinity",
-  [{rabbit,[{connection_max, infinity}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{connection_max, infinity}]}],
   []},
  {channel_max,
   "channel_max = 16",
-  [{rabbit,[{channel_max, 16}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{channel_max, 16}]}],
   []},
-
  {max_message_size,
   "max_message_size = 131072",
-  [{rabbit, [{max_message_size, 131072}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit, [{max_message_size, 131072}]}],
   []},
-
  {listeners_tcp_ip,
   "listeners.tcp.1 = 192.168.1.99:5672",
-  [{rabbit,[{tcp_listeners,[{"192.168.1.99",5672}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listeners,[{"192.168.1.99",5672}]}]}],
   []},
  {listeners_tcp_ip_multiple,
   "listeners.tcp.1 = 127.0.0.1:5672
    listeners.tcp.2 = ::1:5672",
-  [{rabbit,[{tcp_listeners,[{"127.0.0.1",5672},{"::1",5672}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listeners,[{"127.0.0.1",5672},{"::1",5672}]}]}],
   []},
  {listeners_tcp_ip_all,"listeners.tcp.1 = :::5672",
-  [{rabbit,[{tcp_listeners,[{"::",5672}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listeners,[{"::",5672}]}]}],
   []},
  {listeners_tcp_ipv6,
   "listeners.tcp.1 = fe80::2acf:e9ff:fe17:f97b:5672",
-  [{rabbit,[{tcp_listeners,[{"fe80::2acf:e9ff:fe17:f97b",5672}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listeners,[{"fe80::2acf:e9ff:fe17:f97b",5672}]}]}],
   []},
  {tcp_options_sndbuf,
   "tcp_listen_options.backlog = 128
@@ -483,15 +198,7 @@ tcp_listen_options.exit_on_close = false",
    tcp_listen_options.recbuf = 196608",
   [{rabbit,
        [{tcp_listen_options,
-            [{backlog,128},{nodelay,true},{sndbuf,196608},{recbuf,196608}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+            [{backlog,128},{nodelay,true},{sndbuf,196608},{recbuf,196608}]}]}],
   []},
  {tcp_listen_options_nodelay_with_kernel,
   "tcp_listen_options.backlog = 4096
@@ -502,40 +209,16 @@ tcp_listen_options.exit_on_close = false",
   [{kernel,
        [{inet_default_connect_options,[{nodelay,true}]},
         {inet_default_listen_options,[{nodelay,true}]}]},
-   {rabbit,[{tcp_listen_options,[{backlog,4096},{nodelay,true}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+   {rabbit,[{tcp_listen_options,[{backlog,4096},{nodelay,true}]}]}],
   []},
  {tcp_listen_options_nodelay,
   "tcp_listen_options.backlog = 4096
    tcp_listen_options.nodelay = true",
-  [{rabbit,[{tcp_listen_options,[{backlog,4096},{nodelay,true}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listen_options,[{backlog,4096},{nodelay,true}]}]}],
   []},
  {ssl_handshake_timeout,
   "ssl_handshake_timeout = 10000",
-  [{rabbit,[{ssl_handshake_timeout,10000}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{ssl_handshake_timeout,10000}]}],
   []},
  {cluster_partition_handling_pause_if_all_down,
   "cluster_partition_handling = pause_if_all_down
@@ -548,39 +231,15 @@ tcp_listen_options.exit_on_close = false",
    cluster_partition_handling.pause_if_all_down.nodes.2 = rabbit@myhost2",
   [{rabbit,
        [{cluster_partition_handling,
-            {pause_if_all_down,[rabbit@myhost2,rabbit@myhost1],ignore}}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+            {pause_if_all_down,[rabbit@myhost2,rabbit@myhost1],ignore}}]}],
   []},
  {cluster_partition_handling_autoheal,
   "cluster_partition_handling = autoheal",
-  [{rabbit,[{cluster_partition_handling,autoheal}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{cluster_partition_handling,autoheal}]}],
   []},
  {password_hashing,
   "password_hashing_module = rabbit_password_hashing_sha512",
-  [{rabbit,[{password_hashing_module,rabbit_password_hashing_sha512}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{password_hashing_module,rabbit_password_hashing_sha512}]}],
   []},
  {ssl_options_verify_peer,
   "listeners.ssl.1 = 5671
@@ -596,15 +255,7 @@ tcp_listen_options.exit_on_close = false",
              {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
              {verify,verify_peer},
-             {fail_if_no_peer_cert,false}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {fail_if_no_peer_cert,false}]}]}],
   []},
  {ssl_options_password,
   "listeners.ssl.1 = 5671
@@ -618,15 +269,7 @@ tcp_listen_options.exit_on_close = false",
             [{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"},
              {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
-             {password,"t0p$3kRe7"}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {password,"t0p$3kRe7"}]}]}],
   []},
  {ssl_options_tls_ver_old,
   "listeners.ssl.1 = 5671
@@ -644,15 +287,7 @@ tcp_listen_options.exit_on_close = false",
             [{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"},
              {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
-             {versions,['tlsv1.2','tlsv1.1',tlsv1]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {versions,['tlsv1.2','tlsv1.1',tlsv1]}]}]}],
   []},
  {ssl_options_tls_ver_new,
   "listeners.ssl.1 = 5671
@@ -669,15 +304,7 @@ tcp_listen_options.exit_on_close = false",
             [{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"},
              {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
-             {versions,['tlsv1.2','tlsv1.1']}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {versions,['tlsv1.2','tlsv1.1']}]}]}],
   []},
 
  {ssl_options_ciphers,
@@ -715,15 +342,7 @@ tcp_listen_options.exit_on_close = false",
              ]},
              {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
-             {versions,['tlsv1.2','tlsv1.1']}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {versions,['tlsv1.2','tlsv1.1']}]}]}],
   []},
 
  {ssl_options_allow_poodle,
@@ -742,15 +361,7 @@ tcp_listen_options.exit_on_close = false",
              {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
              {verify,verify_peer},
-             {fail_if_no_peer_cert,false}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {fail_if_no_peer_cert,false}]}]}],
   []},
  {ssl_options_depth,
   "listeners.ssl.1 = 5671
@@ -768,15 +379,7 @@ tcp_listen_options.exit_on_close = false",
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
              {depth,2},
              {verify,verify_peer},
-             {fail_if_no_peer_cert,false}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {fail_if_no_peer_cert,false}]}]}],
   []},
  {ssl_options_honor_cipher_order,
   "listeners.ssl.1 = 5671
@@ -796,15 +399,7 @@ tcp_listen_options.exit_on_close = false",
              {depth,2},
              {verify,verify_peer},
              {fail_if_no_peer_cert, false},
-             {honor_cipher_order, true}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {honor_cipher_order, true}]}]}],
   []},
  {ssl_options_honor_ecc_order,
   "listeners.ssl.1 = 5671
@@ -824,77 +419,29 @@ tcp_listen_options.exit_on_close = false",
              {depth,2},
              {verify,verify_peer},
              {fail_if_no_peer_cert, false},
-             {honor_ecc_order, true}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {honor_ecc_order, true}]}]}],
   []},
  {ssl_cert_login_from,
   "ssl_cert_login_from = common_name",
-  [{rabbit,[{ssl_cert_login_from,common_name}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{ssl_cert_login_from,common_name}]}],
   []},
  {tcp_listen_options_linger_on,
   "tcp_listen_options.linger.on = true
    tcp_listen_options.linger.timeout = 100",
-  [{rabbit,[{tcp_listen_options,[{linger,{true,100}}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listen_options,[{linger,{true,100}}]}]}],
   []},
  {tcp_listen_options_linger_off,
   "tcp_listen_options.linger.on = false
    tcp_listen_options.linger.timeout = 100",
-  [{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]}],
   []},
  {tcp_listen_options_linger_on_notimeout,
   "tcp_listen_options.linger.on = true",
-  [{rabbit,[{tcp_listen_options,[{linger,{true,0}}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listen_options,[{linger,{true,0}}]}]}],
   []},
  {tcp_listen_options_linger_timeout,
   "tcp_listen_options.linger.timeout = 100",
-  [{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]}],
   []},
 
  {cluster_formation_randomized_startup_delay_both_values,
@@ -902,45 +449,21 @@ tcp_listen_options.exit_on_close = false",
    cluster_formation.randomized_startup_delay_range.max = 30",
   [{rabbit, [{cluster_formation, [
                                   {randomized_startup_delay_range, {10, 30}}
-                                  ]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+                                  ]}]}],
   []},
 
  {cluster_formation_randomized_startup_delay_min_only,
   "cluster_formation.randomized_startup_delay_range.min = 10",
   [{rabbit, [{cluster_formation, [
                                   {randomized_startup_delay_range, {10, 60}}
-                                  ]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+                                  ]}]}],
   []},
 
  {cluster_formation_randomized_startup_delay_max_only,
   "cluster_formation.randomized_startup_delay_range.max = 30",
   [{rabbit, [{cluster_formation, [
                                   {randomized_startup_delay_range, {5, 30}}
-                                  ]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+                                  ]}]}],
   []},
 
  {cluster_formation_dns,
@@ -951,15 +474,7 @@ tcp_listen_options.exit_on_close = false",
        [{cluster_formation,
             [{peer_discovery_dns,[{hostname,<<"192.168.0.2.xip.io">>}]},
              {peer_discovery_backend,rabbit_peer_discovery_dns},
-             {node_type,disc}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {node_type,disc}]}]}],
   []},
  {cluster_formation_classic,
   "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
@@ -967,15 +482,7 @@ tcp_listen_options.exit_on_close = false",
   [{rabbit,
        [{cluster_formation,
             [{peer_discovery_backend,rabbit_peer_discovery_classic_config},
-             {node_type,disc}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {node_type,disc}]}]}],
   []},
  {cluster_formation_classic_ram,
   "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
@@ -983,43 +490,19 @@ tcp_listen_options.exit_on_close = false",
   [{rabbit,
        [{cluster_formation,
             [{peer_discovery_backend,rabbit_peer_discovery_classic_config},
-             {node_type,ram}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {node_type,ram}]}]}],
   []},
  {background_gc_enabled,
   "background_gc_enabled = true
    background_gc_target_interval = 30000",
   [{rabbit,
-       [{background_gc_enabled,true},{background_gc_target_interval,30000}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{background_gc_enabled,true},{background_gc_target_interval,30000}]}],
   []},
  {background_gc_disabled,
   "background_gc_enabled = false
    background_gc_target_interval = 30000",
   [{rabbit,
-       [{background_gc_enabled,false},{background_gc_target_interval,30000}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{background_gc_enabled,false},{background_gc_target_interval,30000}]}],
   []},
  {credential_validator_length,
   "credential_validator.validation_backend = rabbit_credential_validator_min_password_length
@@ -1028,15 +511,7 @@ credential_validator.min_length = 10",
        [{credential_validator,
             [{validation_backend,
                  rabbit_credential_validator_min_password_length},
-             {min_length,10}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {min_length,10}]}]}],
   []},
  {credential_validator_regexp,
   "credential_validator.validation_backend = rabbit_credential_validator_password_regexp
@@ -1044,198 +519,78 @@ credential_validator.regexp = ^abc\\d+",
   [{rabbit,
        [{credential_validator,
             [{validation_backend,rabbit_credential_validator_password_regexp},
-             {regexp,"^abc\\d+"}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {regexp,"^abc\\d+"}]}]}],
   []},
  {proxy_protocol_on,
   "proxy_protocol = true",
-  [{rabbit,[{proxy_protocol,true}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],[]},
+  [{rabbit,[{proxy_protocol,true}]}],[]},
  {proxy_protocol_off,
   "proxy_protocol = false",
-  [{rabbit,[{proxy_protocol,false}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],[]},
+  [{rabbit,[{proxy_protocol,false}]}],[]},
  {log_debug_file,
   "log.file.level = debug",
-  [{rabbit,[{log, [{file, [{level, debug}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{log, [{file, [{level, debug}]}]}]}],
   []},
  {log_debug_console,
   "log.console = true
    log.console.level = debug",
-  [{rabbit,[{log, [{console, [{enabled, true}, {level, debug}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{log, [{console, [{enabled, true}, {level, debug}]}]}]}],
   []},
  {log_debug_exchange,
   "log.exchange = true
    log.exchange.level = debug",
-  [{rabbit,[{log, [{exchange, [{enabled, true}, {level, debug}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{log, [{exchange, [{enabled, true}, {level, debug}]}]}]}],
   []},
  {log_debug_syslog,
   "log.syslog = true
    log.syslog.level = debug",
-  [{rabbit,[{log, [{syslog, [{enabled, true}, {level, debug}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{log, [{syslog, [{enabled, true}, {level, debug}]}]}]}],
   []},
  {log_file_name,
   "log.file = file_name",
-  [{rabbit,[{log, [{file, [{file, "file_name"}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{log, [{file, [{file, "file_name"}]}]}]}],
   []},
  {log_file_disabled,
   "log.file = false",
-  [{rabbit,[{log, [{file, [{file, false}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{log, [{file, [{file, false}]}]}]}],
   []},
  {log_category_level,
   "log.connection.level = debug
    log.channel.level = error",
   [{rabbit,[{log, [{categories, [{connection, [{level, debug}]},
-                                 {channel, [{level, error}]}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+                                 {channel, [{level, error}]}]}]}]}],
   []},
  {log_category_file,
   "log.connection.file = file_name_connection
    log.channel.file = file_name_channel",
   [{rabbit,[{log, [{categories, [{connection, [{file, "file_name_connection"}]},
-                                 {channel, [{file, "file_name_channel"}]}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+                                 {channel, [{file, "file_name_channel"}]}]}]}]}],
   []},
  {delegate_count,
   "delegate_count = 64",
   [{rabbit, [
       {delegate_count, 64}
-    ]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+    ]}],
   []},
 
   {kernel_net_ticktime,
    "net_ticktime = 20",
    [{kernel, [
       {net_ticktime, 20}
-     ]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+     ]}],
    []},
 
   {kernel_inet_dist_listen_min,
    "inet_dist_listen_min = 16000",
    [{kernel, [
       {inet_dist_listen_min, 16000}
-     ]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+     ]}],
    []},
   {kernel_inet_dist_listen_max,
    "inet_dist_listen_max = 16100",
    [{kernel, [
       {inet_dist_listen_max, 16100}
-     ]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+     ]}],
    []},
 
   {log_syslog_settings,
@@ -1251,15 +606,7 @@ credential_validator.regexp = ^abc\\d+",
               {facility, user},
               {multiline_mode, true},
               {dest_host, "10.10.10.10"},
-              {dest_port, 123}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}
+              {dest_port, 123}]}
    ],
    []},
   {log_syslog_tcp,
@@ -1270,15 +617,7 @@ credential_validator.regexp = ^abc\\d+",
    [
     {rabbit,[{log, [{syslog, [{enabled, true}]}]}]},
     {syslog, [{protocol, {rfc5424, tcp}},
-              {dest_host, "syslog.my-network.com"}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}
+              {dest_host, "syslog.my-network.com"}]}
    ],
    []},
   {log_syslog_udp_default,
@@ -1286,15 +625,7 @@ credential_validator.regexp = ^abc\\d+",
     log.syslog.protocol = rfc3164",
    [
     {rabbit,[{log, [{syslog, [{enabled, true}]}]}]},
-    {syslog, [{protocol, {rfc3164, udp}}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}
+    {syslog, [{protocol, {rfc3164, udp}}]}
    ],
    []},
   {log_syslog_tls,
@@ -1311,14 +642,6 @@ credential_validator.regexp = ^abc\\d+",
                {fail_if_no_peer_cert,false},
                {cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"},
                {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
-               {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}]}}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+               {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}]}}]}],
   []}
 ].