diff --git a/apps/emqx_bridge/src/emqx_bridge.erl b/apps/emqx_bridge/src/emqx_bridge.erl index d4d24ef3a..1c2dddeb1 100644 --- a/apps/emqx_bridge/src/emqx_bridge.erl +++ b/apps/emqx_bridge/src/emqx_bridge.erl @@ -52,8 +52,8 @@ T == webhook; T == mysql; T == influxdb_api_v1; - T == influxdb_api_v2; - T == influxdb_udp + T == influxdb_api_v2 + %% T == influxdb_udp ). load() -> 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 840b963cd..47925bb36 100644 --- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl +++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl @@ -19,7 +19,7 @@ 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 ++ "_udp"), + %% ref(emqx_ee_bridge_influxdb, Method ++ "_udp"), ref(emqx_ee_bridge_influxdb, Method ++ "_api_v1"), ref(emqx_ee_bridge_influxdb, Method ++ "_api_v2") ]. @@ -83,5 +83,9 @@ fields(influxdb) -> hoconsc:map(name, ref(emqx_ee_bridge_influxdb, Protocol)), #{desc => <<"EMQX Enterprise Config">>} )} - || Protocol <- [influxdb_udp, influxdb_api_v1, influxdb_api_v2] + || Protocol <- [ + %% influxdb_udp, + influxdb_api_v1, + influxdb_api_v2 + ] ]. diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl index 2024ba8ce..3f86792ff 100644 --- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl +++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl @@ -485,8 +485,12 @@ log_error_points(InstId, Errs) -> %% =================================================================== %% typereflt funcs --spec to_server_raw(string()) -> +-spec to_server_raw(string() | binary()) -> {string(), pos_integer()}. +to_server_raw(<<"http://", Server/binary>>) -> + emqx_connector_schema_lib:parse_server(Server, ?INFLUXDB_HOST_OPTIONS); +to_server_raw(<<"https://", Server/binary>>) -> + emqx_connector_schema_lib:parse_server(Server, ?INFLUXDB_HOST_OPTIONS); to_server_raw(Server) -> emqx_connector_schema_lib:parse_server(Server, ?INFLUXDB_HOST_OPTIONS).