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

Merge pull request #6494 from JimMoen/fix-os-info 

fix(telemetry): use required fields, rolling distro use PRETTY_NAME
This commit is contained in:
JimMoen 2022-01-10 17:32:16 +08:00 committed by GitHub
parent 2ee683d2f9 2fba756aea
commit 43442577ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib-ce/emqx_telemetry/src/emqx_telemetry.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_telemetry, {application, emqx_telemetry,
[{description, "EMQ X Telemetry"}, [{description, "EMQ X Telemetry"},
{vsn, "4.3.1"}, % strict semver, bump manually! {vsn, "4.3.2"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_telemetry_sup]}, {registered, [emqx_telemetry_sup]},
{applications, [kernel,stdlib]}, {applications, [kernel,stdlib]},

4
lib-ce/emqx_telemetry/src/emqx_telemetry.appup.src
View File

@ -1,13 +1,13 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
{VSN, {VSN,
[ [
{"4.3.0", [ {<<"4\\.3\\.[0-1]">>, [
{load_module, emqx_telemetry, brutal_purge, soft_purge, []} {load_module, emqx_telemetry, brutal_purge, soft_purge, []}
]}, ]},
{<<".*">>, []} {<<".*">>, []}
], ],
[ [
{"4.3.0", [ {<<"4\\.3\\.[0-1]">>, [
{load_module, emqx_telemetry, brutal_purge, soft_purge, []} {load_module, emqx_telemetry, brutal_purge, soft_purge, []}
]}, ]},
{<<".*">>, []} {<<".*">>, []}

36
lib-ce/emqx_telemetry/src/emqx_telemetry.erl
View File

@ -253,29 +253,23 @@ os_info() ->
[{os_name, Name}, [{os_name, Name},
{os_version, Version}]; {os_version, Version}];
{unix, _} -> {unix, _} ->
case file:read_file_info("/etc/os-release") of case file:read_file("/etc/os-release") of
{error, _} -> {error, _} ->
[{os_name, "Unknown"}, [{os_name, "Unknown"},
{os_version, "Unknown"}]; {os_version, "Unknown"}];
{ok, FileInfo} -> {ok, FileContent} ->
case FileInfo#file_info.access of OSInfo = lists:foldl(fun(Line, Acc) ->
Access when Access =:= read orelse Access =:= read_write -> [Var, Value] = string:tokens(Line, "="),
OSInfo = lists:foldl(fun(Line, Acc) -> NValue = case Value of
[Var, Value] = string:tokens(Line, "="), _ when is_list(Value) ->
NValue = case Value of lists:nth(1, string:tokens(Value, "\""));
_ when is_list(Value) -> _ ->
lists:nth(1, string:tokens(Value, "\"")); Value
_ -> end,
Value [{Var, NValue} | Acc]
end, end, [], string:tokens(binary:bin_to_list(FileContent), "\n")),
[{Var, NValue} | Acc] [{os_name, get_value("NAME", OSInfo)},
end, [], string:tokens(os:cmd("cat /etc/os-release"), "\n")), {os_version, get_value("VERSION", OSInfo, get_value("VERSION_ID", OSInfo, get_value("PRETTY_NAME", OSInfo)))}]
[{os_name, get_value("NAME", OSInfo)},
{os_version, get_value("VERSION", OSInfo, get_value("VERSION_ID", OSInfo))}];
_ ->
[{os_name, "Unknown"},
{os_version, "Unknown"}]
end
end; end;
{win32, nt} -> {win32, nt} ->
Ver = os:cmd("ver"), Ver = os:cmd("ver"),
@ -429,5 +423,7 @@ module_attributes(Module) ->
bin(L) when is_list(L) -> bin(L) when is_list(L) ->
list_to_binary(L); list_to_binary(L);
bin(A) when is_atom(A) ->
atom_to_binary(A);
bin(B) when is_binary(B) -> bin(B) when is_binary(B) ->
B. B.