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

fix: os type and group not being set (#5357)

Browse Source
This commit is contained in:
Tony Murray
2017-01-09 02:16:09 -06:00
committed by Neil Lathwood
parent 5ad8fd3c0c
commit b3f6218359
5 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/device.inc.php
+1 -4
View File
@@ -22,16 +22,13 @@ if (device_permitted($vars['device']) || $check_device == $vars['device']) {
$device = device_by_id_cache($vars['device']);
$attribs = get_dev_attribs($device['device_id']);
load_os($device);
$entity_state = get_dev_entity_state($device['device_id']);
// print_r($entity_state);
$pagetitle[] = $device['hostname'];
if ($config['os'][$device['os']]['group']) {
$device['os_group'] = $config['os'][$device['os']]['group'];
}
echo '<div class="panel panel-default">';
echo '<table class="device-header-table" style="margin: 0px 7px 7px 7px;" cellspacing="0" class="devicetable" width="99%">';
require 'includes/device-header.inc.php';
includes/common.php
+23 -7
View File
@@ -1509,16 +1509,32 @@ function display($value)
}
/**
* @param $os
* @return array|mixed
* Load the os definition for the device and set type and os_group
* $device['os'] must be set
*
* @param array $device
* @throws Exception No OS to load
*/
function load_os($os)
function load_os(&$device)
{
global $config;
if (isset($os)) {
return Symfony\Component\Yaml\Yaml::parse(
file_get_contents($config['install_dir'] . '/includes/definitions/' . $os . '.yaml')
);
if (!isset($device['os'])) {
throw new Exception('No OS to load');
}
$config['os'][$device['os']] = Symfony\Component\Yaml\Yaml::parse(
file_get_contents($config['install_dir'] . '/includes/definitions/' . $device['os'] . '.yaml')
);
// Set type to a predefined type for the OS if it's not already set
if ($device['type'] == 'unknown' || $device['type'] == '') {
if ($config['os'][$device['os']]['type']) {
$device['type'] = $config['os'][$device['os']]['type'];
}
}
if ($config['os'][$device['os']]['group']) {
$device['os_group'] = $config['os'][$device['os']]['group'];
}
}
includes/discovery/functions.inc.php
+1 -13
View File
@@ -110,23 +110,11 @@ function discover_device($device, $options = null)
}
}
$config['os'][$device['os']] = load_os($device['os']);
load_os($device);
if (is_array($config['os'][$device['os']]['register_mibs'])) {
register_mibs($device, $config['os'][$device['os']]['register_mibs'], 'includes/discovery/os/' . $device['os'] . '.inc.php');
}
// Set type to a predefined type for the OS if it's not already set
if ($device['type'] == 'unknown' || $device['type'] == '') {
if ($config['os'][$device['os']]['type']) {
$device['type'] = $config['os'][$device['os']]['type'];
}
}
if ($config['os'][$device['os']]['group']) {
$device['os_group'] = $config['os'][$device['os']]['group'];
echo ' (' . $device['os_group'] . ')';
}
echo "\n";
// If we've specified modules, use them, else walk the modules array
includes/polling/functions.inc.php
+1 -1
View File
@@ -149,7 +149,7 @@ function poll_device($device, $options)
{
global $config, $device, $polled_devices, $memcache;
$config['os'][$device['os']] = load_os($device['os']);
load_os($device);
$attribs = get_dev_attribs($device['device_id']);
$device['snmp_max_repeaters'] = $attribs['snmp_max_repeaters'];
includes/polling/wifi.inc.php
+8 -7
View File
@@ -66,20 +66,21 @@ if ($device['type'] == 'network' || $device['type'] == 'firewall' || $device['ty
echo (($wificlients1 + 0).' clients on wireless connector, ');
} elseif ($device['os'] == 'unifi') {
echo 'Checking Unifi Wireless clients... ';
$wificlients1 = 0;
$wificlients2 = 0;
$clients = explode("\n", snmp_walk($device, 'unifiVapNumStations', '-Oqv', 'UBNT-UniFi-MIB'));
$bands = explode("\n", snmp_walk($device, 'unifiVapRadio', '-Oqv', 'UBNT-UniFi-MIB'));
$clients = snmp_walk($device, 'unifiVapNumStations', '-Oqv', 'UBNT-UniFi-MIB');
$bands = snmp_walk($device, 'unifiVapRadio', '-Oqv', 'UBNT-UniFi-MIB');
$clients = explode("\n", $clients);
$bands = explode("\n", $bands);
foreach ($bands as $index => $band_index) {
if ($band_index == "ng") {
$wificlients1 = $wificlients1 + $clients[$index] + 0;
$wificlients1 += $clients[$index];
} else {
$wificlients2 = $wificlients2 + $clients[$index] + 0;
$wificlients2 += $clients[$index];
}
}
echo (($wificlients1 + 0).' clients on Radio0, '.($wificlients2 + 0)." clients on Radio1\n");
echo $wificlients1 . ' clients on Radio0, ' . $wificlients2 . " clients on Radio1\n";
include 'includes/polling/mib/ubnt-unifi-mib.inc.php';
}