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

Merge pull request #6895 from k32/fix-graph 

fix(emqx_mgmt): Fix network graph
This commit is contained in:
k32 2022-01-28 15:43:55 +01:00 committed by GitHub
parent bda1b6d35e 1127057291
commit 5e01961dba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/emqx_management/src/emqx_mgmt.erl
View File

@ -134,8 +134,8 @@ return(_Response) ->
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
list_nodes() -> list_nodes() ->
Running = mnesia:system_info(running_db_nodes), Running = mria_mnesia:cluster_nodes(running),
Stopped = mnesia:system_info(db_nodes) -- Running, Stopped = mria_mnesia:cluster_nodes(stopped),
DownNodes = lists:map(fun stopped_node_info/1, Stopped), DownNodes = lists:map(fun stopped_node_info/1, Stopped),
[{Node, node_info(Node)} || Node <- Running] ++ DownNodes. [{Node, node_info(Node)} || Node <- Running] ++ DownNodes.
@ -157,7 +157,8 @@ node_info() ->
connections => ets:info(emqx_channel, size), connections => ets:info(emqx_channel, size),
node_status => 'Running', node_status => 'Running',
uptime => proplists:get_value(uptime, BrokerInfo), uptime => proplists:get_value(uptime, BrokerInfo),
version => iolist_to_binary(proplists:get_value(version, BrokerInfo)) version => iolist_to_binary(proplists:get_value(version, BrokerInfo)),
role => mria_rlog:role()
}. }.
node_info(Node) -> node_info(Node) ->

3
apps/emqx_management/src/emqx_mgmt_api_nodes.erl
View File

@ -60,7 +60,8 @@ properties() ->
{version, string, <<"EMQ X Broker version">>}, {version, string, <<"EMQ X Broker version">>},
{sys_path, string, <<"EMQ X system file location">>}, {sys_path, string, <<"EMQ X system file location">>},
{log_path, string, <<"EMQ X log file location">>}, {log_path, string, <<"EMQ X log file location">>},
{config_path, string, <<"EMQ X config file location">>} {config_path, string, <<"EMQ X config file location">>},
{role, string, <<"Node role">>}
]). ]).
parameters() -> parameters() ->