Show redelivery rates.

deps/rabbitmq_management/priv/www/js/tmpl/channels-list.ejs

@@ -2,7 +2,8 @@
 <%
      var col_return_unroutable = !is_col_empty(channels, 'return_unroutable');
      var col_return_not_delivered = !is_col_empty(channels, 'return_not_delivered');
-     var ratesWidth = 4 + (col_return_unroutable ? 1 : 0) + (col_return_not_delivered ? 1 : 0);
+     var col_redeliver = !is_col_empty(channels, 'redeliver');
+     var ratesWidth = 4 + (col_return_unroutable ? 1 : 0) + (col_return_not_delivered ? 1 : 0) + (col_redeliver ? 1 : 0);
 %>
 <table class="list">
  <thead>
@@ -44,6 +45,9 @@
     <% if (col_return_not_delivered) { %>
         <th><%= fmt_sort('return (immediate)', 'message_stats.return_not_delivered_details.rate') %></th>
     <% } %>
+    <% if (col_redeliver) { %>
+        <th><%= fmt_sort('redeliver', 'message_stats.redeliver_details.rate') %></th>
+    <% } %>
 <% } %>
 <% } else { %>
 <!-- TODO make sortable after bug 23401 -->
@@ -64,6 +68,9 @@
     <% if (col_return_not_delivered) { %>
         <th>return (immediate)</th>
     <% } %>
+    <% if (col_redeliver) { %>
+        <th>redeliver</th>
+    <% } %>
 <% } %>
 <% } %>
   </tr>
@@ -107,6 +114,9 @@
     <% if (col_return_not_delivered) { %>
     <td class="r"><%= fmt_rate(channel.message_stats, 'return_not_delivered') %></td>
     <% } %>
+    <% if (col_redeliver) { %>
+        <td class="r"><%= fmt_rate(channel.message_stats, 'redeliver') %></td>
+    <% } %>
 <% } %>
   </tr>
   <% } %>

deps/rabbitmq_management/priv/www/js/tmpl/msg-detail-deliveries.ejs

@@ -9,6 +9,7 @@
 <% } %>
     <th>deliver / get</th>
     <th>ack</th>
+    <th>redeliver</th>
   </tr>
 <%
    for (var i = 0; i < object.length; i++) {
@@ -22,12 +23,14 @@
 <% } %>
        <td class="r"><%= fmt_rate(del.stats, 'deliver_get') %></td>
        <td class="r"><%= fmt_rate(del.stats, 'ack') %></td>
+       <td class="r"><%= fmt_rate(del.stats, 'redeliver') %></td>
      </tr>
 <% } %>
   <tr class="total">
     <th>Total:</th>
     <td><%= fmt_rate(totals, 'deliver_get', false, 'mini-highlight') %></td>
     <td><%= fmt_rate(totals, 'ack', false, 'mini-highlight') %></td>
+    <td><%= fmt_rate(totals, 'redeliver', false, 'mini-highlight') %></td>
   </tr>
 </table>
 <% } else { %>

deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs

@@ -4,13 +4,17 @@
   <div class="hider updatable">
 <%= maybe_truncate(queues) %>
 <% if (queues.length > 0) { %>
+<%
+   var col_redeliver = !is_col_empty(queues, 'redeliver');
+   var ratesWidth = 3 + (col_redeliver ? 1 : 0);
+%>
 <table class="list">
  <thead>
   <tr>
     <th colspan="<% if (nodes_interesting && vhosts_interesting) { %>6<% } else if (nodes_interesting || vhosts_interesting) { %>5<% } else { %>4<% } %>">Overview</th>
     <th colspan="3">Messages</th>
 <% if (statistics_level == 'fine') { %>
-    <th colspan="3">Message rates</th>
+    <th colspan="<%= ratesWidth %>">Message rates</th>
 <% } %>
   </tr>
   <tr>
@@ -31,6 +35,9 @@
     <th><%= fmt_sort('incoming',        'message_stats.publish_details.rate') %></th>
     <th><%= fmt_sort('deliver / get',   'message_stats.deliver_get_details.rate') %></th>
     <th><%= fmt_sort('ack',             'message_stats.ack_details.rate') %></th>
+  <% if (col_redeliver) { %>
+    <th><%= fmt_sort('redeliver',       'message_stats.redeliver_details.rate') %></th>
+  <% } %>
 <% } %>
   </tr>
  </thead>
@@ -63,6 +70,9 @@
     <td class="r"><%= fmt_rate(queue.message_stats, 'publish', false) %></td>
     <td class="r"><%= fmt_rate(queue.message_stats, 'deliver_get', false) %></td>
     <td class="r"><%= fmt_rate(queue.message_stats, 'ack', false) %></td>
+  <% if (col_redeliver) { %>
+    <td class="r"><%= fmt_rate(queue.message_stats, 'redeliver', false) %></td>
+  <% } %>
 <% } %>
   </tr>
   <% } %>

deps/rabbitmq_management/src/rabbit_mgmt_db.erl

@@ -40,7 +40,8 @@
 
 -define(DELIVER_GET, [deliver, deliver_no_ack, get, get_no_ack]).
 -define(FINE_STATS, [publish, ack, deliver_get, confirm,
-                     return_unroutable, return_not_delivered] ++ ?DELIVER_GET).
+                     return_unroutable, return_not_delivered, redeliver] ++
+            ?DELIVER_GET).
 
 -define(
    FINE_STATS_CHANNEL_LIST,