Skip to content

Add number of cores used by RabbitMQ nodes to the management overview. (backport #11381) #11382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 5, 2024
Merged

Add number of cores used by RabbitMQ nodes to the management overview. (backport #11381) #11382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
226aff1
Add number of cores used by RabbitMQ nodes to the management overview.
kjnilsson Jun 5, 2024
e2f8014
HTTP API docs: remove a (now) duplicated field
michaelklishin Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions deps/rabbitmq_management/priv/www/api/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2007,12 +2007,6 @@ <h2>/api/nodes</h2>
Number of Erlang processes in use.
</td>
</tr>
<tr>
<td><code>processors</code></td>
<td>
Number of cores detected and usable by Erlang.
</td>
</tr>
<tr>
<td><code>queue_index_journal_write_count</code></td>
<td>
Expand Down Expand Up @@ -2083,6 +2077,12 @@ <h2>/api/nodes</h2>
Time since the Erlang VM started, in milliseconds.
</td>
</tr>
<tr>
<td><code>processors</code></td>
<td>
Number of logical CPU cores used by RabbitMQ.
</td>
</tr>
</table>

<h2>/api/nodes/(name)</h2>
Expand Down
1 change: 1 addition & 0 deletions deps/rabbitmq_management/priv/www/js/global.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ var ALL_COLUMNS =
['memory', 'Memory', true],
['disk_space', 'Disk space', true]],
'General': [['uptime', 'Uptime', true],
['cores', 'Cores', true],
['info', 'Info', true],
['reset_stats', 'Reset stats', true]]}};

Expand Down
14 changes: 4 additions & 10 deletions deps/rabbitmq_management/priv/www/js/tmpl/node.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,16 @@
<th>Uptime</th>
<td><%= fmt_uptime(node.uptime) %></td>
</tr>
<tr>
<th>Cores</th>
<td><%= fmt_string(node.processors) %></td>
</tr>
<% if (rabbit_versions_interesting) { %>
<tr>
<th>RabbitMQ Version</th>
<td><%= fmt_rabbit_version(node.applications) %></td>
</tr>
<% } %>
<tr>
<th>Type</th>
<td>
<% if (node.type == 'disc') { %>
<abbr title="Broker definitions are held on disc.">Disc</abbr>
<% } else { %>
<abbr title="Broker definitions are held in RAM. Messages will still be written to disc if necessary.">RAM</abbr>
<% } %>
</td>
</tr>
<tr>
<th>
<a href="https://www.rabbitmq.com/configure.html" target="_blank">Config file</a>
Expand Down
11 changes: 6 additions & 5 deletions deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@
<% if (show_column('overview', 'uptime')) { %>
<th>Uptime</th>
<% } %>
<% if (show_column('overview', 'cores')) { %>
<th>Cores</th>
<% } %>
<% if (show_column('overview', 'info')) { %>
<th>Info</th>
<% } %>
Expand Down Expand Up @@ -188,17 +191,15 @@
<% if (show_column('overview', 'uptime')) { %>
<td><span><%= fmt_uptime(node.uptime) %></span></td>
<% } %>
<% if (show_column('overview', 'cores')) { %>
<td><span><%= fmt_string(node.processors) %></span></td>
<% } %>
<% if (show_column('overview', 'info')) { %>
<td>
<% if (node.being_drained) { %>
<abbr class="status-yellow" title="Node was put under maintenance">maintenance mode</abbr>
<% } %>
<abbr title="Message rates"><%= fmt_string(node.rates_mode) %></abbr>
<% if (node.type == 'disc') { %>
<abbr title="Broker definitions are held on disc.">disc</abbr>
<% } else { %>
<abbr title="Broker definitions are held in RAM. Messages will still be written to disc if necessary.">RAM</abbr>
<% } %>
<%= fmt_plugins_small(node) %>
<abbr title="Memory calculation strategy"><%= fmt_string(node.mem_calculation_strategy) %></abbr>
</td>
Expand Down