Merge in default
This commit is contained in:
		
						commit
						b717fba193
					
				| 
						 | 
				
			
			@ -1,53 +1,4 @@
 | 
			
		|||
<h1>Overview</h1>
 | 
			
		||||
<div class="updatable">
 | 
			
		||||
<%
 | 
			
		||||
var rabbit_version = 'unknown';
 | 
			
		||||
var erlang_version = 'unknown';
 | 
			
		||||
var version_warning = false;
 | 
			
		||||
 | 
			
		||||
if (user_monitor) {
 | 
			
		||||
    for (var i = 0; i < nodes.length; i++) {
 | 
			
		||||
        var node = nodes[i];
 | 
			
		||||
        var r = fmt_rabbit_version(node.applications);
 | 
			
		||||
        var e = node.erlang_version;
 | 
			
		||||
        if (rabbit_version == 'unknown') {
 | 
			
		||||
            rabbit_version = r;
 | 
			
		||||
            erlang_version = e;
 | 
			
		||||
        } else {
 | 
			
		||||
            if (r != 'unknown' && (rabbit_version != r || erlang_version != e)) {
 | 
			
		||||
                version_warning = true;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
if (version_warning) {
 | 
			
		||||
%>
 | 
			
		||||
  <p class="warning">
 | 
			
		||||
    Version mismatch<br/><br/>
 | 
			
		||||
    The nodes in this cluster are running different versions of
 | 
			
		||||
    RabbitMQ and / or Erlang. This cluster may behave unpredictably.
 | 
			
		||||
    You are very strongly recommended to ensure that all nodes in this cluster
 | 
			
		||||
    run the same versions of RabbitMQ and Erlang.
 | 
			
		||||
  </p>
 | 
			
		||||
  <table class="list">
 | 
			
		||||
    <tr>
 | 
			
		||||
      <th>Name</th>
 | 
			
		||||
      <th>RabbitMQ version</th>
 | 
			
		||||
      <th>Erlang version</th>
 | 
			
		||||
    </tr>
 | 
			
		||||
<%
 | 
			
		||||
   for (var i = 0; i < nodes.length; i++) {
 | 
			
		||||
     var node = nodes[i];
 | 
			
		||||
%>
 | 
			
		||||
    <tr<%= alt_rows(i)%>>
 | 
			
		||||
      <td><%= fmt_string(node.name) %></td>
 | 
			
		||||
      <td><%= fmt_rabbit_version(node.applications) %></td>
 | 
			
		||||
      <td><%= node.erlang_version %></td>
 | 
			
		||||
    </tr>
 | 
			
		||||
<% } %>
 | 
			
		||||
  </table>
 | 
			
		||||
<% } %>
 | 
			
		||||
</div>
 | 
			
		||||
<div class="section">
 | 
			
		||||
<h2>Totals</h2>
 | 
			
		||||
<div class="hider updatable">
 | 
			
		||||
| 
						 | 
				
			
			@ -197,11 +148,10 @@ if (version_warning) {
 | 
			
		|||
   </tr>
 | 
			
		||||
<% } %>
 | 
			
		||||
</table>
 | 
			
		||||
<% if (!version_warning) { %>
 | 
			
		||||
  <p>
 | 
			
		||||
    RabbitMQ <b><%= rabbit_version %></b> on Erlang <b><%= erlang_version %></b>
 | 
			
		||||
  </p>
 | 
			
		||||
<% } %>
 | 
			
		||||
<p>
 | 
			
		||||
  RabbitMQ <b><%= fmt_rabbit_version(nodes[0].applications) %></b>
 | 
			
		||||
  on Erlang <b><%= nodes[0].erlang_version %></b>
 | 
			
		||||
</p>
 | 
			
		||||
 | 
			
		||||
<% if (overview.statistics_db_node == 'not_running') { %>
 | 
			
		||||
  <p class="status-error">Statistics database could not be contacted. Message rates and queue lengths will not be shown.</p>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue