Skip to content

Commit cbaffc8

Browse files
committed
Remove sockets_used/sockets_total metrics from UIs
Part of the removal of file_handle_cache. The Prometheus endpoint was updated but the Grafana dashboard was not. The FD stats are using the system's state rather than file_handle_cache so there's no need to remove them.
1 parent 06152f9 commit cbaffc8

File tree

6 files changed

+2
-42
lines changed

6 files changed

+2
-42
lines changed

deps/rabbitmq_management/priv/www/api/index.html

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2038,18 +2038,6 @@ <h2>/api/nodes</h2>
20382038
Location of <a href="https://www.erlang.org/doc/man/sasl_app.html">sasl</a> log file.
20392039
</td>
20402040
</tr>
2041-
<tr>
2042-
<td><code>sockets_total</code></td>
2043-
<td>
2044-
File descriptors available for use as sockets.
2045-
</td>
2046-
</tr>
2047-
<tr>
2048-
<td><code>sockets_used</code></td>
2049-
<td>
2050-
File descriptors used as sockets.
2051-
</td>
2052-
</tr>
20532041
<tr>
20542042
<td><code>type</code></td>
20552043
<td>

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ var ALL_COLUMNS =
136136
['rate-deliver', 'deliver / get', true]]},
137137
'overview':
138138
{'Statistics': [['file_descriptors', 'File descriptors', true],
139-
['socket_descriptors', 'Socket descriptors', true],
140139
['erlang_processes', 'Erlang processes', true],
141140
['memory', 'Memory', true],
142141
['disk_space', 'Disk space', true]],
@@ -314,21 +313,14 @@ var HELP = {
314313
'file-descriptors':
315314
'<p>File descriptor count and limit, as reported by the operating \
316315
system. The count includes network sockets and file handles.</p> \
317-
<p>To optimize disk access RabbitMQ uses as many free descriptors as are \
318-
available, so the count may safely approach the limit. \
319-
However, if most of the file descriptors are used by sockets then \
320-
persister performance will be negatively impacted.</p> \
316+
<p>To optimize disk access RabbitMQ uses as many file descriptors as \
317+
needed, so the limit must be high enough for safe operation.</p> \
321318
<p>To change the limit on Unix / Linux, use "ulimit -n". To change \
322319
the limit on Windows, set the ERL_MAX_PORTS environment variable</p> \
323320
<p>To report used file handles on Windows, handle.exe from \
324321
sysinternals must be installed in your path. You can download it \
325322
<a target="_blank" href="https://technet.microsoft.com/en-us/sysinternals/bb896655">here</a>.</p>',
326323

327-
'socket-descriptors':
328-
'The network sockets count and limit managed by RabbitMQ.<br/> \
329-
When the limit is exhausted RabbitMQ will stop accepting new \
330-
network connections.',
331-
332324
'memory-alarm':
333325
'<p>The <a target="_blank" href="https://www.rabbitmq.com/memory.html#memsup">memory \
334326
alarm</a> for this node has gone off. It will block \

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,6 @@
9292
<% } %>
9393
</td>
9494
</tr>
95-
<tr>
96-
<th>
97-
Socket descriptors <span class="help" id="socket-descriptors"></span>
98-
</th>
99-
<td>
100-
<%= node_stat_count('sockets_used', 'sockets_total', node, FD_THRESHOLDS) %>
101-
</td>
102-
</tr>
10395
<tr>
10496
<th>
10597
Erlang processes

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@
8484
<% if (show_column('overview', 'file_descriptors')) { %>
8585
<th>File descriptors <span class="help" id="file-descriptors"></span></th>
8686
<% } %>
87-
<% if (show_column('overview', 'socket_descriptors')) { %>
88-
<th>Socket descriptors <span class="help" id="socket-descriptors"></span></th>
89-
<% } %>
9087
<% if (show_column('overview', 'erlang_processes')) { %>
9188
<th>Erlang processes</th>
9289
<% } %>
@@ -153,11 +150,6 @@
153150
<% } %>
154151
</td>
155152
<% } %>
156-
<% if (show_column('overview', 'socket_descriptors')) { %>
157-
<td>
158-
<%= node_stat_count_bar('sockets_used', 'sockets_total', node, FD_THRESHOLDS) %>
159-
</td>
160-
<% } %>
161153
<% if (show_column('overview', 'erlang_processes')) { %>
162154
<td>
163155

deps/rabbitmq_prometheus/metrics.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,7 @@ These metrics are specific to the stream protocol.
132132
| rabbitmq_disk_space_available_limit_bytes | Free disk space low watermark in bytes |
133133
| rabbitmq_identity_info | RabbitMQ node & cluster identity info |
134134
| rabbitmq_process_max_fds | Open file descriptors limit |
135-
| rabbitmq_process_max_tcp_sockets | Open TCP sockets limit |
136135
| rabbitmq_process_open_fds | Open file descriptors |
137-
| rabbitmq_process_open_tcp_sockets | Open TCP sockets |
138136
| rabbitmq_process_resident_memory_bytes | Memory used in bytes |
139137
| rabbitmq_resident_memory_limit_bytes | Memory high watermark in bytes |
140138

deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
]},
7070
{node_coarse_metrics, [
7171
{2, undefined, process_open_fds, gauge, "Open file descriptors", fd_used},
72-
{2, undefined, process_open_tcp_sockets, gauge, "Open TCP sockets", sockets_used},
7372
{2, undefined, process_resident_memory_bytes, gauge, "Memory used in bytes", mem_used},
7473
{2, undefined, disk_space_available_bytes, gauge, "Disk space available in bytes", disk_free},
7574
{2, undefined, erlang_processes_used, gauge, "Erlang processes used", proc_used},
@@ -79,7 +78,6 @@
7978
]},
8079
{node_metrics, [
8180
{2, undefined, process_max_fds, gauge, "Open file descriptors limit", fd_total},
82-
{2, undefined, process_max_tcp_sockets, gauge, "Open TCP sockets limit", sockets_total},
8381
{2, undefined, resident_memory_limit_bytes, gauge, "Memory high watermark in bytes", mem_limit},
8482
{2, undefined, disk_space_available_limit_bytes, gauge, "Free disk space low watermark in bytes", disk_free_limit},
8583
{2, undefined, erlang_processes_limit, gauge, "Erlang processes limit", proc_total},

0 commit comments

Comments
 (0)