diff options
| author | kjnilsson <knilsson@pivotal.io> | 2017-12-20 10:23:44 +0000 |
|---|---|---|
| committer | kjnilsson <knilsson@pivotal.io> | 2017-12-20 10:23:44 +0000 |
| commit | 93456ec48f3df54bd1d49e7d8bbf038d030647d9 (patch) | |
| tree | d9409c5aac337dcacf8e2c01ab3339feff9f627c /deps/rabbitmq_management_agent | |
| parent | 4cce5ca514aca5cc99bde3ab0b816f0ea99ea1cb (diff) | |
| download | rabbitmq-server-git-93456ec48f3df54bd1d49e7d8bbf038d030647d9.tar.gz | |
Only return metrics_gc_queue_length metrics for the requested node.
This allows the data to be merged correctly further down.
[#153738257]
Diffstat (limited to 'deps/rabbitmq_management_agent')
| -rw-r--r-- | deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl index a718f3349b..821cf1e0e2 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl @@ -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, |