From bfe4346469558c0e7d3859afe394830368f322b6 Mon Sep 17 00:00:00 2001 From: William Yang Date: Tue, 5 Oct 2021 14:36:36 +0200 Subject: [PATCH] feat(olp): alarm without nodeid --- apps/emqx/src/emqx_alarm.erl | 2 +- apps/emqx/src/emqx_alarm_handler.erl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/emqx/src/emqx_alarm.erl b/apps/emqx/src/emqx_alarm.erl index 381933938..fe9933ae0 100644 --- a/apps/emqx/src/emqx_alarm.erl +++ b/apps/emqx/src/emqx_alarm.erl @@ -400,7 +400,7 @@ normalize(#deactivated_alarm{activate_at = ActivateAt, normalize_message(Name, no_details) -> list_to_binary(io_lib:format("~p", [Name])); -normalize_message({runq_overload, _Node}, #{node := Node, runq_length := Len}) -> +normalize_message(runq_overload, #{node := Node, runq_length := Len}) -> list_to_binary(io_lib:format("Runq is overloaded on node: ~p: ~p", [Node, Len])); normalize_message(high_system_memory_usage, #{high_watermark := HighWatermark}) -> list_to_binary(io_lib:format("System memory usage is higher than ~p%", [HighWatermark])); diff --git a/apps/emqx/src/emqx_alarm_handler.erl b/apps/emqx/src/emqx_alarm_handler.erl index 9e535c733..4cf699895 100644 --- a/apps/emqx/src/emqx_alarm_handler.erl +++ b/apps/emqx/src/emqx_alarm_handler.erl @@ -76,11 +76,11 @@ handle_event({clear_alarm, process_memory_high_watermark}, State) -> {ok, State}; handle_event({set_alarm, {?LC_ALARM_ID_RUNQ, Info}}, State) -> - emqx_alarm:activate({runq_overload, node()}, Info), + emqx_alarm:activate(runq_overload, Info), {ok, State}; handle_event({clear_alarm, ?LC_ALARM_ID_RUNQ}, State) -> - emqx_alarm:deactivate({runq_overload, node()}), + emqx_alarm:deactivate(runq_overload), {ok, State}; handle_event(_, State) ->