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

fix(prom_di): metric `emqx_rule_enable`

This commit is contained in:
JimMoen 2024-01-18 10:08:41 +08:00
parent 5534d5e9de
commit 9627124d67
No known key found for this signature in database
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/emqx_prometheus/src/emqx_prometheus_data_integration.erl
View File

@ -61,6 +61,7 @@
]). ]).
-define(RULES_SPECIFIC_WITH_TYPE, [ -define(RULES_SPECIFIC_WITH_TYPE, [
{emqx_rule_enable, gauge},
{emqx_rule_matched, counter}, {emqx_rule_matched, counter},
{emqx_rule_failed, counter}, {emqx_rule_failed, counter},
{emqx_rule_passed, counter}, {emqx_rule_passed, counter},
@ -234,6 +235,8 @@ collect_di(K = emqx_connectors_count, Data) ->
%%==================== %%====================
%% Specific Rule %% Specific Rule
collect_di(K = emqx_rule_enable, Data) ->
gauge_metrics(?MG(K, Data));
collect_di(K = emqx_rule_matched, Data) -> collect_di(K = emqx_rule_matched, Data) ->
counter_metrics(?MG(K, Data)); counter_metrics(?MG(K, Data));
collect_di(K = emqx_rule_failed, Data) -> collect_di(K = emqx_rule_failed, Data) ->
@ -365,10 +368,11 @@ merge_acc_with_rules(Id, RuleMetrics, PointsAcc) ->
rule_point(Id, V) -> rule_point(Id, V) ->
{[{id, Id}], V}. {[{id, Id}], V}.
get_metric(#{id := Id} = _Rule) -> get_metric(#{id := Id, enable := Bool} = _Rule) ->
case emqx_metrics_worker:get_metrics(rule_metrics, Id) of case emqx_metrics_worker:get_metrics(rule_metrics, Id) of
#{counters := Counters} -> #{counters := Counters} ->
#{ #{
emqx_rule_enable => boolean_to_number(Bool),
emqx_rule_matched => ?MG(matched, Counters), emqx_rule_matched => ?MG(matched, Counters),
emqx_rule_failed => ?MG(failed, Counters), emqx_rule_failed => ?MG(failed, Counters),
emqx_rule_passed => ?MG(passed, Counters), emqx_rule_passed => ?MG(passed, Counters),