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

Merge branch 'rabbitmq-management-434'

This commit is contained in:
Michael Klishin 2017-07-21 18:00:53 +03:00
parent 4d8532bb8f fc9609db84
commit 8af221a75c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,6 @@
lookup_element/3 lookup_element/3
]). ]).
-import(rabbit_misc, [pget/2]). -import(rabbit_misc, [pget/2]).
-type maybe_slide() :: exometer_slide:slide() | not_found. -type maybe_slide() :: exometer_slide:slide() | not_found.
@ -114,6 +113,7 @@ vhost_data(Ranges, Id) ->
node_data(Ranges, Id) -> node_data(Ranges, Id) ->
maps:from_list( maps:from_list(
[{mgmt_stats, mgmt_qeue_length_stats()}] ++ [{mgmt_stats, mgmt_qeue_length_stats()}] ++
[{node_node_metrics, node_node_metrics()}] ++
node_raw_detail_stats_data(Ranges, Id) ++ node_raw_detail_stats_data(Ranges, Id) ++
[raw_message_data(node_coarse_stats, [raw_message_data(node_coarse_stats,
pick_range(coarse_node_stats, Ranges), Id), pick_range(coarse_node_stats, Ranges), Id),
@ -384,6 +384,7 @@ to_match_condition({Id0, '_'}) when is_tuple(Id0) ->
{'==', {Id0}, '$1'}; {'==', {Id0}, '$1'};
to_match_condition({Id0, '_'}) -> to_match_condition({Id0, '_'}) ->
{'==', Id0, '$1'}. {'==', Id0, '$1'}.
mgmt_qeue_length_stats() -> mgmt_qeue_length_stats() ->
GCsQueueLengths = lists:map(fun (T) -> GCsQueueLengths = lists:map(fun (T) ->
case whereis(rabbit_mgmt_metrics_gc:name(T)) of case whereis(rabbit_mgmt_metrics_gc:name(T)) of
@ -397,6 +398,9 @@ mgmt_qeue_length_stats() ->
?GC_EVENTS), ?GC_EVENTS),
[{metrics_gc_queue_length, GCsQueueLengths}]. [{metrics_gc_queue_length, GCsQueueLengths}].
node_node_metrics() ->
ets:tab2list(node_node_metrics).
select_range_sample(Table, #range{first = First, last = Last}) -> select_range_sample(Table, #range{first = First, last = Last}) ->
Range = Last - First, Range = Last - First,
Policies = rabbit_mgmt_agent_config:get_env(sample_retention_policies), Policies = rabbit_mgmt_agent_config:get_env(sample_retention_policies),