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

feat: disable telemetry for ee by default

This commit is contained in:
Zaiming (Stone) Shi 2023-02-03 09:00:34 +01:00
parent af579b2f0e
commit 6362476508
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib-ee/emqx_ee_conf/etc/emqx-enterprise.conf Normal file
View File

@ -0,0 +1 @@
telemetry.enable = false

25
scripts/merge-config.escript
View File

@ -30,7 +30,7 @@ main(_) ->
case IsEnterprise of case IsEnterprise of
true -> true ->
EnterpriseCfgs = get_all_cfgs("lib-ee"), EnterpriseCfgs = get_all_cfgs("lib-ee"),
EnterpriseConf = merge("", EnterpriseCfgs), EnterpriseConf = merge(<<"">>, EnterpriseCfgs),
ok = file:write_file("apps/emqx_conf/etc/emqx-enterprise.conf.all", EnterpriseConf); ok = file:write_file("apps/emqx_conf/etc/emqx-enterprise.conf.all", EnterpriseConf);
false -> false ->
ok ok
@ -41,22 +41,21 @@ is_enterprise() ->
nomatch =/= string:find(Profile, "enterprise"). nomatch =/= string:find(Profile, "enterprise").
merge(BaseConf, Cfgs) -> merge(BaseConf, Cfgs) ->
lists:foldl( Confs = [BaseConf | lists:map(fun read_conf/1, Cfgs)],
fun(CfgFile, Acc) -> infix(lists:filter(fun(I) -> iolist_size(I) > 0 end, Confs), [io_lib:nl(), io_lib:nl()]).
read_conf(CfgFile) ->
case filelib:is_regular(CfgFile) of case filelib:is_regular(CfgFile) of
true -> true ->
{ok, Bin1} = file:read_file(CfgFile), {ok, Bin1} = file:read_file(CfgFile),
case string:trim(Bin1, both) of string:trim(Bin1, both);
<<>> -> Acc;
Bin2 -> [Acc, io_lib:nl(), io_lib:nl(), Bin2]
end;
false -> false ->
Acc <<>>
end end.
end,
BaseConf, infix([], _With) -> [];
Cfgs infix([One], _With) -> [One];
). infix([H | T], With) -> [H, With, infix(T, With)].
get_all_cfgs(Root) -> get_all_cfgs(Root) ->
Apps0 = filelib:wildcard("*", Root) -- ["emqx_machine", "emqx_conf"], Apps0 = filelib:wildcard("*", Root) -- ["emqx_machine", "emqx_conf"],