diff --git a/apps/emqx_bridge/src/schema/emqx_bridge_mqtt_config.erl b/apps/emqx_bridge/src/schema/emqx_bridge_mqtt_config.erl index 2e4c17a25..997337c9d 100644 --- a/apps/emqx_bridge/src/schema/emqx_bridge_mqtt_config.erl +++ b/apps/emqx_bridge/src/schema/emqx_bridge_mqtt_config.erl @@ -14,6 +14,8 @@ %% limitations under the License. %%-------------------------------------------------------------------- +%% @doc This module was created to convert old version (from v5.0.0 to v5.0.11) +%% mqtt connector configs to newer version (developed for enterprise edition). -module(emqx_bridge_mqtt_config). -export([ diff --git a/apps/emqx_bridge/src/schema/emqx_bridge_schema.erl b/apps/emqx_bridge/src/schema/emqx_bridge_schema.erl index 31fc3bcc1..756a8347d 100644 --- a/apps/emqx_bridge/src/schema/emqx_bridge_schema.erl +++ b/apps/emqx_bridge/src/schema/emqx_bridge_schema.erl @@ -96,13 +96,17 @@ fields(bridges) -> {webhook, mk( hoconsc:map(name, ref(emqx_bridge_webhook_schema, "config")), - #{desc => ?DESC("bridges_webhook")} + #{ + desc => ?DESC("bridges_webhook"), + required => false + } )}, {mqtt, mk( hoconsc:map(name, ref(emqx_bridge_mqtt_schema, "config")), #{ desc => ?DESC("bridges_mqtt"), + required => false, converter => fun emqx_bridge_mqtt_config:upgrade_pre_ee/1 } )} diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl index 96efee066..e0d362f5e 100644 --- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl +++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl @@ -62,17 +62,26 @@ fields(bridges) -> {kafka, mk( hoconsc:map(name, ref(emqx_ee_bridge_kafka, "config")), - #{desc => <<"EMQX Enterprise Config">>} + #{ + desc => <<"Kafka Bridge Config">>, + required => false + } )}, {hstreamdb, mk( hoconsc:map(name, ref(emqx_ee_bridge_hstreamdb, "config")), - #{desc => <<"EMQX Enterprise Config">>} + #{ + desc => <<"HStreamDB Bridge Config">>, + required => false + } )}, {mysql, mk( hoconsc:map(name, ref(emqx_ee_bridge_mysql, "config")), - #{desc => <<"EMQX Enterprise Config">>} + #{ + desc => <<"MySQL Bridge Config">>, + required => false + } )} ] ++ mongodb_structs() ++ influxdb_structs(). @@ -81,7 +90,10 @@ mongodb_structs() -> {Type, mk( hoconsc:map(name, ref(emqx_ee_bridge_mongodb, Type)), - #{desc => <<"EMQX Enterprise Config">>} + #{ + desc => <<"MongoDB Bridge Config">>, + required => false + } )} || Type <- [mongodb_rs, mongodb_sharded, mongodb_single] ]. @@ -91,7 +103,10 @@ influxdb_structs() -> {Protocol, mk( hoconsc:map(name, ref(emqx_ee_bridge_influxdb, Protocol)), - #{desc => <<"EMQX Enterprise Config">>} + #{ + desc => <<"InfluxDB Bridge Config">>, + required => false + } )} || Protocol <- [ %% influxdb_udp,