From 307abde5e62eb105256141af5ef90e5bd7d649d1 Mon Sep 17 00:00:00 2001
From: Luke Bakken <lbakken@pivotal.io>
Date: Thu, 20 Jul 2017 08:33:09 -0700
Subject: [PATCH 1/3] Include node_node_metrics in node_data

This information is used in the "Cluster Links" section of the Management UI
---
 deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl
index 6e502366ab..84b934170a 100644
--- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl
+++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl
@@ -114,6 +114,7 @@ vhost_data(Ranges, Id) ->
 node_data(Ranges, Id) ->
     dict:from_list(
       [{mgmt_stats, mgmt_qeue_length_stats()}] ++
+      [{node_node_metrics, node_node_metrics(Id)}] ++
       node_raw_detail_stats_data(Ranges, Id) ++
       [raw_message_data(node_coarse_stats,
                         pick_range(coarse_node_stats, Ranges), Id),
@@ -384,6 +385,7 @@ to_match_condition({Id0, '_'}) when is_tuple(Id0) ->
     {'==', {Id0}, '$1'};
 to_match_condition({Id0, '_'}) ->
     {'==', Id0, '$1'}.
+
 mgmt_qeue_length_stats() ->
     GCsQueueLengths = lists:map(fun (T) ->
         case whereis(rabbit_mgmt_metrics_gc:name(T)) of
@@ -397,6 +399,12 @@ mgmt_qeue_length_stats() ->
     ?GC_EVENTS),
     [{metrics_gc_queue_length, GCsQueueLengths}].
 
+node_node_metrics(Node) ->
+    case ets:match(node_node_metrics, {{Node, '_'}, '$0'}) of
+        [] -> [];
+        [Metrics] -> Metrics
+    end.
+
 select_range_sample(Table, #range{first = First, last = Last}) ->
     Range = Last - First,
     Policies = rabbit_mgmt_agent_config:get_env(sample_retention_policies),

From 757994a2b929c79461e327a7ca1779c165488ac3 Mon Sep 17 00:00:00 2001
From: Luke Bakken <luke@bakken.io>
Date: Thu, 20 Jul 2017 15:01:07 -0700
Subject: [PATCH 2/3] Just use ets:tab2list

---
 deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl
index 84b934170a..a3ebaf9ab6 100644
--- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl
+++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl
@@ -114,7 +114,7 @@ vhost_data(Ranges, Id) ->
 node_data(Ranges, Id) ->
     dict:from_list(
       [{mgmt_stats, mgmt_qeue_length_stats()}] ++
-      [{node_node_metrics, node_node_metrics(Id)}] ++
+      [{node_node_metrics, node_node_metrics()}] ++
       node_raw_detail_stats_data(Ranges, Id) ++
       [raw_message_data(node_coarse_stats,
                         pick_range(coarse_node_stats, Ranges), Id),
@@ -399,11 +399,8 @@ mgmt_qeue_length_stats() ->
     ?GC_EVENTS),
     [{metrics_gc_queue_length, GCsQueueLengths}].
 
-node_node_metrics(Node) ->
-    case ets:match(node_node_metrics, {{Node, '_'}, '$0'}) of
-        [] -> [];
-        [Metrics] -> Metrics
-    end.
+node_node_metrics() ->
+    ets:tab2list(node_node_metrics).
 
 select_range_sample(Table, #range{first = First, last = Last}) ->
     Range = Last - First,

From fc9609db84f9f7ae88e7b59cf8f6071d28f9762d Mon Sep 17 00:00:00 2001
From: Luke Bakken <lbakken@pivotal.io>
Date: Fri, 21 Jul 2017 07:05:17 -0700
Subject: [PATCH 3/3] whitespace

---
 deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl
index a3ebaf9ab6..2ca8fe66a1 100644
--- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl
+++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl
@@ -42,7 +42,6 @@
          lookup_element/3
         ]).
 
-
 -import(rabbit_misc, [pget/2]).
 
 -type maybe_slide() :: exometer_slide:slide() | not_found.