update queues and policies mgmt pages

Add leader-locator as an argument for all queue types
Remove master-locator

Author: mkuratczyk

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

@@ -24,6 +24,7 @@ var KNOWN_ARGS = {'alternate-exchange':        {'short': 'AE',  'type': 'string'
                   'x-dead-letter-exchange':    {'short': 'DLX', 'type': 'string'},
                   'x-dead-letter-routing-key': {'short': 'DLK', 'type': 'string'},
                   'x-queue-master-locator':    {'short': 'ML', 'type': 'string'},
+                  'x-queue-leader-locator':    {'short': 'LL', 'type': 'string'},
                   'x-max-priority':            {'short': 'Pri', 'type': 'int'},
                   'x-single-active-consumer':  {'short': 'SAC', 'type': 'boolean'}};
 
@@ -238,7 +239,7 @@ var HELP = {
       '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>. The quorum queue type only supports <code>drop-head</code> and <code>reject-publish</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.)',
+       'Deprecated: please use `queue-leader-locator` instead. <a target="_blank" href="https://www.rabbitmq.com/docs/clustering#replica-placement">Controls which node the queue will be running on.</a>',
 
     'queue-leader-locator':
        'Set the rule by which the queue leader is located when declared on a cluster of nodes. Valid values are <code>client-local</code> (default) and <code>balanced</code>.',

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

@@ -108,13 +108,13 @@
                   <span class="argument-link" field="definition" key="dead-letter-exchange" type="string">Dead letter exchange</span> |
                   <span class="argument-link" field="definition" key="dead-letter-routing-key" type="string">Dead letter routing key</span><br/>
                   <span class="argument-link" field="definition" key="message-ttl" type="number">Message TTL</span><span class="help" id="queue-message-ttl"></span> |
-                  <span class="argument-link" field="definition" key="consumer-timeout" type="number">Consumer Timeout</span><span class="help" id="queue-consumer-timeout"></span></br>
+                  <span class="argument-link" field="definition" key="consumer-timeout" type="number">Consumer Timeout</span><span class="help" id="queue-consumer-timeout"></span> |
+                  <span class="argument-link" field="definition" key="queue-leader-locator" type="string">Leader locator</span><span class="help" id="queue-leader-locator"></span></br>
                 </td>
               <tr>
                 <td>Queues [Classic]</td>
                 <td>
                   <span class="argument-link" field="definition" key="queue-version" type="number">Version</span> <span class="help" id="queue-version"></span> |
-                  <span class="argument-link" field="definition" key="queue-master-locator" type="string">Master locator</span></br>
                 </td>
               </tr>
               <tr>
@@ -124,8 +124,6 @@
                   <span class="help" id="delivery-limit"></span> |
                   <span class="argument-link" field="definition" key="dead-letter-strategy" type="string">Dead letter strategy</span>
                   <span class="help" id="queue-dead-letter-strategy"></span> |
-                  <span class="argument-link" field="definition" key="queue-leader-locator" type="string">Leader locator</span>
-                  <span class="help" id="queue-leader-locator"></span>
                 </td>
               </tr>
               <tr>
@@ -135,8 +133,6 @@
                   <span class="help" id="queue-max-age"></span> |
                   <span class="argument-link" field="definition" key="stream-filter-size-bytes" type="number">Filter size in bytes. Valid range: 16-255</span>
                   <span class="help" id="queue-stream-filter-size-bytes"></span> |
-                  <span class="argument-link" field="definition" key="queue-leader-locator" type="string">Leader locator</span>
-                  <span class="help" id="queue-leader-locator"></span>
                 </td>
               </tr>
               <tr>

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

@@ -326,7 +326,6 @@
                 <% if (queue_type == "classic") { %>
                 <span class="argument-link" field="arguments" key="x-max-priority" type="number">Maximum priority</span> <span class="help" id="queue-max-priority"></span>
                 | <span class="argument-link" field="arguments" key="x-queue-version" type="number">Version</span> <span class="help" id="queue-version"></span>
-                | <span class="argument-link" field="arguments" key="x-queue-master-locator" type="string" value="">Master locator</span> <span class="help" id="queue-master-locator"></span>
                 <% } %>
                 <% if (queue_type == "quorum") { %>
                   <span class="argument-link" field="arguments" key="x-delivery-limit" type="number">Delivery limit</span><span class="help" id="delivery-limit"></span>
@@ -340,9 +339,7 @@
                   | <span class="argument-link" field="arguments" key="x-stream-filter-size-bytes" type="number">Filter size (per chunk) in bytes</span><span class="help" id="queue-stream-filter-size-bytes"></span>
                   | <span class="argument-link" field="arguments" key="x-initial-cluster-size" type="number">Initial cluster size</span><span class="help" id="queue-initial-cluster-size"></span>
                 <% } %>
-                <% if (queue_type != "classic") { %>
-                  | <span class="argument-link" field="arguments" key="x-queue-leader-locator" type="string">Leader locator</span><span class="help" id="queue-leader-locator"></span>
-                <% } %>
+                  <span class="argument-link" field="arguments" key="x-queue-leader-locator" type="string">Leader locator</span><span class="help" id="queue-leader-locator"></span>
                 </td>
               </tr>
             </table>