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

feat(metrics): add acl metrics statistics

This commit is contained in:
JianBo He 2022-02-11 15:20:18 +08:00
parent 9d5a7ead0c
commit f471214956
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/emqx/src/emqx_access_control.erl
View File

@ -40,10 +40,11 @@ authenticate(Credential) ->
-spec authorize(emqx_types:clientinfo(), emqx_types:pubsub(), emqx_types:topic()) -spec authorize(emqx_types:clientinfo(), emqx_types:pubsub(), emqx_types:topic())
-> allow | deny. -> allow | deny.
authorize(ClientInfo, PubSub, Topic) -> authorize(ClientInfo, PubSub, Topic) ->
case emqx_authz_cache:is_enabled() of Result = case emqx_authz_cache:is_enabled() of
true -> check_authorization_cache(ClientInfo, PubSub, Topic); true -> check_authorization_cache(ClientInfo, PubSub, Topic);
false -> do_authorize(ClientInfo, PubSub, Topic) false -> do_authorize(ClientInfo, PubSub, Topic)
end. end,
inc_acl_metrics(Result), Result.
check_authorization_cache(ClientInfo, PubSub, Topic) -> check_authorization_cache(ClientInfo, PubSub, Topic) ->
case emqx_authz_cache:get_authz_cache(PubSub, Topic) of case emqx_authz_cache:get_authz_cache(PubSub, Topic) of
@ -51,7 +52,9 @@ check_authorization_cache(ClientInfo, PubSub, Topic) ->
AuthzResult = do_authorize(ClientInfo, PubSub, Topic), AuthzResult = do_authorize(ClientInfo, PubSub, Topic),
emqx_authz_cache:put_authz_cache(PubSub, Topic, AuthzResult), emqx_authz_cache:put_authz_cache(PubSub, Topic, AuthzResult),
AuthzResult; AuthzResult;
AuthzResult -> AuthzResult AuthzResult ->
inc_acl_metrics(cache_hit),
AuthzResult
end. end.
do_authorize(ClientInfo, PubSub, Topic) -> do_authorize(ClientInfo, PubSub, Topic) ->
@ -65,3 +68,11 @@ do_authorize(ClientInfo, PubSub, Topic) ->
run_hooks(Name, Args, Acc) -> run_hooks(Name, Args, Acc) ->
ok = emqx_metrics:inc(Name), ok = emqx_metrics:inc(Name),
emqx_hooks:run_fold(Name, Args, Acc). emqx_hooks:run_fold(Name, Args, Acc).
-compile({inline, [inc_acl_metrics/1]}).
inc_acl_metrics(allow) ->
emqx_metrics:inc('client.acl.allow');
inc_acl_metrics(deny) ->
emqx_metrics:inc('client.acl.deny');
inc_acl_metrics(cache_hit) ->
emqx_metrics:inc('client.acl.cache_hit').

22
apps/emqx/src/emqx_metrics.erl
View File

@ -183,6 +183,13 @@
{counter, 'session.terminated'} {counter, 'session.terminated'}
]). ]).
%% Statistic metrics for ACL checking
-define(STASTS_ACL_METRICS,
[ {counter, 'client.acl.allow'},
{counter, 'client.acl.deny'},
{counter, 'client.acl.cache_hit'}
]).
%% Overload protetion counters %% Overload protetion counters
-define(OLP_METRICS, -define(OLP_METRICS,
[{counter, 'olp.delay.ok'}, [{counter, 'olp.delay.ok'},
@ -439,6 +446,7 @@ init([]) ->
?DELIVERY_METRICS, ?DELIVERY_METRICS,
?CLIENT_METRICS, ?CLIENT_METRICS,
?SESSION_METRICS, ?SESSION_METRICS,
?STASTS_ACL_METRICS,
?OLP_METRICS ?OLP_METRICS
]), ]),
% Store reserved indices % Store reserved indices
@ -584,10 +592,14 @@ reserved_idx('session.takenover') -> 222;
reserved_idx('session.discarded') -> 223; reserved_idx('session.discarded') -> 223;
reserved_idx('session.terminated') -> 224; reserved_idx('session.terminated') -> 224;
reserved_idx('olp.delay.ok') -> 300; reserved_idx('client.acl.allow') -> 300;
reserved_idx('olp.delay.timeout') -> 301; reserved_idx('client.acl.deny') -> 301;
reserved_idx('olp.hbn') -> 302; reserved_idx('client.acl.cache_hit') -> 302;
reserved_idx('olp.gc') -> 303;
reserved_idx('olp.new_conn') -> 304; reserved_idx('olp.delay.ok') -> 400;
reserved_idx('olp.delay.timeout') -> 401;
reserved_idx('olp.hbn') -> 402;
reserved_idx('olp.gc') -> 403;
reserved_idx('olp.new_conn') -> 404;
reserved_idx(_) -> undefined. reserved_idx(_) -> undefined.