Merge branch 'release-50' into file-transfer

* release-50: fix(pulsar): use a binary duration as default `health_check_interval` docs: add changelog entry docs: clarify description of bridge username and password chore: bump to v5.0.25 fix(limiter): adjust type for compatibility fix(limiter): fix that update node-level limiter config will not working chore: upgrade dashboard to v1.2.4-1 for ce chore: upgarde rulesql to 0.1.6 to fix invaid utf8 input chore: add changelog for 10659 fix: crash when sysmon.os.mem_check_interval = disabled chore: bump influxdb version && update changes refactor(influxdb): move influxdb bridge into its own app chore: add listener default changelog fix: ocsp cache SUITE failed fix: ensure atom key for emqx_config:get fix: only fill cerf_file default in server side fix: authn init is empty fix: bad listeners default ssl_options
2023-05-17 00:27:55 +03:00 · 2023-05-17 00:27:55 +03:00 · 1a8cf0e392
parent 6f8f21106b 4a034c70bf
commit 1a8cf0e392
42 changed files with 255 additions and 130 deletions
--- a/2
+++ b/2
@ -15,7 +15,7 @@ endif

 # Dashbord version
 # from https://github.com/emqx/emqx-dashboard5
-export EMQX_DASHBOARD_VERSION ?= v1.2.4
+export EMQX_DASHBOARD_VERSION ?= v1.2.4-1
 export EMQX_EE_DASHBOARD_VERSION ?= e1.0.6

 # `:=` should be used here, otherwise the `$(shell ...)` will be executed every time when the variable is used
--- a/apps/emqx/include/emqx_release.hrl
+++ b/apps/emqx/include/emqx_release.hrl
@ -32,7 +32,7 @@
 %% `apps/emqx/src/bpapi/README.md'

 %% Community edition
-define(EMQX_RELEASE_CE, "5.0.25-rc.1").
+-define(EMQX_RELEASE_CE, "5.0.25").

 %% Enterprise edition
 -define(EMQX_RELEASE_EE, "5.0.4-alpha.1").
--- a/apps/emqx/src/emqx_limiter/src/emqx_limiter_manager.erl
+++ b/apps/emqx/src/emqx_limiter/src/emqx_limiter_manager.erl
@ -131,11 +131,9 @@ delete_root(Type) ->
    delete_bucket(?ROOT_ID, Type).

 post_config_update([limiter], _Config, NewConf, _OldConf, _AppEnvs) ->
-    Types = lists:delete(client, maps:keys(NewConf)),
-    _ = [on_post_config_update(Type, NewConf) || Type <- Types],
-    ok;
-post_config_update([limiter, Type], _Config, NewConf, _OldConf, _AppEnvs) ->
-    on_post_config_update(Type, NewConf).
+    Conf = emqx_limiter_schema:convert_node_opts(NewConf),
+    _ = [on_post_config_update(Type, Cfg) || {Type, Cfg} <- maps:to_list(Conf)],
+    ok.

 %%--------------------------------------------------------------------
 %% @doc
@ -279,8 +277,7 @@ format_status(_Opt, Status) ->
 %%--------------------------------------------------------------------
 %%  Internal functions
 %%--------------------------------------------------------------------
-on_post_config_update(Type, NewConf) ->
-    Config = maps:get(Type, NewConf),
+on_post_config_update(Type, Config) ->
    case emqx_limiter_server:whereis(Type) of
        undefined ->
            start_server(Type, Config);
--- a/apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl
+++ b/apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl
@ -38,7 +38,8 @@
    default_client_config/0,
    short_paths_fields/1,
    get_listener_opts/1,
-    get_node_opts/1
+    get_node_opts/1,
+    convert_node_opts/1
 ]).

 -define(KILOBYTE, 1024).
@ -60,7 +61,7 @@
 -type limiter_id() :: atom().
 -type bucket_name() :: atom().
 -type rate() :: infinity | float().
-type burst_rate() :: 0 | float().
+-type burst_rate() :: number().
 %% this is a compatible type for the deprecated field and type `capacity`.
 -type burst() :: burst_rate().
 %% the capacity of the token bucket
@ -309,6 +310,24 @@ get_node_opts(Type) ->
            end
    end.

+convert_node_opts(Conf) ->
+    DefBucket = default_bucket_config(),
+    ShorPaths = short_paths(),
+    Fun = fun
+        %% The `client` in the node options was deprecated
+        (client, _Value, Acc) ->
+            Acc;
+        (Name, Value, Acc) ->
+            case lists:member(Name, ShorPaths) of
+                true ->
+                    Type = short_path_name_to_type(Name),
+                    Acc#{Type => DefBucket#{rate => Value}};
+                _ ->
+                    Acc#{Name => Value}
+            end
+    end,
+    maps:fold(Fun, #{}, Conf).
+
 %%--------------------------------------------------------------------
 %% Internal functions
 %%--------------------------------------------------------------------
--- a/apps/emqx/src/emqx_os_mon.erl
+++ b/apps/emqx/src/emqx_os_mon.erl
@ -23,8 +23,6 @@
 -export([start_link/0]).

 -export([
-    get_mem_check_interval/0,
-    set_mem_check_interval/1,
    get_sysmem_high_watermark/0,
    set_sysmem_high_watermark/1,
    get_procmem_high_watermark/0,
@ -46,6 +44,9 @@
    terminate/2,
    code_change/3
 ]).
+-ifdef(TEST).
+-export([is_sysmem_check_supported/0]).
+-endif.

 -include("emqx.hrl").

@ -61,14 +62,6 @@ update(OS) ->
 %% API
 %%--------------------------------------------------------------------

-get_mem_check_interval() ->
-    memsup:get_check_interval().
-
-set_mem_check_interval(Seconds) when Seconds < 60000 ->
-    memsup:set_check_interval(1);
-set_mem_check_interval(Seconds) ->
-    memsup:set_check_interval(Seconds div 60000).
-
 get_sysmem_high_watermark() ->
    gen_server:call(?OS_MON, ?FUNCTION_NAME, infinity).

@ -103,11 +96,9 @@ init_os_monitor() ->
 init_os_monitor(OS) ->
    #{
        sysmem_high_watermark := SysHW,
-        procmem_high_watermark := PHW,
-        mem_check_interval := MCI
+        procmem_high_watermark := PHW
    } = OS,
    set_procmem_high_watermark(PHW),
-    set_mem_check_interval(MCI),
    ok = update_mem_alarm_status(SysHW),
    SysHW.

--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@ -2189,8 +2189,8 @@ filter(Opts) ->

 %% @private This function defines the SSL opts which are commonly used by
 %% SSL listener and client.
-spec common_ssl_opts_schema(map()) -> hocon_schema:field_schema().
-common_ssl_opts_schema(Defaults) ->
+-spec common_ssl_opts_schema(map(), server | client) -> hocon_schema:field_schema().
+common_ssl_opts_schema(Defaults, Type) ->
    D = fun(Field) -> maps:get(to_atom(Field), Defaults, undefined) end,
    Df = fun(Field, Default) -> maps:get(to_atom(Field), Defaults, Default) end,
    Collection = maps:get(versions, Defaults, tls_all_available),
@ -2200,7 +2200,7 @@ common_ssl_opts_schema(Defaults) ->
            sc(
                binary(),
                #{
-                    default => D("cacertfile"),
+                    default => cert_file("cacert.pem", Type),
                    required => false,
                    desc => ?DESC(common_ssl_opts_schema_cacertfile)
                }
@ -2209,7 +2209,7 @@ common_ssl_opts_schema(Defaults) ->
            sc(
                binary(),
                #{
-                    default => D("certfile"),
+                    default => cert_file("cert.pem", Type),
                    required => false,
                    desc => ?DESC(common_ssl_opts_schema_certfile)
                }
@ -2218,7 +2218,7 @@ common_ssl_opts_schema(Defaults) ->
            sc(
                binary(),
                #{
-                    default => D("keyfile"),
+                    default => cert_file("key.pem", Type),
                    required => false,
                    desc => ?DESC(common_ssl_opts_schema_keyfile)
                }
@ -2305,7 +2305,7 @@ common_ssl_opts_schema(Defaults) ->
 server_ssl_opts_schema(Defaults, IsRanchListener) ->
    D = fun(Field) -> maps:get(to_atom(Field), Defaults, undefined) end,
    Df = fun(Field, Default) -> maps:get(to_atom(Field), Defaults, Default) end,
-    common_ssl_opts_schema(Defaults) ++
+    common_ssl_opts_schema(Defaults, server) ++
        [
            {"dhfile",
                sc(
@ -2431,7 +2431,7 @@ crl_outer_validator(_SSLOpts) ->
 %% @doc Make schema for SSL client.
 -spec client_ssl_opts_schema(map()) -> hocon_schema:field_schema().
 client_ssl_opts_schema(Defaults) ->
-    common_ssl_opts_schema(Defaults) ++
+    common_ssl_opts_schema(Defaults, client) ++
        [
            {"enable",
                sc(
@ -3251,13 +3251,10 @@ default_listener(ws) ->
    };
 default_listener(SSLListener) ->
    %% The env variable is resolved in emqx_tls_lib by calling naive_env_interpolate
-    CertFile = fun(Name) ->
-        iolist_to_binary("${EMQX_ETC_DIR}/" ++ filename:join(["certs", Name]))
-    end,
    SslOptions = #{
-        <<"cacertfile">> => CertFile(<<"cacert.pem">>),
-        <<"certfile">> => CertFile(<<"cert.pem">>),
-        <<"keyfile">> => CertFile(<<"key.pem">>)
+        <<"cacertfile">> => cert_file(<<"cacert.pem">>, server),
+        <<"certfile">> => cert_file(<<"cert.pem">>, server),
+        <<"keyfile">> => cert_file(<<"key.pem">>, server)
    },
    case SSLListener of
        ssl ->
@ -3374,3 +3371,6 @@ ensure_default_listener(#{<<"default">> := _} = Map, _ListenerType) ->
 ensure_default_listener(Map, ListenerType) ->
    NewMap = Map#{<<"default">> => default_listener(ListenerType)},
    keep_default_tombstone(NewMap, #{}).
+
+cert_file(_File, client) -> undefined;
+cert_file(File, server) -> iolist_to_binary(filename:join(["${EMQX_ETC_DIR}", "certs", File])).
--- a/apps/emqx/test/emqx_ocsp_cache_SUITE.erl
+++ b/apps/emqx/test/emqx_ocsp_cache_SUITE.erl
@ -967,20 +967,11 @@ do_t_validations(_Config) ->
    {error, {_, _, ResRaw3}} = update_listener_via_api(ListenerId, ListenerData3),
    #{<<"code">> := <<"BAD_REQUEST">>, <<"message">> := MsgRaw3} =
        emqx_utils_json:decode(ResRaw3, [return_maps]),
+    %% we can't remove certfile now, because it has default value.
    ?assertMatch(
-        #{
-            <<"mismatches">> :=
-                #{
-                    <<"listeners:ssl_not_required_bind">> :=
-                        #{
-                            <<"reason">> :=
-                                <<"Server certificate must be defined when using OCSP stapling">>
-                        }
-                }
-        },
-        emqx_utils_json:decode(MsgRaw3, [return_maps])
+        <<"{bad_ssl_config,#{file_read => enoent,pem_check => invalid_pem", _/binary>>,
+        MsgRaw3
    ),
-
    ok.

 t_unknown_error_fetching_ocsp_response(_Config) ->
--- a/apps/emqx/test/emqx_os_mon_SUITE.erl
+++ b/apps/emqx/test/emqx_os_mon_SUITE.erl
@ -43,8 +43,8 @@ init_per_testcase(t_cpu_check_alarm, Config) ->
    {ok, _} = supervisor:restart_child(emqx_sys_sup, emqx_os_mon),
    Config;
 init_per_testcase(t_sys_mem_check_alarm, Config) ->
-    case os:type() of
-        {unix, linux} ->
+    case emqx_os_mon:is_sysmem_check_supported() of
+        true ->
            SysMon = emqx_config:get([sysmon, os], #{}),
            emqx_config:put([sysmon, os], SysMon#{
                sysmem_high_watermark => 0.51,
@ -54,7 +54,7 @@ init_per_testcase(t_sys_mem_check_alarm, Config) ->
            ok = supervisor:terminate_child(emqx_sys_sup, emqx_os_mon),
            {ok, _} = supervisor:restart_child(emqx_sys_sup, emqx_os_mon),
            Config;
-        _ ->
+        false ->
            Config
    end;
 init_per_testcase(_, Config) ->
@ -63,12 +63,6 @@ init_per_testcase(_, Config) ->
    Config.

 t_api(_) ->
-    ?assertEqual(60000, emqx_os_mon:get_mem_check_interval()),
-    ?assertEqual(ok, emqx_os_mon:set_mem_check_interval(30000)),
-    ?assertEqual(60000, emqx_os_mon:get_mem_check_interval()),
-    ?assertEqual(ok, emqx_os_mon:set_mem_check_interval(122000)),
-    ?assertEqual(120000, emqx_os_mon:get_mem_check_interval()),
-
    ?assertEqual(0.7, emqx_os_mon:get_sysmem_high_watermark()),
    ?assertEqual(ok, emqx_os_mon:set_sysmem_high_watermark(0.8)),
    ?assertEqual(0.8, emqx_os_mon:get_sysmem_high_watermark()),
@ -86,12 +80,29 @@ t_api(_) ->
    gen_server:stop(emqx_os_mon),
    ok.

+t_sys_mem_check_disable(Config) ->
+    case emqx_os_mon:is_sysmem_check_supported() of
+        true -> do_sys_mem_check_disable(Config);
+        false -> skip
+    end.
+
+do_sys_mem_check_disable(_Config) ->
+    MemRef0 = maps:get(mem_time_ref, sys:get_state(emqx_os_mon)),
+    ?assertEqual(true, is_reference(MemRef0), MemRef0),
+    emqx_config:put([sysmon, os, mem_check_interval], 1000),
+    emqx_os_mon:update(emqx_config:get([sysmon, os])),
+    MemRef1 = maps:get(mem_time_ref, sys:get_state(emqx_os_mon)),
+    ?assertEqual(true, is_reference(MemRef1), {MemRef0, MemRef1}),
+    ?assertNotEqual(MemRef0, MemRef1),
+    emqx_config:put([sysmon, os, mem_check_interval], disabled),
+    emqx_os_mon:update(emqx_config:get([sysmon, os])),
+    ?assertEqual(undefined, maps:get(mem_time_ref, sys:get_state(emqx_os_mon))),
+    ok.
+
 t_sys_mem_check_alarm(Config) ->
-    case os:type() of
-        {unix, linux} ->
-            do_sys_mem_check_alarm(Config);
-        _ ->
-            skip
+    case emqx_os_mon:is_sysmem_check_supported() of
+        true -> do_sys_mem_check_alarm(Config);
+        false -> skip
    end.

 do_sys_mem_check_alarm(_Config) ->
--- a/apps/emqx_authn/src/emqx_authn_app.erl
+++ b/apps/emqx_authn/src/emqx_authn_app.erl
@ -72,7 +72,7 @@ chain_configs() ->
    [global_chain_config() | listener_chain_configs()].

 global_chain_config() ->
-    {?GLOBAL, emqx:get_config([?EMQX_AUTHENTICATION_CONFIG_ROOT_NAME_BINARY], [])}.
+    {?GLOBAL, emqx:get_config([?EMQX_AUTHENTICATION_CONFIG_ROOT_NAME_ATOM], [])}.

 listener_chain_configs() ->
    lists:map(
@ -83,9 +83,11 @@ listener_chain_configs() ->
    ).

 auth_config_path(ListenerID) ->
-    [<<"listeners">>] ++
-        binary:split(atom_to_binary(ListenerID), <<":">>) ++
-        [?EMQX_AUTHENTICATION_CONFIG_ROOT_NAME_BINARY].
+    Names = [
+        binary_to_existing_atom(N, utf8)
+     || N <- binary:split(atom_to_binary(ListenerID), <<":">>)
+    ],
+    [listeners] ++ Names ++ [?EMQX_AUTHENTICATION_CONFIG_ROOT_NAME_ATOM].

 provider_types() ->
    lists:map(fun({Type, _Module}) -> Type end, emqx_authn:providers()).
--- a/apps/emqx_bridge/src/emqx_bridge_api.erl
+++ b/apps/emqx_bridge/src/emqx_bridge_api.erl
@ -54,13 +54,14 @@

 -define(BRIDGE_NOT_FOUND(BRIDGE_TYPE, BRIDGE_NAME),
    ?NOT_FOUND(
-        <<"Bridge lookup failed: bridge named '", (BRIDGE_NAME)/binary, "' of type ",
+        <<"Bridge lookup failed: bridge named '", (bin(BRIDGE_NAME))/binary, "' of type ",
            (bin(BRIDGE_TYPE))/binary, " does not exist.">>
    )
 ).

+%% Don't turn bridge_name to atom, it's maybe not a existing atom.
 -define(TRY_PARSE_ID(ID, EXPR),
-    try emqx_bridge_resource:parse_bridge_id(Id) of
+    try emqx_bridge_resource:parse_bridge_id(Id, #{atom_name => false}) of
        {BridgeType, BridgeName} ->
            EXPR
    catch
--- a/apps/emqx_bridge/src/emqx_bridge_resource.erl
+++ b/apps/emqx_bridge/src/emqx_bridge_resource.erl
@ -25,6 +25,7 @@
    resource_id/2,
    bridge_id/2,
    parse_bridge_id/1,
+    parse_bridge_id/2,
    bridge_hookpoint/1,
    bridge_hookpoint_to_bridge_id/1
 ]).
@ -86,11 +87,15 @@ bridge_id(BridgeType, BridgeName) ->
    Type = bin(BridgeType),
    <<Type/binary, ":", Name/binary>>.

-spec parse_bridge_id(list() | binary() | atom()) -> {atom(), binary()}.
 parse_bridge_id(BridgeId) ->
+    parse_bridge_id(BridgeId, #{atom_name => true}).
+
+-spec parse_bridge_id(list() | binary() | atom(), #{atom_name => boolean()}) ->
+    {atom(), atom() | binary()}.
+parse_bridge_id(BridgeId, Opts) ->
    case string:split(bin(BridgeId), ":", all) of
        [Type, Name] ->
-            {to_type_atom(Type), validate_name(Name)};
+            {to_type_atom(Type), validate_name(Name, Opts)};
        _ ->
            invalid_data(
                <<"should be of pattern {type}:{name}, but got ", BridgeId/binary>>
@ -105,13 +110,16 @@ bridge_hookpoint_to_bridge_id(?BRIDGE_HOOKPOINT(BridgeId)) ->
 bridge_hookpoint_to_bridge_id(_) ->
    {error, bad_bridge_hookpoint}.

-validate_name(Name0) ->
+validate_name(Name0, Opts) ->
    Name = unicode:characters_to_list(Name0, utf8),
    case is_list(Name) andalso Name =/= [] of
        true ->
            case lists:all(fun is_id_char/1, Name) of
                true ->
-                    Name0;
+                    case maps:get(atom_name, Opts, true) of
+                        true -> list_to_existing_atom(Name);
+                        false -> Name0
+                    end;
                false ->
                    invalid_data(<<"bad name: ", Name0/binary>>)
            end;
--- a/apps/emqx_bridge_influxdb/docker-ct
+++ b/apps/emqx_bridge_influxdb/docker-ct
@ -0,0 +1,2 @@
+toxiproxy
+influxdb
--- a/apps/emqx_bridge_influxdb/rebar.config
+++ b/apps/emqx_bridge_influxdb/rebar.config
@ -0,0 +1,8 @@
+{erl_opts, [debug_info]}.
+
+{deps, [
+    {influxdb, {git, "https://github.com/emqx/influxdb-client-erl", {tag, "1.1.9"}}},
+    {emqx_connector, {path, "../../apps/emqx_connector"}},
+    {emqx_resource, {path, "../../apps/emqx_resource"}},
+    {emqx_bridge, {path, "../../apps/emqx_bridge"}}
+]}.
--- a/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb.app.src
+++ b/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb.app.src
@ -1,8 +1,8 @@
 {application, emqx_bridge_influxdb, [
    {description, "EMQX Enterprise InfluxDB Bridge"},
-    {vsn, "0.1.0"},
+    {vsn, "0.1.1"},
    {registered, []},
-    {applications, [kernel, stdlib]},
+    {applications, [kernel, stdlib, influxdb]},
    {env, []},
    {modules, []},
    {links, []}
--- a/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb.erl
+++ b/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb.erl
@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
-module(emqx_ee_bridge_influxdb).
+-module(emqx_bridge_influxdb).

 -include_lib("emqx/include/logger.hrl").
 -include_lib("emqx_connector/include/emqx_connector.hrl").
@ -134,7 +134,7 @@ influxdb_bridge_common_fields() ->
        emqx_resource_schema:fields("resource_opts").

 connector_fields(Type) ->
-    emqx_ee_connector_influxdb:fields(Type).
+    emqx_bridge_influxdb_connector:fields(Type).

 type_name_fields(Type) ->
    [
@ -147,9 +147,9 @@ desc("config") ->
 desc(Method) when Method =:= "get"; Method =:= "put"; Method =:= "post" ->
    ["Configuration for InfluxDB using `", string:to_upper(Method), "` method."];
 desc(influxdb_api_v1) ->
-    ?DESC(emqx_ee_connector_influxdb, "influxdb_api_v1");
+    ?DESC(emqx_bridge_influxdb_connector, "influxdb_api_v1");
 desc(influxdb_api_v2) ->
-    ?DESC(emqx_ee_connector_influxdb, "influxdb_api_v2");
+    ?DESC(emqx_bridge_influxdb_connector, "influxdb_api_v2");
 desc(_) ->
    undefined.

--- a/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb_connector.erl
+++ b/apps/emqx_bridge_influxdb/src/emqx_bridge_influxdb_connector.erl
@ -1,9 +1,8 @@
 %%--------------------------------------------------------------------
 %% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
-module(emqx_ee_connector_influxdb).
+-module(emqx_bridge_influxdb_connector).

-include("emqx_ee_connector.hrl").
 -include_lib("emqx_connector/include/emqx_connector.hrl").

 -include_lib("hocon/include/hoconsc.hrl").
@ -40,6 +39,8 @@

 -type ts_precision() :: ns | us | ms | s.

+-define(INFLUXDB_DEFAULT_PORT, 8086).
+
 %% influxdb servers don't need parse
 -define(INFLUXDB_HOST_OPTIONS, #{
    default_port => ?INFLUXDB_DEFAULT_PORT
--- a/apps/emqx_bridge_influxdb/test/emqx_bridge_influxdb_SUITE.erl
+++ b/apps/emqx_bridge_influxdb/test/emqx_bridge_influxdb_SUITE.erl
@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
-module(emqx_ee_bridge_influxdb_SUITE).
+-module(emqx_bridge_influxdb_SUITE).

 -compile(nowarn_export_all).
 -compile(export_all).
@ -583,7 +583,7 @@ t_start_already_started(Config) ->
        emqx_bridge_schema, InfluxDBConfigString
    ),
    ?check_trace(
-        emqx_ee_connector_influxdb:on_start(ResourceId, InfluxDBConfigMap),
+        emqx_bridge_influxdb_connector:on_start(ResourceId, InfluxDBConfigMap),
        fun(Result, Trace) ->
            ?assertMatch({ok, _}, Result),
            ?assertMatch([_], ?of_kind(influxdb_connector_start_already_started, Trace)),
@ -985,7 +985,7 @@ t_write_failure(Config) ->
                    ?assertMatch([_ | _], Trace),
                    [#{result := Result} | _] = Trace,
                    ?assert(
-                        not emqx_ee_connector_influxdb:is_unrecoverable_error(Result),
+                        not emqx_bridge_influxdb_connector:is_unrecoverable_error(Result),
                        #{got => Result}
                    );
                async ->
@ -993,7 +993,7 @@ t_write_failure(Config) ->
                    ?assertMatch([#{action := nack} | _], Trace),
                    [#{result := Result} | _] = Trace,
                    ?assert(
-                        not emqx_ee_connector_influxdb:is_unrecoverable_error(Result),
+                        not emqx_bridge_influxdb_connector:is_unrecoverable_error(Result),
                        #{got => Result}
                    )
            end,
--- a/apps/emqx_bridge_influxdb/test/emqx_bridge_influxdb_connector_SUITE.erl
+++ b/apps/emqx_bridge_influxdb/test/emqx_bridge_influxdb_connector_SUITE.erl
@ -2,16 +2,16 @@
 %% Copyright (c) 2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------

-module(emqx_ee_connector_influxdb_SUITE).
+-module(emqx_bridge_influxdb_connector_SUITE).

 -compile(nowarn_export_all).
 -compile(export_all).

-include("emqx_connector.hrl").
+-include_lib("emqx_connector/include/emqx_connector.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").

-define(INFLUXDB_RESOURCE_MOD, emqx_ee_connector_influxdb).
+-define(INFLUXDB_RESOURCE_MOD, emqx_bridge_influxdb_connector).

 all() ->
    emqx_common_test_helpers:all(?MODULE).
@ -65,7 +65,7 @@ t_lifecycle(Config) ->
    Host = ?config(influxdb_tcp_host, Config),
    Port = ?config(influxdb_tcp_port, Config),
    perform_lifecycle_check(
-        <<"emqx_ee_connector_influxdb_SUITE">>,
+        <<"emqx_bridge_influxdb_connector_SUITE">>,
        influxdb_config(Host, Port, false, <<"verify_none">>)
    ).

@ -124,7 +124,7 @@ perform_lifecycle_check(PoolName, InitialConfig) ->
    ?assertEqual({error, not_found}, emqx_resource:get_instance(PoolName)).

 t_tls_verify_none(Config) ->
-    PoolName = <<"emqx_ee_connector_influxdb_SUITE">>,
+    PoolName = <<"emqx_bridge_influxdb_connector_SUITE">>,
    Host = ?config(influxdb_tls_host, Config),
    Port = ?config(influxdb_tls_port, Config),
    InitialConfig = influxdb_config(Host, Port, true, <<"verify_none">>),
@ -135,7 +135,7 @@ t_tls_verify_none(Config) ->
    ok.

 t_tls_verify_peer(Config) ->
-    PoolName = <<"emqx_ee_connector_influxdb_SUITE">>,
+    PoolName = <<"emqx_bridge_influxdb_connector_SUITE">>,
    Host = ?config(influxdb_tls_host, Config),
    Port = ?config(influxdb_tls_port, Config),
    InitialConfig = influxdb_config(Host, Port, true, <<"verify_peer">>),
--- a/apps/emqx_bridge_influxdb/test/emqx_bridge_influxdb_tests.erl
+++ b/apps/emqx_bridge_influxdb/test/emqx_bridge_influxdb_tests.erl
@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% Copyright (c) 2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
-module(emqx_ee_bridge_influxdb_tests).
+-module(emqx_bridge_influxdb_tests).

 -include_lib("eunit/include/eunit.hrl").

@ -192,7 +192,9 @@
        fields => [{"field", "\"field\\4\""}],
        timestamp => undefined
    }},
-    {"m5\\,mA,tag=\\=tag5\\=,\\,tag_a\\,=tag\\ 5a,tag_b=tag5b \\ field\\ =field5,field\\ _\\ a=field5a,\\,field_b\\ =\\=\\,\\ field5b ${timestamp5}",
+    {
+        "m5\\,mA,tag=\\=tag5\\=,\\,tag_a\\,=tag\\ 5a,tag_b=tag5b \\ field\\ =field5,"
+        "field\\ _\\ a=field5a,\\,field_b\\ =\\=\\,\\ field5b ${timestamp5}",
        #{
            measurement => "m5,mA",
            tags => [{"tag", "=tag5="}, {",tag_a,", "tag 5a"}, {"tag_b", "tag5b"}],
@ -200,7 +202,8 @@
                {" field ", "field5"}, {"field _ a", "field5a"}, {",field_b ", "=, field5b"}
            ],
            timestamp => "${timestamp5}"
-        }},
+        }
+    },
    {"m6,tag=tag6,tag_a=tag6a,tag_b=tag6b field=\"field6\",field_a=\"field6a\",field_b=\"field6b\"",
        #{
            measurement => "m6",
@ -208,20 +211,26 @@
            fields => [{"field", "field6"}, {"field_a", "field6a"}, {"field_b", "field6b"}],
            timestamp => undefined
        }},
-    {"\\ \\ m7\\ \\ ,tag=\\ tag\\,7\\ ,tag_a=\"tag7a\",tag_b\\,tag1=tag7b field=\"field7\",field_a=field7a,field_b=\"field7b\\\\\n\"",
+    {
+        "\\ \\ m7\\ \\ ,tag=\\ tag\\,7\\ ,tag_a=\"tag7a\",tag_b\\,tag1=tag7b field=\"field7\","
+        "field_a=field7a,field_b=\"field7b\\\\\n\"",
        #{
            measurement => "  m7  ",
            tags => [{"tag", " tag,7 "}, {"tag_a", "\"tag7a\""}, {"tag_b,tag1", "tag7b"}],
            fields => [{"field", "field7"}, {"field_a", "field7a"}, {"field_b", "field7b\\\n"}],
            timestamp => undefined
-        }},
-    {"m8,tag=tag8,tag_a=\"tag8a\",tag_b=tag8b field=\"field8\",field_a=field8a,field_b=\"\\\"field\\\" = 8b\" ${timestamp8}",
+        }
+    },
+    {
+        "m8,tag=tag8,tag_a=\"tag8a\",tag_b=tag8b field=\"field8\",field_a=field8a,"
+        "field_b=\"\\\"field\\\" = 8b\" ${timestamp8}",
        #{
            measurement => "m8",
            tags => [{"tag", "tag8"}, {"tag_a", "\"tag8a\""}, {"tag_b", "tag8b"}],
            fields => [{"field", "field8"}, {"field_a", "field8a"}, {"field_b", "\"field\" = 8b"}],
            timestamp => "${timestamp8}"
-        }},
+        }
+    },
    {"m\\9,tag=tag9,tag_a=\"tag9a\",tag_b=tag9b field\\=field=\"field9\",field_a=field9a,field_b=\"\" ${timestamp9}",
        #{
            measurement => "m\\9",
@ -263,7 +272,9 @@
        fields => [{"field", "\"field\\4\""}],
        timestamp => undefined
    }},
-    {" m5\\,mA,tag=\\=tag5\\=,\\,tag_a\\,=tag\\ 5a,tag_b=tag5b   \\ field\\ =field5,field\\ _\\ a=field5a,\\,field_b\\ =\\=\\,\\ field5b   ${timestamp5}    ",
+    {
+        " m5\\,mA,tag=\\=tag5\\=,\\,tag_a\\,=tag\\ 5a,tag_b=tag5b   \\ field\\ =field5,"
+        "field\\ _\\ a=field5a,\\,field_b\\ =\\=\\,\\ field5b   ${timestamp5}    ",
        #{
            measurement => "m5,mA",
            tags => [{"tag", "=tag5="}, {",tag_a,", "tag 5a"}, {"tag_b", "tag5b"}],
@ -271,7 +282,8 @@
                {" field ", "field5"}, {"field _ a", "field5a"}, {",field_b ", "=, field5b"}
            ],
            timestamp => "${timestamp5}"
-        }},
+        }
+    },
    {"  m6,tag=tag6,tag_a=tag6a,tag_b=tag6b   field=\"field6\",field_a=\"field6a\",field_b=\"field6b\"  ",
        #{
            measurement => "m6",
@ -330,7 +342,7 @@ to_influx_lines(RawLines) ->
    try
        %% mute error logs from this call
        emqx_logger:set_primary_log_level(none),
-        emqx_ee_bridge_influxdb:to_influx_lines(RawLines)
+        emqx_bridge_influxdb:to_influx_lines(RawLines)
    after
        emqx_logger:set_primary_log_level(OldLevel)
    end.
--- a/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_producer_SUITE.erl
+++ b/apps/emqx_bridge_kafka/test/emqx_bridge_kafka_impl_producer_SUITE.erl
@ -583,7 +583,7 @@ config(Args0, More) ->
    ct:pal("Running tests with conf:\n~p", [Conf]),
    InstId = maps:get("instance_id", Args),
    <<"bridge:", BridgeId/binary>> = InstId,
-    {Type, Name} = emqx_bridge_resource:parse_bridge_id(BridgeId),
+    {Type, Name} = emqx_bridge_resource:parse_bridge_id(BridgeId, #{atom_name => false}),
    TypeBin = atom_to_binary(Type),
    hocon_tconf:check_plain(
        emqx_bridge_schema,
@ -596,7 +596,7 @@ config(Args0, More) ->
 hocon_config(Args) ->
    InstId = maps:get("instance_id", Args),
    <<"bridge:", BridgeId/binary>> = InstId,
-    {_Type, Name} = emqx_bridge_resource:parse_bridge_id(BridgeId),
+    {_Type, Name} = emqx_bridge_resource:parse_bridge_id(BridgeId, #{atom_name => false}),
    AuthConf = maps:get("authentication", Args),
    AuthTemplate = iolist_to_binary(hocon_config_template_authentication(AuthConf)),
    AuthConfRendered = bbmustache:render(AuthTemplate, AuthConf),
--- a/apps/emqx_bridge_pulsar/src/emqx_bridge_pulsar.app.src
+++ b/apps/emqx_bridge_pulsar/src/emqx_bridge_pulsar.app.src
@ -1,6 +1,6 @@
 {application, emqx_bridge_pulsar, [
    {description, "EMQX Pulsar Bridge"},
-    {vsn, "0.1.1"},
+    {vsn, "0.1.2"},
    {registered, []},
    {applications, [
        kernel,
--- a/apps/emqx_bridge_pulsar/src/emqx_bridge_pulsar.erl
+++ b/apps/emqx_bridge_pulsar/src/emqx_bridge_pulsar.erl
@ -140,7 +140,7 @@ fields(producer_resource_opts) ->
    lists:filtermap(
        fun
            ({health_check_interval = Field, MetaFn}) ->
-                {true, {Field, override_default(MetaFn, 1_000)}};
+                {true, {Field, override_default(MetaFn, <<"1s">>)}};
            ({Field, _Meta}) ->
                lists:member(Field, SupportedOpts)
        end,
--- a/apps/emqx_conf/test/emqx_conf_schema_tests.erl
+++ b/apps/emqx_conf/test/emqx_conf_schema_tests.erl
@ -116,6 +116,87 @@ authn_validations_test() ->
    ),
    ok.

+%% erlfmt-ignore
+-define(LISTENERS,
+    """
+        listeners.ssl.default.bind = 9999
+        listeners.wss.default.bind = 9998
+        listeners.wss.default.ssl_options.cacertfile = \"mytest/certs/cacert.pem\"
+        listeners.wss.new.bind = 9997
+        listeners.wss.new.websocket.mqtt_path = \"/my-mqtt\"
+    """
+).
+
+listeners_test() ->
+    BaseConf = to_bin(?BASE_CONF, ["emqx1@127.0.0.1", "emqx1@127.0.0.1"]),
+
+    Conf = <<BaseConf/binary, ?LISTENERS>>,
+    {ok, ConfMap0} = hocon:binary(Conf, #{format => richmap}),
+    {_, ConfMap} = hocon_tconf:map_translate(emqx_conf_schema, ConfMap0, #{format => richmap}),
+    #{<<"listeners">> := Listeners} = hocon_util:richmap_to_map(ConfMap),
+    #{
+        <<"tcp">> := #{<<"default">> := Tcp},
+        <<"ws">> := #{<<"default">> := Ws},
+        <<"wss">> := #{<<"default">> := DefaultWss, <<"new">> := NewWss},
+        <<"ssl">> := #{<<"default">> := Ssl}
+    } = Listeners,
+    DefaultCacertFile = <<"${EMQX_ETC_DIR}/certs/cacert.pem">>,
+    DefaultCertFile = <<"${EMQX_ETC_DIR}/certs/cert.pem">>,
+    DefaultKeyFile = <<"${EMQX_ETC_DIR}/certs/key.pem">>,
+    ?assertMatch(
+        #{
+            <<"bind">> := {{0, 0, 0, 0}, 1883},
+            <<"enabled">> := true
+        },
+        Tcp
+    ),
+    ?assertMatch(
+        #{
+            <<"bind">> := {{0, 0, 0, 0}, 8083},
+            <<"enabled">> := true,
+            <<"websocket">> := #{<<"mqtt_path">> := "/mqtt"}
+        },
+        Ws
+    ),
+    ?assertMatch(
+        #{
+            <<"bind">> := 9999,
+            <<"ssl_options">> := #{
+                <<"cacertfile">> := DefaultCacertFile,
+                <<"certfile">> := DefaultCertFile,
+                <<"keyfile">> := DefaultKeyFile
+            }
+        },
+        Ssl
+    ),
+    ?assertMatch(
+        #{
+            <<"bind">> := 9998,
+            <<"websocket">> := #{<<"mqtt_path">> := "/mqtt"},
+            <<"ssl_options">> :=
+                #{
+                    <<"cacertfile">> := <<"mytest/certs/cacert.pem">>,
+                    <<"certfile">> := DefaultCertFile,
+                    <<"keyfile">> := DefaultKeyFile
+                }
+        },
+        DefaultWss
+    ),
+    ?assertMatch(
+        #{
+            <<"bind">> := 9997,
+            <<"websocket">> := #{<<"mqtt_path">> := "/my-mqtt"},
+            <<"ssl_options">> :=
+                #{
+                    <<"cacertfile">> := DefaultCacertFile,
+                    <<"certfile">> := DefaultCertFile,
+                    <<"keyfile">> := DefaultKeyFile
+                }
+        },
+        NewWss
+    ),
+    ok.
+
 doc_gen_test() ->
    %% the json file too large to encode.
    {
--- a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
@ -2,7 +2,7 @@
 {application, emqx_rule_engine, [
    {description, "EMQX Rule Engine"},
    % strict semver, bump manually!
-    {vsn, "5.0.15"},
+    {vsn, "5.0.16"},
    {modules, []},
    {registered, [emqx_rule_engine_sup, emqx_rule_engine]},
    {applications, [kernel, stdlib, rulesql, getopt, emqx_ctl]},
--- a/apps/emqx_rule_engine/src/emqx_rule_engine.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine.erl
@ -341,7 +341,10 @@ get_basic_usage_info() ->
 tally_referenced_bridges(BridgeIDs, Acc0) ->
    lists:foldl(
        fun(BridgeID, Acc) ->
-            {BridgeType, _BridgeName} = emqx_bridge_resource:parse_bridge_id(BridgeID),
+            {BridgeType, _BridgeName} = emqx_bridge_resource:parse_bridge_id(
+                BridgeID,
+                #{atom_name => false}
+            ),
            maps:update_with(
                BridgeType,
                fun(X) -> X + 1 end,
--- a/changes/ce/fix-10659.en.md
+++ b/changes/ce/fix-10659.en.md
@ -0,0 +1 @@
+Fix the issue where emqx cannot start when `sysmon.os.mem_check_interval` is disabled.
--- a/changes/ce/fix-10708.md
+++ b/changes/ce/fix-10708.md
@ -0,0 +1 @@
+Enhanced clarity of the descriptions for the bridge configuration fields (username and password) to better guide users during setup.
--- a/changes/ee/feat-10679.en.md
+++ b/changes/ee/feat-10679.en.md
@ -0,0 +1 @@
+Refactor the directory structure of the InfluxDB data bridge.
--- a/changes/ee/fix-10672.en.md
+++ b/changes/ee/fix-10672.en.md
@ -0,0 +1,2 @@
+Fix the issue where the lack of a default value for ssl_options in listeners results in startup failure.
+For example, such command(`EMQX_LISTENERS__WSS__DEFAULT__BIND='0.0.0.0:8089' ./bin/emqx console`) would have caused a crash before.
--- a/lib-ee/emqx_ee_bridge/docker-ct
+++ b/lib-ee/emqx_ee_bridge/docker-ct
@ -1,5 +1,4 @@
 toxiproxy
-influxdb
 mongo
 mongo_rs_sharded
 mysql
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src
@ -16,7 +16,8 @@
        emqx_bridge_sqlserver,
        emqx_bridge_rocketmq,
        emqx_bridge_rabbitmq,
-        emqx_bridge_tdengine
+        emqx_bridge_tdengine,
+        emqx_bridge_influxdb
    ]},
    {env, []},
    {modules, []},
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl
@ -24,8 +24,8 @@ api_schemas(Method) ->
        ref(emqx_ee_bridge_mongodb, Method ++ "_sharded"),
        ref(emqx_ee_bridge_mongodb, Method ++ "_single"),
        ref(emqx_ee_bridge_hstreamdb, Method),
-        ref(emqx_ee_bridge_influxdb, Method ++ "_api_v1"),
-        ref(emqx_ee_bridge_influxdb, Method ++ "_api_v2"),
+        ref(emqx_bridge_influxdb, Method ++ "_api_v1"),
+        ref(emqx_bridge_influxdb, Method ++ "_api_v2"),
        ref(emqx_ee_bridge_redis, Method ++ "_single"),
        ref(emqx_ee_bridge_redis, Method ++ "_sentinel"),
        ref(emqx_ee_bridge_redis, Method ++ "_cluster"),
@ -49,7 +49,7 @@ schema_modules() ->
        emqx_bridge_cassandra,
        emqx_ee_bridge_hstreamdb,
        emqx_bridge_gcp_pubsub,
-        emqx_ee_bridge_influxdb,
+        emqx_bridge_influxdb,
        emqx_ee_bridge_mongodb,
        emqx_ee_bridge_mysql,
        emqx_ee_bridge_redis,
@ -92,8 +92,8 @@ resource_type(mongodb_rs) -> emqx_ee_connector_mongodb;
 resource_type(mongodb_sharded) -> emqx_ee_connector_mongodb;
 resource_type(mongodb_single) -> emqx_ee_connector_mongodb;
 resource_type(mysql) -> emqx_connector_mysql;
-resource_type(influxdb_api_v1) -> emqx_ee_connector_influxdb;
-resource_type(influxdb_api_v2) -> emqx_ee_connector_influxdb;
+resource_type(influxdb_api_v1) -> emqx_bridge_influxdb_connector;
+resource_type(influxdb_api_v2) -> emqx_bridge_influxdb_connector;
 resource_type(redis_single) -> emqx_ee_connector_redis;
 resource_type(redis_sentinel) -> emqx_ee_connector_redis;
 resource_type(redis_cluster) -> emqx_ee_connector_redis;
@ -247,7 +247,7 @@ influxdb_structs() ->
    [
        {Protocol,
            mk(
-                hoconsc:map(name, ref(emqx_ee_bridge_influxdb, Protocol)),
+                hoconsc:map(name, ref(emqx_bridge_influxdb, Protocol)),
                #{
                    desc => <<"InfluxDB Bridge Config">>,
                    required => false
--- a/lib-ee/emqx_ee_connector/include/emqx_ee_connector.hrl
+++ b/lib-ee/emqx_ee_connector/include/emqx_ee_connector.hrl
@ -1,5 +0,0 @@
-%%--------------------------------------------------------------------
-%% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
-%%-------------------------------------------------------------------
-
-define(INFLUXDB_DEFAULT_PORT, 8086).
--- a/lib-ee/emqx_ee_connector/rebar.config
+++ b/lib-ee/emqx_ee_connector/rebar.config
@ -2,7 +2,6 @@
 {erl_opts, [debug_info]}.
 {deps, [
  {hstreamdb_erl, {git, "https://github.com/hstreamdb/hstreamdb_erl.git", {tag, "0.2.5"}}},
-  {influxdb, {git, "https://github.com/emqx/influxdb-client-erl", {tag, "1.1.9"}}},
  {clickhouse, {git, "https://github.com/emqx/clickhouse-client-erl", {tag, "0.3"}}},
  {emqx, {path, "../../apps/emqx"}},
  {emqx_utils, {path, "../../apps/emqx_utils"}}
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector.app.src
@ -7,7 +7,6 @@
        stdlib,
        ecpool,
        hstreamdb_erl,
-        influxdb,
        clickhouse
    ]},
    {env, []},
--- a/mix.exs
+++ b/mix.exs
@ -65,7 +65,7 @@ defmodule EMQXUmbrella.MixProject do
      # maybe forbid to fetch quicer
      {:emqtt,
       github: "emqx/emqtt", tag: "1.8.5", override: true, system_env: maybe_no_quic_env()},
-      {:rulesql, github: "emqx/rulesql", tag: "0.1.5"},
+      {:rulesql, github: "emqx/rulesql", tag: "0.1.6"},
      {:observer_cli, "1.7.1"},
      {:system_monitor, github: "ieQu1/system_monitor", tag: "3.0.3"},
      {:telemetry, "1.1.0"},
--- a/rebar.config
+++ b/rebar.config
@ -70,7 +70,7 @@
    , {replayq, {git, "https://github.com/emqx/replayq.git", {tag, "0.3.7"}}}
    , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}
    , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.8.5"}}}
-    , {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.1.5"}}}
+    , {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.1.6"}}}
    , {observer_cli, "1.7.1"} % NOTE: depends on recon 2.5.x
    , {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}}
    , {getopt, "1.0.2"}
--- a/rel/i18n/emqx_ee_bridge_influxdb.hocon
+++ b/rel/i18n/emqx_ee_bridge_influxdb.hocon
@ -1,4 +1,4 @@
-emqx_ee_bridge_influxdb {
+emqx_bridge_influxdb {

 config_enable.desc:
 """Enable or disable this bridge."""
--- a/rel/i18n/emqx_bridge_influxdb_connector.hocon
+++ b/rel/i18n/emqx_bridge_influxdb_connector.hocon
@ -1,4 +1,4 @@
-emqx_ee_connector_influxdb {
+emqx_bridge_influxdb_connector {

 bucket.desc:
 """InfluxDB bucket name."""
--- a/rel/i18n/emqx_connector_schema_lib.hocon
+++ b/rel/i18n/emqx_connector_schema_lib.hocon
@ -13,7 +13,7 @@ database_desc.label:
 """Database Name"""

 password.desc:
-"""EMQX's password in the external database."""
+"""The password associated with the bridge, used for authentication with the external database."""

 password.label:
 """Password"""
@ -37,7 +37,7 @@ ssl.label:
 """Enable SSL"""

 username.desc:
-"""EMQX's username in the external database."""
+"""The username associated with the bridge in the external database used for authentication or identification purposes."""

 username.label:
 """Username"""
--- a/rel/i18n/zh/emqx_ee_bridge_influxdb.hocon
+++ b/rel/i18n/zh/emqx_ee_bridge_influxdb.hocon
@ -1,4 +1,4 @@
-emqx_ee_bridge_influxdb {
+emqx_bridge_influxdb {

 config_enable.desc:
 """启用/禁用桥接。"""
--- a/rel/i18n/zh/emqx_bridge_influxdb_connector.hocon
+++ b/rel/i18n/zh/emqx_bridge_influxdb_connector.hocon
@ -1,4 +1,4 @@
-emqx_ee_connector_influxdb {
+emqx_bridge_influxdb_connector {

 bucket.desc:
 """InfluxDB bucket 名称。"""
				`@ -0,0 +1 @@`
				Fix the issue where emqx cannot start when `sysmon.os.mem_check_interval` is disabled.
				`@ -0,0 +1 @@`
				`Enhanced clarity of the descriptions for the bridge configuration fields (username and password) to better guide users during setup.`
				`@ -0,0 +1 @@`
				`Refactor the directory structure of the InfluxDB data bridge.`