clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-22 10:58:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix incorrect getOsSetting arguments (#7339)

Browse Source 
Missed calls when the function definition changed.
This commit is contained in:
Tony Murray 2017-09-14 00:43:14 -05:00 committed by GitHub
parent 973b1181e3
commit f158a56774
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/discovery/functions.inc.php
View File

@ -134,7 +134,7 @@ function discover_device(&$device, $options = null)
load_os($device);
load_discovery($device);
register_mibs($device, Config::getOsSetting($device, 'register_mibs', array()), 'includes/discovery/os/' . $device['os'] . '.inc.php');
register_mibs($device, Config::getOsSetting($device['os'], 'register_mibs', array()), 'includes/discovery/os/' . $device['os'] . '.inc.php');
echo "\n";
@ -150,7 +150,7 @@ function discover_device(&$device, $options = null)
}
}
foreach (Config::get('discovery_modules', array()) as $module => $module_status) {
$os_module_status = Config::getOsSetting($device, "discovery_modules.$module");
$os_module_status = Config::getOsSetting($device['os'], "discovery_modules.$module");
d_echo("Modules status: Global" . (isset($module_status) ? ($module_status ? '+ ' : '- ') : ' '));
d_echo("OS" . (isset($os_module_status) ? ($os_module_status ? '+ ' : '- ') : ' '));
d_echo("Device" . (isset($attribs['discover_' . $module]) ? ($attribs['discover_' . $module] ? '+ ' : '- ') : ' '));
@ -798,7 +798,7 @@ function discover_process_ipv6(&$valid, $ifIndex, $ipv6_address, $ipv6_prefixlen
*/
function check_entity_sensor($string, $device)
{
$fringe = array_merge(Config::get('bad_entity_sensor_regex', array()), Config::getOsSetting($device, 'bad_entity_sensor_regex', array()));
$fringe = array_merge(Config::get('bad_entity_sensor_regex', array()), Config::getOsSetting($device['os'], 'bad_entity_sensor_regex', array()));
foreach ($fringe as $bad) {
if (preg_match($bad . "i", $string)) {
@ -1166,7 +1166,7 @@ function sensors($types, $device, $valid, $pre_cache = array())
if (is_file($dir . $device['os'] . '.inc.php')) {
include $dir . $device['os'] . '.inc.php';
}
if (Config::getOsSetting($device, 'rfc1628_compat', false)) {
if (Config::getOsSetting($device['os'], 'rfc1628_compat', false)) {
if (is_file($dir . '/rfc1628.inc.php')) {
include $dir . '/rfc1628.inc.php';
}

2
includes/discovery/sensors/runtime/rfc1628.inc.php
View File

@ -2,7 +2,7 @@
echo 'RFC1628 ';
// UPS-MIB::upsSeconsOnBattery
// UPS-MIB::upsSecondsOnBattery
$secs_on_battery_oid = '.1.3.6.1.2.1.33.1.2.2.0';
$secs_on_battery = snmp_get($device, $secs_on_battery_oid, '-Oqv');