From b8e2c7638225e0c8eab69653cb18bd806a528083 Mon Sep 17 00:00:00 2001 From: DDDHuang <44492639+DDDHuang@users.noreply.github.com> Date: Tue, 12 Apr 2022 15:10:26 +0800 Subject: [PATCH] fix: remove routes --- apps/emqx/src/emqx_router_helper.erl | 1 - apps/emqx/src/emqx_stats.erl | 7 -- apps/emqx/test/emqx_proper_types.erl | 4 +- apps/emqx_dashboard/README.md | 89 +------------------ .../emqx_dashboard/include/emqx_dashboard.hrl | 2 +- .../src/emqx_dashboard_monitor.erl | 2 +- .../src/emqx_dashboard_monitor_api.erl | 4 +- apps/emqx_management/src/emqx_mgmt.erl | 16 +--- .../src/emqx_mgmt_api_stats.erl | 6 -- ...pi_routes.erl => emqx_mgmt_api_topics.erl} | 30 +++---- apps/emqx_management/src/emqx_mgmt_cli.erl | 20 ++--- apps/emqx_prometheus/README.md | 4 - apps/emqx_prometheus/src/emqx_prometheus.erl | 8 -- 13 files changed, 34 insertions(+), 159 deletions(-) rename apps/emqx_management/src/{emqx_mgmt_api_routes.erl => emqx_mgmt_api_topics.erl} (88%) diff --git a/apps/emqx/src/emqx_router_helper.erl b/apps/emqx/src/emqx_router_helper.erl index fe7f5548c..1340848ec 100644 --- a/apps/emqx/src/emqx_router_helper.erl +++ b/apps/emqx/src/emqx_router_helper.erl @@ -178,7 +178,6 @@ stats_fun() -> undefined -> ok; Size -> - emqx_stats:setstat('routes.count', 'routes.max', Size), emqx_stats:setstat('topics.count', 'topics.max', Size) end. diff --git a/apps/emqx/src/emqx_stats.erl b/apps/emqx/src/emqx_stats.erl index fc3a1b6e7..7d9854811 100644 --- a/apps/emqx/src/emqx_stats.erl +++ b/apps/emqx/src/emqx_stats.erl @@ -116,12 +116,6 @@ 'subscriptions.shared.max' ]). -%% Route stats --define(ROUTE_STATS, [ - 'routes.count', - 'routes.max' -]). - %% Retained stats -define(RETAINED_STATS, [ 'retained.count', @@ -213,7 +207,6 @@ init(#{tick_ms := TickMs}) -> ?CHANNEL_STATS, ?SESSION_STATS, ?PUBSUB_STATS, - ?ROUTE_STATS, ?RETAINED_STATS ]), true = ets:insert(?TAB, [{Name, 0} || Name <- Stats]), diff --git a/apps/emqx/test/emqx_proper_types.erl b/apps/emqx/test/emqx_proper_types.erl index 1b0972dd6..b56140288 100644 --- a/apps/emqx/test/emqx_proper_types.erl +++ b/apps/emqx/test/emqx_proper_types.erl @@ -328,9 +328,7 @@ systopic_stats() -> <<"subscriptions/shared/max">>, <<"subscriptions/shared/count">>, <<"topics/max">>, - <<"topics/count">>, - <<"routes/max">>, - <<"routes/count">> + <<"topics/count">> ], ?LET( {Nodename, T}, diff --git a/apps/emqx_dashboard/README.md b/apps/emqx_dashboard/README.md index 96c607a50..7466b5afe 100644 --- a/apps/emqx_dashboard/README.md +++ b/apps/emqx_dashboard/README.md @@ -1,88 +1 @@ - -emqx-dashboard -============== - -EMQX Dashboard - -REST API --------- - -The prefix of REST API is '/api/v4/'. - -Method | Path | Description --------|---------------------------------------|------------------------------------ -GET | /nodes/ | A list of nodes in the cluster -GET | /nodes/:node | Lookup a node in the cluster -GET | /brokers/ | A list of brokers in the cluster -GET | /brokers/:node | Get broker info of a node -GET | /metrics/ | A list of metrics of all nodes in the cluster -GET | /nodes/:node/metrics/ | A list of metrics of a node -GET | /stats/ | A list of stats of all nodes in the cluster -GET | /nodes/:node/stats/ | A list of stats of a node -GET | /nodes/:node/clients/ | A list of clients on a node -GET | /listeners/ | A list of listeners in the cluster -GET | /nodes/:node/listeners | A list of listeners on the node -GET | /nodes/:node/sessions/ | A list of sessions on a node -GET | /subscriptions/:clientid | A list of subscriptions of a client -GET | /nodes/:node/subscriptions/:clientid | A list of subscriptions of a client on the node -GET | /nodes/:node/subscriptions/ | A list of subscriptions on a node -PUT | /clients/:clientid/clean_authz_cache | Clean Authorization cache of a client -GET | /configs/ | Get all configs -GET | /nodes/:node/configs/ | Get all configs of a node -GET | /nodes/:node/plugin_configs/:plugin | Get configurations of a plugin on the node -DELETE | /clients/:clientid | Kick out a client -GET | /alarms/:node | List alarms of a node -GET | /alarms/ | List all alarms -GET | /plugins/ | List all plugins in the cluster -GET | /nodes/:node/plugins/ | List all plugins on a node -GET | /routes/ | List routes -POST | /nodes/:node/plugins/:plugin/load | Load a plugin -GET | /clients/:clientid | Lookup a client in the cluster -GET | nodes/:node/clients/:clientid | Lookup a client on node -GET | nodes/:node/sessions/:clientid | Lookup a session in the cluster -GET | nodes/:node/sessions/:clientid | Lookup a session on the node -POST | /mqtt/publish | Publish a MQTT message -POST | /mqtt/subscribe | Subscribe a topic -POST | /nodes/:node/plugins/:plugin/unload | Unload a plugin -POST | /mqtt/unsubscribe | Unsubscribe a topic -PUT | /configs/:app | Update config of an application in the cluster -PUT | /nodes/:node/configs/:app | Update config of an application on a node -PUT | /nodes/:node/plugin_configs/:plugin | Update configurations of a plugin on the node - -Build ------ - -make && make ct - -Configuration ------------- - -``` -dashboard.listener = 18083 - -dashboard.listener.acceptors = 2 - -dashboard.listener.max_clients = 512 -``` - -Load Plugin ------------ - -``` -./bin/emqx_ctl plugins load emqx_dashboard -``` - -Login ------ - -URL: http://host:18083 - -Username: admin - -Password: public - -License -------- - -Apache License Version 2.0 - +# TODO: Doc diff --git a/apps/emqx_dashboard/include/emqx_dashboard.hrl b/apps/emqx_dashboard/include/emqx_dashboard.hrl index de0682039..c49ac8fc9 100644 --- a/apps/emqx_dashboard/include/emqx_dashboard.hrl +++ b/apps/emqx_dashboard/include/emqx_dashboard.hrl @@ -59,7 +59,7 @@ -define(GAUGE_SAMPLER_LIST, [ subscriptions - , routes + , topics , connections ]). diff --git a/apps/emqx_dashboard/src/emqx_dashboard_monitor.erl b/apps/emqx_dashboard/src/emqx_dashboard_monitor.erl index 706458eed..52c2c25af 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_monitor.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_monitor.erl @@ -352,7 +352,7 @@ count_map(M1, M2) -> lists:foldl(Fun, #{}, ?SAMPLER_LIST). value(connections) -> emqx_stats:getstat('connections.count'); -value(routes) -> emqx_stats:getstat('routes.count'); +value(topics) -> emqx_stats:getstat('topics.count'); value(subscriptions) -> emqx_stats:getstat('subscriptions.count'); value(received) -> emqx_metrics:val('messages.received'); value(received_bytes) -> emqx_metrics:val('bytes.received'); diff --git a/apps/emqx_dashboard/src/emqx_dashboard_monitor_api.erl b/apps/emqx_dashboard/src/emqx_dashboard_monitor_api.erl index 5fb65f84e..35597c9ec 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_monitor_api.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_monitor_api.erl @@ -148,8 +148,8 @@ swagger_desc(dropped) -> swagger_desc_format("Dropped messages "); swagger_desc(subscriptions) -> <<"Subscriptions at the time of sampling." " Can only represent the approximate state">>; -swagger_desc(routes) -> - <<"Routes at the time of sampling." +swagger_desc(topics) -> + <<"Count topics at the time of sampling." " Can only represent the approximate state">>; swagger_desc(connections) -> <<"Connections at the time of sampling." diff --git a/apps/emqx_management/src/emqx_mgmt.erl b/apps/emqx_management/src/emqx_mgmt.erl index 8261808da..fecf77070 100644 --- a/apps/emqx_management/src/emqx_mgmt.erl +++ b/apps/emqx_management/src/emqx_mgmt.erl @@ -71,10 +71,6 @@ , do_list_subscriptions/0 ]). -%% Routes --export([ lookup_routes/1 - ]). - %% PubSub -export([ subscribe/2 , do_subscribe/2 @@ -183,8 +179,8 @@ get_stats() -> GlobalStatsKeys = [ 'retained.count' , 'retained.max' - , 'routes.count' - , 'routes.max' + , 'topics.count' + , 'topics.max' , 'subscriptions.shared.count' , 'subscriptions.shared.max' ], @@ -357,13 +353,6 @@ lookup_subscriptions(ClientId) -> lookup_subscriptions(Node, ClientId) -> wrap_rpc(emqx_broker_proto_v1:list_client_subscriptions(Node, ClientId)). -%%-------------------------------------------------------------------- -%% Routes -%%-------------------------------------------------------------------- - -lookup_routes(Topic) -> - emqx_router:lookup_routes(Topic). - %%-------------------------------------------------------------------- %% PubSub %%-------------------------------------------------------------------- @@ -470,6 +459,7 @@ delete_banned(Who) -> item(subscription, {{Topic, ClientId}, Options}) -> #{topic => Topic, clientid => ClientId, options => Options}; + %% TODO: may be delete item(route, #route{topic = Topic, dest = Node}) -> #{topic => Topic, node => Node}; item(route, {Topic, Node}) -> diff --git a/apps/emqx_management/src/emqx_mgmt_api_stats.erl b/apps/emqx_management/src/emqx_mgmt_api_stats.erl index ee28e8f73..af233ef17 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_stats.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_stats.erl @@ -93,12 +93,6 @@ fields(node_stats_data) -> , { 'retained.max' , mk( integer(), #{ desc => <<"Historical maximum number of retained messages">> , example => 0})} - , { 'routes.count' - , mk( integer(), #{ desc => <<"Number of current routes">> - , example => 0})} - , { 'routes.max' - , mk( integer(), #{ desc => <<"Historical maximum number of routes">> - , example => 0})} , { 'sessions.count' , mk( integer(), #{ desc => <<"Number of current sessions">> , example => 0})} diff --git a/apps/emqx_management/src/emqx_mgmt_api_routes.erl b/apps/emqx_management/src/emqx_mgmt_api_topics.erl similarity index 88% rename from apps/emqx_management/src/emqx_mgmt_api_routes.erl rename to apps/emqx_management/src/emqx_mgmt_api_topics.erl index 4f1e42109..249879c62 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_routes.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_topics.erl @@ -14,7 +14,7 @@ %% limitations under the License. %%-------------------------------------------------------------------- --module(emqx_mgmt_api_routes). +-module(emqx_mgmt_api_topics). -include_lib("emqx/include/emqx.hrl"). -include_lib("typerefl/include/types.hrl"). @@ -28,28 +28,28 @@ , fields/1 ]). --export([ routes/2 - , route/2 +-export([ topics/2 + , topic/2 ]). -export([ query/4]). -define(TOPIC_NOT_FOUND, 'TOPIC_NOT_FOUND'). --define(ROUTES_QSCHEMA, [{<<"topic">>, binary}, {<<"node">>, atom}]). +-define(TOPICS_QUERY_SCHEMA, [{<<"topic">>, binary}, {<<"node">>, atom}]). api_spec() -> emqx_dashboard_swagger:spec(?MODULE, #{check_schema => true, translate_body => true}). paths() -> - ["/routes", "/routes/:topic"]. + ["/topics", "/topics/:topic"]. -schema("/routes") -> +schema("/topics") -> #{ - 'operationId' => routes, + 'operationId' => topics, get => #{ - description => <<"EMQX Topics List">>, + description => <<"Topics list">>, parameters => [ topic_param(query), node_param(), @@ -64,11 +64,11 @@ schema("/routes") -> } } }; -schema("/routes/:topic") -> +schema("/topics/:topic") -> #{ - 'operationId' => route, + 'operationId' => topic, get => #{ - description => <<"EMQX Topic List">>, + description => <<"Lookup topic info by name">>, parameters => [topic_param(path)], responses => #{ 200 => hoconsc:mk(hoconsc:ref(topic), #{}), @@ -94,21 +94,21 @@ fields(meta) -> %%%============================================================================================== %% parameters trans -routes(get, #{query_string := Qs}) -> +topics(get, #{query_string := Qs}) -> do_list(generate_topic(Qs)). -route(get, #{bindings := Bindings}) -> +topic(get, #{bindings := Bindings}) -> lookup(generate_topic(Bindings)). %%%============================================================================================== %% api apply do_list(Params) -> Response = emqx_mgmt_api:node_query( - node(), Params, emqx_route, ?ROUTES_QSCHEMA, {?MODULE, query}), + node(), Params, emqx_route, ?TOPICS_QUERY_SCHEMA, {?MODULE, query}), emqx_mgmt_util:generate_response(Response). lookup(#{topic := Topic}) -> - case emqx_mgmt:lookup_routes(Topic) of + case emqx_router:lookup_routes(Topic) of [] -> {404, #{code => ?TOPIC_NOT_FOUND, message => <<"Topic not found">>}}; [Route] -> diff --git a/apps/emqx_management/src/emqx_mgmt_cli.erl b/apps/emqx_management/src/emqx_mgmt_cli.erl index 232011319..4dadd3460 100644 --- a/apps/emqx_management/src/emqx_mgmt_cli.erl +++ b/apps/emqx_management/src/emqx_mgmt_cli.erl @@ -31,7 +31,7 @@ broker/1, cluster/1, clients/1, - routes/1, + topics/1, subscriptions/1, plugins/1, listeners/1, @@ -164,17 +164,17 @@ if_client(ClientId, Fun) -> end. %%-------------------------------------------------------------------- -%% @doc Routes Command +%% @doc Topics Command -routes(["list"]) -> +topics(["list"]) -> dump(emqx_route); -routes(["show", Topic]) -> +topics(["show", Topic]) -> Routes = ets:lookup(emqx_route, bin(Topic)), - [print({emqx_route, Route}) || Route <- Routes]; -routes(_) -> + [print({emqx_topic, Route}) || Route <- Routes]; +topics(_) -> emqx_ctl:usage([ - {"routes list", "List all routes"}, - {"routes show ", "Show a route"} + {"topics list", "List all topics"}, + {"topics show ", "Show a topic"} ]). subscriptions(["list"]) -> @@ -750,9 +750,9 @@ print({client, {ClientId, ChanPid}}) -> end, [format(K, maps:get(K, Info1)) || K <- InfoKeys] ); -print({emqx_route, #route{topic = Topic, dest = {_, Node}}}) -> +print({emqx_topic, #route{topic = Topic, dest = {_, Node}}}) -> emqx_ctl:print("~ts -> ~ts~n", [Topic, Node]); -print({emqx_route, #route{topic = Topic, dest = Node}}) -> +print({emqx_topic, #route{topic = Topic, dest = Node}}) -> emqx_ctl:print("~ts -> ~ts~n", [Topic, Node]); print(#plugin{name = Name, descr = Descr, active = Active}) -> emqx_ctl:print( diff --git a/apps/emqx_prometheus/README.md b/apps/emqx_prometheus/README.md index 6c4461118..ddff9774c 100644 --- a/apps/emqx_prometheus/README.md +++ b/apps/emqx_prometheus/README.md @@ -218,10 +218,6 @@ emqx_connections_max 0 emqx_retained_count 3 # TYPE emqx_retained_max gauge emqx_retained_max 3 -# TYPE emqx_routes_count gauge -emqx_routes_count 0 -# TYPE emqx_routes_max gauge -emqx_routes_max 0 # TYPE emqx_sessions_count gauge emqx_sessions_count 0 # TYPE emqx_sessions_max gauge diff --git a/apps/emqx_prometheus/src/emqx_prometheus.erl b/apps/emqx_prometheus/src/emqx_prometheus.erl index f45fb6ae7..df5598637 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus.erl +++ b/apps/emqx_prometheus/src/emqx_prometheus.erl @@ -248,12 +248,6 @@ emqx_collect(emqx_subscriptions_shared_count, Stats) -> emqx_collect(emqx_subscriptions_shared_max, Stats) -> gauge_metric(?C('subscriptions.shared.max', Stats)); -%% routes -emqx_collect(emqx_routes_count, Stats) -> - gauge_metric(?C('routes.count', Stats)); -emqx_collect(emqx_routes_max, Stats) -> - gauge_metric(?C('routes.max', Stats)); - %% retained emqx_collect(emqx_retained_count, Stats) -> gauge_metric(?C('retained.count', Stats)); @@ -517,8 +511,6 @@ emqx_stats() -> , emqx_subscriptions_max , emqx_subscriptions_shared_count , emqx_subscriptions_shared_max - , emqx_routes_count - , emqx_routes_max , emqx_retained_count , emqx_retained_max ].