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

Merge pull request #9012 from JimMoen/rm-influxdb-udp 

Hide influxdb udp bridge.
This commit is contained in:
JimMoen 2022-09-22 10:33:05 +08:00 committed by GitHub
parent 4c0a04f8d5 6788881642
commit 6d37fc8dcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_bridge/src/emqx_bridge.erl
View File

@ -52,8 +52,8 @@
T == webhook; T == webhook;
T == mysql; T == mysql;
T == influxdb_api_v1; T == influxdb_api_v1;
T == influxdb_api_v2; T == influxdb_api_v2
T == influxdb_udp %% T == influxdb_udp
). ).
load() -> load() ->

8
lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl
View File

@ -19,7 +19,7 @@ api_schemas(Method) ->
ref(emqx_ee_bridge_mongodb, Method ++ "_sharded"), ref(emqx_ee_bridge_mongodb, Method ++ "_sharded"),
ref(emqx_ee_bridge_mongodb, Method ++ "_single"), ref(emqx_ee_bridge_mongodb, Method ++ "_single"),
ref(emqx_ee_bridge_hstreamdb, Method), 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_v1"),
ref(emqx_ee_bridge_influxdb, Method ++ "_api_v2") ref(emqx_ee_bridge_influxdb, Method ++ "_api_v2")
]. ].
@ -83,5 +83,9 @@ fields(influxdb) ->
hoconsc:map(name, ref(emqx_ee_bridge_influxdb, Protocol)), hoconsc:map(name, ref(emqx_ee_bridge_influxdb, Protocol)),
#{desc => <<"EMQX Enterprise Config">>} #{desc => <<"EMQX Enterprise Config">>}
)} )}
|| Protocol <- [influxdb_udp, influxdb_api_v1, influxdb_api_v2] || Protocol <- [
%% influxdb_udp,
influxdb_api_v1,
influxdb_api_v2
]
]. ].

6
lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl
View File

@ -485,8 +485,12 @@ log_error_points(InstId, Errs) ->
%% =================================================================== %% ===================================================================
%% typereflt funcs %% typereflt funcs
-spec to_server_raw(string()) -> -spec to_server_raw(string() | binary()) ->
{string(), pos_integer()}. {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) -> to_server_raw(Server) ->
emqx_connector_schema_lib:parse_server(Server, ?INFLUXDB_HOST_OPTIONS). emqx_connector_schema_lib:parse_server(Server, ?INFLUXDB_HOST_OPTIONS).