mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Socket Statistic Application cleanup and application page graph fixes. (#15845)

Browse Source
This commit is contained in:
bnerickson
2024-02-21 12:31:51 -08:00
committed by GitHub
parent a9befd3b98
commit 7c59e64b7a
19 changed files with 146 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
includes/html/graphs/application/ss-af-common.inc.php Normal file
View File

@@ -0,0 +1,59 @@
<?php
require 'includes/ss-shared.inc.php';
$allowed_afs = $app->data['allowed_afs'] ?? [];
$rrdArray = [];
// This section draws the individual graphs in the device application page
// displaying the SPECIFIED address-family's socket type's states.
if (isset($vars['netid'])) {
$netid = $vars['netid'];
$af_netid = $addr_family . '_' . $netid;
// Map the socket type to its available statuses.
if (array_key_exists($netid, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$netid];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
// Create the rrdArray and map the address family's socket type
// to its "clean" socket state name and description.
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$af_netid][$socket_state_clean_name] = [
'descr' => $socket_state_clean_name,
];
}
}
// This section draws the graph for the application-specific pages
// displaying ALL of the address-family's sockets types' states.
if (! isset($vars['netid']) && in_array($addr_family, $allowed_afs)) {
$allowed_sockets = $app->data['allowed_sockets'] ?? [];
foreach ($ss_netid_mapper[$addr_family] as $netid) {
// Don't display data for filtered sockets.
if (! in_array($netid, $allowed_sockets)) {
continue;
}
$af_netid = $addr_family . '_' . $netid;
// Map the socket type to its available statuses.
if (array_key_exists($netid, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$netid];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
// Create the rrdArray and map the address family's socket type
// to its "clean" socket state name and description.
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$af_netid][$socket_state_clean_name] = [
'descr' => $af_netid . '_' . $socket_state_clean_name,
];
}
}
}
require 'ss-common.inc.php';

8
includes/html/graphs/application/ss-common.inc.php
View File

@@ -11,6 +11,11 @@ $smalldescrlen = 20;
$rrd_list = [];
if (! $rrdArray) {
graph_error('No Data to Display', 'No Data');
}
$i = 0;
foreach (array_keys($rrdArray) as $socket_type) {
$rrd_filename = Rrd::name($device['hostname'], [
$polling_type,
@@ -20,7 +25,6 @@ foreach (array_keys($rrdArray) as $socket_type) {
]);
if (Rrd::checkRrdExists($rrd_filename)) {
$i = 0;
foreach ($rrdArray[$socket_type] as $socket_status => $socket_status_desc) {
$rrd_list[$i]['filename'] = $rrd_filename;
$rrd_list[$i]['descr'] = $socket_status_desc['descr'];
@@ -28,7 +32,7 @@ foreach (array_keys($rrdArray) as $socket_type) {
$i++;
}
} else {
d_echo('RRD ' . $rrd_filename . ' not found');
graph_error('No Data file ' . basename($rrd_filename), 'No Data');
}
}

20
includes/html/graphs/application/ss-netid-common.inc.php Normal file
View File

@@ -0,0 +1,20 @@
<?php
require 'includes/ss-shared.inc.php';
$rrdArray = [];
// Map the socket type to its available statuses.
if (array_key_exists($netid, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$netid];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
// Create the rrdArray and map the address family's socket type
// to its "clean" socket state name and description.
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$netid][$socket_state_clean_name] = ['descr' => $socket_state_clean_name];
}
require 'ss-common.inc.php';

17
includes/html/graphs/application/ss_dccp.inc.php
View File

@@ -1,18 +1,5 @@
<?php
require_once 'includes/ss-shared.inc.php';
$netid = 'dccp';
$socket_type = 'dccp';
$rrdArray = [];
if (array_key_exists($socket_type, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$socket_type];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$socket_type][$socket_state_clean_name] = ['descr' => $socket_state_clean_name];
}
require 'ss-common.inc.php';
require 'ss-netid-common.inc.php';

21
includes/html/graphs/application/ss_inet.inc.php
View File

@@ -1,24 +1,5 @@
<?php
require_once 'includes/ss-shared.inc.php';
$addr_family = 'inet';
$rrdArray = [];
$netid = $vars['netid'];
$socket_type = $addr_family . '_' . $netid;
if (array_key_exists($netid, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$netid];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$socket_type][$socket_state_clean_name] = [
'descr' => $socket_state_clean_name,
];
}
require 'ss-common.inc.php';
require 'ss-af-common.inc.php';

21
includes/html/graphs/application/ss_inet6.inc.php
View File

@@ -1,24 +1,5 @@
<?php
require_once 'includes/ss-shared.inc.php';
$addr_family = 'inet6';
$rrdArray = [];
$netid = $vars['netid'];
$socket_type = $addr_family . '_' . $netid;
if (array_key_exists($netid, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$netid];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$socket_type][$socket_state_clean_name] = [
'descr' => $socket_state_clean_name,
];
}
require 'ss-common.inc.php';
require 'ss-af-common.inc.php';

21
includes/html/graphs/application/ss_link.inc.php
View File

@@ -1,24 +1,5 @@
<?php
require_once 'includes/ss-shared.inc.php';
$addr_family = 'link';
$rrdArray = [];
$netid = $vars['netid'];
$socket_type = $addr_family . '_' . $netid;
if (array_key_exists($netid, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$netid];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$socket_type][$socket_state_clean_name] = [
'descr' => $socket_state_clean_name,
];
}
require 'ss-common.inc.php';
require 'ss-af-common.inc.php';

17
includes/html/graphs/application/ss_mptcp.inc.php
View File

@@ -1,18 +1,5 @@
<?php
require_once 'includes/ss-shared.inc.php';
$netid = 'mptcp';
$socket_type = 'mptcp';
$rrdArray = [];
if (array_key_exists($socket_type, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$socket_type];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$socket_type][$socket_state_clean_name] = ['descr' => $socket_state_clean_name];
}
require 'ss-common.inc.php';
require 'ss-netid-common.inc.php';

17
includes/html/graphs/application/ss_netlink.inc.php
View File

@@ -1,18 +1,5 @@
<?php
require_once 'includes/ss-shared.inc.php';
$netid = 'netlink';
$addr_family = 'netlink';
$rrdArray = [];
if (array_key_exists($addr_family, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$addr_family];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$addr_family][$socket_state_clean_name] = ['descr' => $socket_state_clean_name];
}
require 'ss-common.inc.php';
require 'ss-netid-common.inc.php';

17
includes/html/graphs/application/ss_raw.inc.php
View File

@@ -1,18 +1,5 @@
<?php
require_once 'includes/ss-shared.inc.php';
$netid = 'raw';
$socket_type = 'raw';
$rrdArray = [];
if (array_key_exists($socket_type, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$socket_type];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$socket_type][$socket_state_clean_name] = ['descr' => $socket_state_clean_name];
}
require 'ss-common.inc.php';
require 'ss-netid-common.inc.php';

17
includes/html/graphs/application/ss_sctp.inc.php
View File

@@ -1,18 +1,5 @@
<?php
require_once 'includes/ss-shared.inc.php';
$netid = 'sctp';
$socket_type = 'sctp';
$rrdArray = [];
if (array_key_exists($socket_type, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$socket_type];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$socket_type][$socket_state_clean_name] = ['descr' => $socket_state_clean_name];
}
require 'ss-common.inc.php';
require 'ss-netid-common.inc.php';

17
includes/html/graphs/application/ss_tcp.inc.php
View File

@@ -1,18 +1,5 @@
<?php
require_once 'includes/ss-shared.inc.php';
$netid = 'tcp';
$socket_type = 'tcp';
$rrdArray = [];
if (array_key_exists($socket_type, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$socket_type];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$socket_type][$socket_state_clean_name] = ['descr' => $socket_state_clean_name];
}
require 'ss-common.inc.php';
require 'ss-netid-common.inc.php';

21
includes/html/graphs/application/ss_tipc.inc.php
View File

@@ -1,24 +1,5 @@
<?php
require_once 'includes/ss-shared.inc.php';
$addr_family = 'tipc';
$rrdArray = [];
$netid = $vars['netid'];
$socket_type = $addr_family . '_' . $netid;
if (array_key_exists($netid, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$netid];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$socket_type][$socket_state_clean_name] = [
'descr' => $socket_state_clean_name,
];
}
require 'ss-common.inc.php';
require 'ss-af-common.inc.php';

17
includes/html/graphs/application/ss_udp.inc.php
View File

@@ -1,18 +1,5 @@
<?php
require_once 'includes/ss-shared.inc.php';
$netid = 'udp';
$socket_type = 'udp';
$rrdArray = [];
if (array_key_exists($socket_type, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$socket_type];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$socket_type][$socket_state_clean_name] = ['descr' => $socket_state_clean_name];
}
require 'ss-common.inc.php';
require 'ss-netid-common.inc.php';

21
includes/html/graphs/application/ss_unix.inc.php
View File

@@ -1,24 +1,5 @@
<?php
require_once 'includes/ss-shared.inc.php';
$addr_family = 'unix';
$rrdArray = [];
$netid = $vars['netid'];
$socket_type = $addr_family . '_' . $netid;
if (array_key_exists($netid, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$netid];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$socket_type][$socket_state_clean_name] = [
'descr' => $socket_state_clean_name,
];
}
require 'ss-common.inc.php';
require 'ss-af-common.inc.php';

21
includes/html/graphs/application/ss_vsock.inc.php
View File

@@ -1,24 +1,5 @@
<?php
require_once 'includes/ss-shared.inc.php';
$addr_family = 'vsock';
$rrdArray = [];
$netid = $vars['netid'];
$socket_type = $addr_family . '_' . $netid;
if (array_key_exists($netid, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$netid];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$socket_type][$socket_state_clean_name] = [
'descr' => $socket_state_clean_name,
];
}
require 'ss-common.inc.php';
require 'ss-af-common.inc.php';

17
includes/html/graphs/application/ss_xdp.inc.php
View File

@@ -1,18 +1,5 @@
<?php
require_once 'includes/ss-shared.inc.php';
$netid = 'xdp';
$socket_type = 'xdp';
$rrdArray = [];
if (array_key_exists($socket_type, $ss_socket_states_mapper)) {
$local_ss_socket_states_mapper = $ss_socket_states_mapper[$socket_type];
} else {
$local_ss_socket_states_mapper = $ss_socket_states_mapper['default'];
}
foreach ($local_ss_socket_states_mapper as $socket_state => $socket_state_clean_name) {
$rrdArray[$socket_type][$socket_state_clean_name] = ['descr' => $socket_state_clean_name];
}
require 'ss-common.inc.php';
require 'ss-netid-common.inc.php';

14
includes/html/pages/apps.inc.php
View File

@@ -523,6 +523,20 @@ $graphs['privoxy'] = [
];
$graphs['ss'] = [
'sockets',
'dccp',
'inet',
'inet6',
'link',
'mptcp',
'netlink',
'raw',
'sctp',
'tcp',
'tipc',
'udp',
'unix',
'vsock',
'xdp',
];
$graphs['borgbackup'] = [
'unique_csize',