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

Merge pull request #6512 from terry-xiaoyu/fix_rule_api_swagger 

Fix rule api swagger
This commit is contained in:
JianBo He 2021-12-23 10:37:53 +08:00 committed by GitHub
parent b846193556 cd4227b851
commit 967989075c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/emqx_rule_engine/src/emqx_rule_api_schema.erl
View File

@ -68,6 +68,7 @@ fields("rule_events") ->
fields("rule_test") -> fields("rule_test") ->
[ {"context", sc(hoconsc:union([ ref("ctx_pub") [ {"context", sc(hoconsc:union([ ref("ctx_pub")
, ref("ctx_sub") , ref("ctx_sub")
, ref("ctx_unsub")
, ref("ctx_delivered") , ref("ctx_delivered")
, ref("ctx_acked") , ref("ctx_acked")
, ref("ctx_dropped") , ref("ctx_dropped")

7
apps/emqx_rule_engine/src/emqx_rule_engine_api.erl
View File

@ -257,11 +257,16 @@ format_output(Outputs) ->
[do_format_output(Out) || Out <- Outputs]. [do_format_output(Out) || Out <- Outputs].
do_format_output(#{mod := Mod, func := Func, args := Args}) -> do_format_output(#{mod := Mod, func := Func, args := Args}) ->
#{function => list_to_binary(lists:concat([Mod,":",Func])), #{function => printable_function_name(Mod, Func),
args => maps:remove(preprocessed_tmpl, Args)}; args => maps:remove(preprocessed_tmpl, Args)};
do_format_output(BridgeChannelId) when is_binary(BridgeChannelId) -> do_format_output(BridgeChannelId) when is_binary(BridgeChannelId) ->
BridgeChannelId. BridgeChannelId.
printable_function_name(emqx_rule_outputs, Func) ->
Func;
printable_function_name(Mod, Func) ->
list_to_binary(lists:concat([Mod,":",Func])).
get_rule_metrics(Id) -> get_rule_metrics(Id) ->
Format = fun (Node, #{matched := Matched, Format = fun (Node, #{matched := Matched,
rate := Current, rate := Current,

1
apps/emqx_rule_engine/src/emqx_rule_engine_schema.erl
View File

@ -182,6 +182,7 @@ rule_name() ->
{"name", sc(binary(), {"name", sc(binary(),
#{ desc => "The name of the rule" #{ desc => "The name of the rule"
, default => "" , default => ""
, nullable => false
, example => "foo" , example => "foo"
})}. })}.