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

fix(prom_cert): rm cacertfile expiry epoch

This commit is contained in:
JimMoen 2024-01-18 03:27:37 +08:00
parent 4fb1ff2f9d
commit 5914eb5ca5
No known key found for this signature in database
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/emqx_prometheus/src/emqx_prometheus.erl
View File

@ -746,10 +746,9 @@ emqx_certs() ->
-spec emqx_certs_data() -> -spec emqx_certs_data() ->
[_Point :: {[Label], Epoch}] [_Point :: {[Label], Epoch}]
when when
Label :: TypeLabel | NameLabel | CertTypeLabel, Label :: TypeLabel | NameLabel,
TypeLabel :: {listener_type, ssl | wss | quic}, TypeLabel :: {listener_type, ssl | wss | quic},
NameLabel :: {listener_name, atom()}, NameLabel :: {listener_name, atom()},
CertTypeLabel :: {cert_type, cacertfile | certfile},
Epoch :: non_neg_integer(). Epoch :: non_neg_integer().
emqx_certs_data() -> emqx_certs_data() ->
case emqx_config:get([listeners], undefined) of case emqx_config:get([listeners], undefined) of
@ -769,7 +768,7 @@ emqx_certs_data() ->
points_of_listeners(Type, AllListeners) -> points_of_listeners(Type, AllListeners) ->
do_points_of_listeners(Type, maps:get(Type, AllListeners, undefined)). do_points_of_listeners(Type, maps:get(Type, AllListeners, undefined)).
-define(CERT_TYPES, [cacertfile, certfile]). -define(CERT_TYPES, [certfile]).
-spec do_points_of_listeners(Type, TypeOfListeners) -> -spec do_points_of_listeners(Type, TypeOfListeners) ->
[_Point :: {[{LabelKey, LabelValue}], Epoch}] [_Point :: {[{LabelKey, LabelValue}], Epoch}]
@ -792,7 +791,7 @@ do_points_of_listeners(ListenerType, TypeOfListeners) ->
) )
of of
undefined -> AccIn; undefined -> AccIn;
Path -> [gen_point(ListenerType, Name, CertType, Path) | AccIn] Path -> [gen_point(ListenerType, Name, Path) | AccIn]
end end
end, end,
[], [],
@ -803,13 +802,12 @@ do_points_of_listeners(ListenerType, TypeOfListeners) ->
maps:keys(TypeOfListeners) maps:keys(TypeOfListeners)
). ).
gen_point(Type, Name, CertType, Path) -> gen_point(Type, Name, Path) ->
{ {
%% Labels: [{_Labelkey, _LabelValue}] %% Labels: [{_Labelkey, _LabelValue}]
[ [
{listener_type, Type}, {listener_type, Type},
{listener_name, Name}, {listener_name, Name}
{cert_type, CertType}
], ],
%% Value %% Value
cert_expiry_at_from_path(Path) cert_expiry_at_from_path(Path)