From 6fd04e33f556b94aa10e104d46869bf02f65d2a0 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Wed, 28 Feb 2024 15:37:48 +0800 Subject: [PATCH] fix(prom): skip cert info for disabled ssl/wss/quic listeners --- apps/emqx_prometheus/src/emqx_prometheus.erl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/emqx_prometheus/src/emqx_prometheus.erl b/apps/emqx_prometheus/src/emqx_prometheus.erl index 399232c40..3297d12e3 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus.erl +++ b/apps/emqx_prometheus/src/emqx_prometheus.erl @@ -856,10 +856,12 @@ do_points_of_listeners(Type, Listeners) -> lists:foldl( fun(Name, PointsAcc) -> case - emqx_utils_maps:deep_get( - [Name, ssl_options, certfile], Listeners, undefined - ) + emqx_utils_maps:deep_get([Name, enable], Listeners, false) andalso + emqx_utils_maps:deep_get( + [Name, ssl_options, certfile], Listeners, undefined + ) of + false -> PointsAcc; undefined -> PointsAcc; Path -> [gen_point_cert_expiry_at(Type, Name, Path) | PointsAcc] end @@ -894,11 +896,12 @@ cert_expiry_at_from_path(Path0) -> 0 end catch - E:R -> + E:R:S -> ?SLOG(error, #{ msg => "obtain_cert_expiry_time_failed", error => E, reason => R, + stacktrace => S, path => Path0, resolved_path => Path }),