QQ: display per priority message counts in mgmt UI.

This could do with some improvement but has some utility
for now.

Author: kjnilsson

deps/rabbit/src/rabbit_fifo.erl

@@ -948,6 +948,8 @@ overview(#?STATE{consumers = Cons,
     #{
       % num_hi := MsgsHi,
       % num_no := MsgsNo
+      num_active_priorities := NumActivePriorities,
+      detail := Detail
      } = rabbit_fifo_pq:overview(Messages),
 
     Overview = #{type => ?STATE,
@@ -964,7 +966,9 @@ overview(#?STATE{consumers = Cons,
                  enqueue_message_bytes => EnqueueBytes,
                  checkout_message_bytes => CheckoutBytes,
                  discarded_bytes => DiscardedBytes,
-                 smallest_raft_index => smallest_raft_index(State)
+                 smallest_raft_index => smallest_raft_index(State),
+                 num_active_priorities => NumActivePriorities,
+                 messages_by_priority => Detail
                  },
     DlxOverview = dlx_overview(DlxState),
     maps:merge(maps:merge(Overview, DlxOverview), SacOverview).

deps/rabbit/src/rabbit_quorum_queue.erl

@@ -620,6 +620,10 @@ handle_tick(QName,
                                      [{messages_ready_normal, V} | Acc];
                                 (num_ready_messages_return, V, Acc) ->
                                      [{messages_ready_returned, V} | Acc];
+                                (messages_by_priority, V, Acc) ->
+                                     [{messages_by_priority, V} | Acc];
+                                (num_active_priorities, V, Acc) ->
+                                     [{messages_active_priorities, V} | Acc];
                                 (_, _, Acc) ->
                                      Acc
                              end, info(Q, Keys), Overview),

deps/rabbitmq_management/priv/www/js/tmpl/quorum-queue-stats.ejs

@@ -25,6 +25,12 @@
         <th>Open files</th>
         <td><%= fmt_table_short(queue.open_files) %></td>
       </tr>
+      <% if (queue.hasOwnProperty('messages_by_priority')) { %>
+      <tr>
+        <th>Messages by priority</th>
+        <td><%= fmt_table_short(queue.messages_by_priority) %></td>
+      </tr>
+      <% } %>
       <% if (queue.hasOwnProperty('delivery_limit')) { %>
       <tr>
         <th>Delivery limit <span class="help" id="queue-delivery-limit"></th>
@@ -40,8 +46,7 @@
         <th class="horizontal">Total</th>
         <th class="horizontal">Ready</th>
         <th class="horizontal">Unacked</th>
-        <th class="horizontal">High priority</th>
-        <th class="horizontal">Normal priority</th>
+        <th class="horizontal">Active priorities</th>
         <th class="horizontal">Returned</th>
         <th class="horizontal">Dead-lettered
         <span class="help" id="queue-dead-lettered"></span>
@@ -62,10 +67,7 @@
           <%= fmt_num_thousands(queue.messages_unacknowledged) %>
         </td>
         <td class="r">
-          <%= fmt_num_thousands(queue.messages_ready_high) %>
-        </td>
-        <td class="r">
-          <%= fmt_num_thousands(queue.messages_ready_normal) %>
+          <%= fmt_num_thousands(queue.messages_active_priorities) %>
         </td>
         <td class="r">
           <%= fmt_num_thousands(queue.messages_ready_returned) %>
@@ -105,4 +107,4 @@
         </th>
         <td class="r"><%= fmt_bytes(queue.memory) %></td>
       </tr>
-    </table>
+    </table>