root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Only return metrics_gc_queue_length metrics for the requested node. 

This allows the data to be merged correctly further down.

[#153738257]
This commit is contained in:
kjnilsson 2017-12-20 10:23:44 +00:00
parent 4cce5ca514
commit 93456ec48f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl vendored
View File

@ -112,7 +112,7 @@ vhost_data(Ranges, Id) ->
node_data(Ranges, Id) ->
maps:from_list(
[{mgmt_stats, mgmt_qeue_length_stats()}] ++
[{mgmt_stats, mgmt_queue_length_stats(Id)}] ++
[{node_node_metrics, node_node_metrics()}] ++
node_raw_detail_stats_data(Ranges, Id) ++
[raw_message_data(node_coarse_stats,
@ -385,7 +385,7 @@ to_match_condition({Id0, '_'}) when is_tuple(Id0) ->
to_match_condition({Id0, '_'}) ->
{'==', Id0, '$1'}.
mgmt_qeue_length_stats() ->
mgmt_queue_length_stats(Id) when Id =:= node() ->
GCsQueueLengths = lists:map(fun (T) ->
case whereis(rabbit_mgmt_metrics_gc:name(T)) of
P when is_pid(P) ->
@ -396,10 +396,13 @@ mgmt_qeue_length_stats() ->
end
end,
?GC_EVENTS),
[{metrics_gc_queue_length, GCsQueueLengths}].
[{metrics_gc_queue_length, GCsQueueLengths}];
mgmt_queue_length_stats(_Id) ->
% if it isn't for the current node just return an empty list
[].
node_node_metrics() ->
ets:tab2list(node_node_metrics).
maps:from_list(ets:tab2list(node_node_metrics)).
select_range_sample(Table, #range{first = First, last = Last}) ->
Range = Last - First,