mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
add dhcp-stats tests and update for v3 of the extend (#15378)
* update dhcp polling for version 3 of the extend * add initial lease display for dhcp * note where I copied it from * document the new ISC DHCP stuff * add in displaying pool and subnet info * finalize the docs the new dhcpd stuff * rework the dhcp page to display more information in a cleaner manner * now display port and device info if known for a lease * minor comment cleanup for the dhcp page * add tests * do not display the optionbar if the extend is not 3+ * update dhcp-stats doc for -w * poke includes/html/functions.inc.php with php-cs-fixer * poke includes/html/pages/device/apps/dhcp-stats.inc.php with php-cs-fixer * derp... add the tests and not the snmprec twice * strftime -> date * fix naming of the linux dhcp-stats test data files * minor tweaks to the rest results * test fix * more test cleanup * minor test fix * set the data value for v3 * minor test tweak * add sortable_table blade template * no longer need render_table * formatting fix * add regexp to make sure the mac is sane * style fix * formatting cleanup * some more formatting fixes
This commit is contained in:
Zane C. Bowers-Hadley
committed by
GitHub
GitHub
parent
7c59e64b7a
commit
56471e63d7
@@ -1,15 +1,172 @@
|
||||
<?php
|
||||
|
||||
$graphs = [
|
||||
'dhcp-stats_stats' => 'Stats',
|
||||
'dhcp-stats_pools_percent' => 'Pools Percent',
|
||||
'dhcp-stats_pools_current' => 'Pools Current',
|
||||
'dhcp-stats_pools_max' => 'Pools Max',
|
||||
'dhcp-stats_networks_percent' => 'Networks Percent',
|
||||
'dhcp-stats_networks_current' => 'Networks Current',
|
||||
'dhcp-stats_networks_max' => 'Networks Max',
|
||||
use App\Models\Port;
|
||||
|
||||
$link_array = [
|
||||
'page' => 'device',
|
||||
'device' => $device['device_id'],
|
||||
'tab' => 'apps',
|
||||
'app' => 'dhcp-stats',
|
||||
];
|
||||
|
||||
// app data is only going to exist for this for extend 3+, so don't both displaying it otherwise
|
||||
if (isset($app->data['pools'])) {
|
||||
print_optionbar_start();
|
||||
echo generate_link('General', $link_array);
|
||||
echo ' | ' . generate_link('Pools', $link_array, ['app_page' => 'pools']);
|
||||
echo ' | ' . generate_link('Leases', $link_array, ['app_page' => 'leases']);
|
||||
print_optionbar_end();
|
||||
}
|
||||
|
||||
if (! isset($vars['app_page']) || ! isset($app->data['pools'])) {
|
||||
$graphs = [
|
||||
'dhcp-stats_stats' => 'Stats',
|
||||
'dhcp-stats_pools_percent' => 'Pools Percent',
|
||||
'dhcp-stats_pools_current' => 'Pools Current',
|
||||
'dhcp-stats_pools_max' => 'Pools Max',
|
||||
'dhcp-stats_networks_percent' => 'Networks Percent',
|
||||
'dhcp-stats_networks_current' => 'Networks Current',
|
||||
'dhcp-stats_networks_max' => 'Networks Max',
|
||||
];
|
||||
} elseif (isset($vars['app_page']) && $vars['app_page'] == 'pools') {
|
||||
$pools = $app->data['pools'] ?? [];
|
||||
print_optionbar_start();
|
||||
echo '<center><b>Pools</b></center>';
|
||||
$pool_table = [
|
||||
'headers' => [
|
||||
'CIDR',
|
||||
'First IP',
|
||||
'Last IP',
|
||||
'Max',
|
||||
'In Use',
|
||||
'Use%',
|
||||
],
|
||||
'rows' => [],
|
||||
];
|
||||
foreach ($pools as $key => $pool) {
|
||||
$pool_table['rows'][$key] = [
|
||||
['data' => $pool['cidr']],
|
||||
['data' => $pool['first_ip']],
|
||||
['data' => $pool['last_ip']],
|
||||
['data' => $pool['max']],
|
||||
['data' => $pool['cur']],
|
||||
['data' => $pool['percent']],
|
||||
];
|
||||
}
|
||||
echo view('widgets/sortable_table', $pool_table);
|
||||
print_optionbar_end();
|
||||
|
||||
print_optionbar_start();
|
||||
echo '<center><b>Subnets Details</b></center>';
|
||||
print_optionbar_start();
|
||||
$pool_detail_table = [
|
||||
'headers' => [
|
||||
'Key',
|
||||
'Value',
|
||||
],
|
||||
];
|
||||
foreach ($pools as $pool_key => $pool) {
|
||||
// re-init the rows the pools detail table
|
||||
unset($pool_detail_table['rows']);
|
||||
$pool_detail_table['rows'] = [];
|
||||
// display it this way as a CIDR may have more than one pool defined for it
|
||||
// especially true if both IPv4 and IPv6 are in use
|
||||
echo '<center><b>' . $pool['cidr'] . ', ' . $pool['first_ip'] . '-' . $pool['last_ip'] . '</b></center>';
|
||||
$option_row_int = 0;
|
||||
// remove these as they are stats and no options related info for the subnet
|
||||
unset($pool['cur']);
|
||||
unset($pool['max']);
|
||||
unset($pool['percent']);
|
||||
foreach ($pool as $pool_option => $option_value) {
|
||||
$pool_detail_table['rows'][$option_row_int] = [
|
||||
['data' => $pool_option],
|
||||
['data' => $option_value],
|
||||
];
|
||||
$option_row_int++;
|
||||
}
|
||||
echo view('widgets/sortable_table', $pool_detail_table);
|
||||
}
|
||||
print_optionbar_end();
|
||||
print_optionbar_end();
|
||||
|
||||
$subnets = $app->data['networks'] ?? [];
|
||||
print_optionbar_start();
|
||||
echo '<center><b>Networks</b></center>';
|
||||
$subnets_table = [
|
||||
'headers' => [
|
||||
'Name',
|
||||
'Max',
|
||||
'In Use',
|
||||
'Use%',
|
||||
'Pools',
|
||||
],
|
||||
'rows' => [],
|
||||
];
|
||||
foreach ($subnets as $key => $subnet) {
|
||||
$subnets_table['rows'][$key] = [
|
||||
['data' => $subnet['network']],
|
||||
['data' => $subnet['max']],
|
||||
['data' => $subnet['cur']],
|
||||
['data' => $subnet['percent']],
|
||||
['data' => json_encode($subnet['pools'])],
|
||||
];
|
||||
}
|
||||
echo view('widgets/sortable_table', $subnets_table);
|
||||
print_optionbar_end();
|
||||
} elseif (isset($vars['app_page']) && $vars['app_page'] == 'leases') {
|
||||
$leases = $app->data['found_leases'] ?? [];
|
||||
$table_info = [
|
||||
'headers' => [
|
||||
'IP',
|
||||
'State',
|
||||
'HW Address',
|
||||
'Starts',
|
||||
'Ends',
|
||||
'Client Hostname',
|
||||
'Vendor',
|
||||
],
|
||||
'rows' => [],
|
||||
];
|
||||
foreach ($leases as $key => $lease) {
|
||||
// look and see if we know what that mac belongs to and if so create a link for the device and port
|
||||
$mac = $lease['hw_address'];
|
||||
$mac_raw = false;
|
||||
if (preg_match('/^[A-Ea-e0-9][A-Ea-e0-9]:[A-Ea-e0-9][A-Ea-e0-9]:[A-Ea-e0-9][A-Ea-e0-9]:[A-Ea-e0-9][A-Ea-e0-9]:[A-Ea-e0-9][A-Ea-e0-9]:[A-Ea-e0-9][A-Ea-e0-9]$/', $mac)) {
|
||||
$port = Port::with('device')->firstWhere(['ifPhysAddress' => str_replace(':', '', $mac)]);
|
||||
}
|
||||
if (isset($port)) {
|
||||
// safe to set given we know we got a valid MAC if a $port is set
|
||||
$mac_raw = true;
|
||||
$mac = $mac . ' (' .
|
||||
generate_device_link(['device_id' => $port->device_id]) . ', ' .
|
||||
generate_port_link([
|
||||
'label' => $port->label,
|
||||
'port_id' => $port->port_id,
|
||||
'ifName' => $port->ifName,
|
||||
'device_id' => $port->device_id,
|
||||
]) . ')';
|
||||
}
|
||||
|
||||
if ($lease['client_hostname'] != '') {
|
||||
$lease['client_hostname'] = base64_decode($lease['client_hostname']);
|
||||
}
|
||||
if ($lease['vendor_class_identifier'] != '') {
|
||||
$lease['vendor_class_identifier'] = base64_decode($lease['vendor_class_identifier']);
|
||||
}
|
||||
$table_info['rows'][$key] = [
|
||||
['data' => $lease['ip']],
|
||||
['data' => $lease['state']],
|
||||
['data' => $mac, 'raw' => $mac_raw],
|
||||
// display the time as UTC as that keeps things most simple
|
||||
['data' => date('Y-m-d\TH:i:s\Z', $lease['starts'])],
|
||||
['data' => date('Y-m-d\TH:i:s\Z', $lease['ends'])],
|
||||
['data' => $lease['client_hostname']],
|
||||
['data' => $lease['vendor_class_identifier']],
|
||||
];
|
||||
}
|
||||
echo view('widgets/sortable_table', $table_info);
|
||||
}
|
||||
|
||||
foreach ($graphs as $key => $text) {
|
||||
$graph_type = $key;
|
||||
$graph_array['height'] = '100';
|
||||
|
||||
Reference in New Issue
Block a user