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

fix: alarms api return time (#5612)

This commit is contained in:
DDDHuang 2021-08-31 19:12:27 +08:00 committed by GitHub
parent 00d469976f
commit 8d2b72c278
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/emqx/src/emqx_alarm.erl
View File

@ -159,6 +159,7 @@ format(#activated_alarm{name = Name, message = Message, activate_at = At, detail
name => Name, name => Name,
message => Message, message => Message,
duration => (Now - At) div 1000, %% to millisecond duration => (Now - At) div 1000, %% to millisecond
activate_at => to_rfc3339(At),
details => Details details => Details
}; };
format(#deactivated_alarm{name = Name, message = Message, activate_at = At, details = Details, format(#deactivated_alarm{name = Name, message = Message, activate_at = At, details = Details,
@ -168,11 +169,16 @@ format(#deactivated_alarm{name = Name, message = Message, activate_at = At, deta
name => Name, name => Name,
message => Message, message => Message,
duration => DAt - At, duration => DAt - At,
activate_at => to_rfc3339(At),
deactivate_at => to_rfc3339(DAt),
details => Details details => Details
}; };
format(_) -> format(_) ->
{error, unknow_alarm}. {error, unknow_alarm}.
to_rfc3339(Timestamp) ->
list_to_binary(calendar:system_time_to_rfc3339(Timestamp div 1000, [{unit, millisecond}])).
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% gen_server callbacks %% gen_server callbacks
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------

4
apps/emqx_management/src/emqx_mgmt_api_alarms.erl
View File

@ -42,7 +42,9 @@ properties() ->
{name, string, <<"Alarm name">>}, {name, string, <<"Alarm name">>},
{message, string, <<"Alarm readable information">>}, {message, string, <<"Alarm readable information">>},
{details, object}, {details, object},
{duration, integer, <<"Alarms duration time; UNIX time stamp">>} {duration, integer, <<"Alarms duration time; UNIX time stamp, millisecond">>},
{activate_at, string, <<"Alarms activate time, RFC 3339">>},
{deactivate_at, string, <<"Nullable, alarms deactivate time, RFC 3339">>}
]). ]).
alarms_api() -> alarms_api() ->