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

fix: cluster nodes running/stopped with node name as label

This commit is contained in:
JimMoen 2024-03-15 16:07:36 +08:00
parent 0e25eb287b
commit 02b3292025
No known key found for this signature in database
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/emqx_prometheus/src/emqx_prometheus.erl
View File

@ -591,12 +591,19 @@ cluster_metric_meta() ->
{emqx_cluster_nodes_stopped, gauge, undefined} {emqx_cluster_nodes_stopped, gauge, undefined}
]. ].
cluster_data(Mode) -> cluster_data(node) ->
Labels = [],
do_cluster_data(Labels);
cluster_data(_) ->
Labels = [{node, node(self())}],
do_cluster_data(Labels).
do_cluster_data(Labels) ->
Running = emqx:cluster_nodes(running), Running = emqx:cluster_nodes(running),
Stopped = emqx:cluster_nodes(stopped), Stopped = emqx:cluster_nodes(stopped),
#{ #{
emqx_cluster_nodes_running => [{with_node_label(Mode, []), length(Running)}], emqx_cluster_nodes_running => [{Labels, length(Running)}],
emqx_cluster_nodes_stopped => [{with_node_label(Mode, []), length(Stopped)}] emqx_cluster_nodes_stopped => [{Labels, length(Stopped)}]
}. }.
%%======================================== %%========================================

5
apps/emqx_prometheus/src/emqx_prometheus_cluster.erl
View File

@ -23,8 +23,6 @@
collect_json_data/2, collect_json_data/2,
aggre_cluster/3,
point_to_map_fun/1, point_to_map_fun/1,
boolean_to_number/1, boolean_to_number/1,
@ -83,9 +81,6 @@ aggre_cluster(Module, Mode) ->
Module:aggre_or_zip_init_acc() Module:aggre_or_zip_init_acc()
). ).
aggre_cluster(LogicSumKs, ResL, Init) ->
do_aggre_cluster(LogicSumKs, ResL, Init).
do_aggre_cluster(_LogicSumKs, [], AccIn) -> do_aggre_cluster(_LogicSumKs, [], AccIn) ->
AccIn; AccIn;
do_aggre_cluster(LogicSumKs, [{ok, {_NodeName, NodeMetric}} | Rest], AccIn) -> do_aggre_cluster(LogicSumKs, [{ok, {_NodeName, NodeMetric}} | Rest], AccIn) ->