Merge remote-tracking branch 'origin' into management-only-api

deps/rabbitmq_management/priv/www/js/global.js

@@ -210,7 +210,7 @@ var HELP = {
       'Set the queue into lazy mode, keeping as many messages as possible on disk to reduce RAM usage; if not set, the queue will keep an in-memory cache to deliver messages as fast as possible.<br/>(Sets the "<a target="_blank" href="https://www.rabbitmq.com/lazy-queues.html">x-queue-mode</a>" argument.)',
 
     'queue-overflow':
-      'Sets the <a target="_blank" href="https://www.rabbitmq.com/maxlength.html#overflow-behaviour">queue overflow behaviour</a>. This determines what happens to messages when the maximum length of a queue is reached. Valid values are <code>drop-head</code> or <code>reject-publish</code>.',
+      'Sets the <a target="_blank" href="https://www.rabbitmq.com/maxlength.html#overflow-behaviour">queue overflow behaviour</a>. This determines what happens to messages when the maximum length of a queue is reached. Valid values are <code>drop-head</code>, <code>reject-publish</code> or <code>reject-publish-dlx</code>.',
 
     'queue-master-locator':
        'Set the queue into master location mode, determining the rule by which the queue master is located when declared on a cluster of nodes.<br/>(Sets the "<a target="_blank" href="https://www.rabbitmq.com/ha.html">x-queue-master-locator</a>" argument.)',

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

@@ -63,6 +63,13 @@
   </tr>
 </table>
 
+<table class="facts">
+  <tr>
+    <th>Pending Raft commands</th>
+    <td><%= channel.pending_raft_commands %></td>
+  </tr>
+</table>
+
 </div>
 </div>
 

deps/rabbitmq_management/rabbitmq-components.mk

@@ -114,7 +114,7 @@ dep_cowboy = hex 2.6.1
 dep_cowlib = hex 2.7.0
 dep_jsx = hex 2.9.0
 dep_lager = hex 3.6.10
-dep_prometheus = git https://github.com/deadtrickster/prometheus.erl v4.3.0
+dep_prometheus = hex 4.4.0
 dep_ra = git https://github.com/rabbitmq/ra.git master
 dep_ranch = hex 1.7.1
 dep_recon = hex 2.5.0

deps/rabbitmq_management/src/rabbit_mgmt_util.erl

@@ -1029,7 +1029,7 @@ list_visible_vhosts(User = #user{tags = Tags}, AuthzData) ->
 
 list_login_vhosts(User, AuthzData) ->
     [V || V <- rabbit_vhost:list(),
-          case catch rabbit_access_control:check_vhost_access(User, V, AuthzData) of
+          case catch rabbit_access_control:check_vhost_access(User, V, AuthzData, #{}) of
               ok -> true;
               _  -> false
           end].