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

Updates and fixes

Browse Source
This commit is contained in:
laf
2016-06-09 10:35:55 +00:00
parent d5bf3281af
commit cd7e47d314
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
includes/discovery/sensors/fanspeeds/ibm-amm.inc.php
View File

@@ -12,7 +12,7 @@
if ($device['os'] == 'ibm-amm') {
$oids = array('blower1speedRPM', 'blower1speedRPM', 'blower1speedRPM', 'blower1speedRPM');
$oids = array('blower1speedRPM', 'blower2speedRPM', 'blower3speedRPM', 'blower4speedRPM');
d_echo($oids."\n");
if (!empty($oids)) {
@@ -20,10 +20,11 @@ if ($device['os'] == 'ibm-amm') {
foreach ($oids as $data) {
if (!empty($data)) {
$value = snmp_get($device, $oid.'.0', '-OsqnU', 'BLADE-MIB');
$value = snmp_get($device, $data.'.0', '-OsqnU', 'BLADE-MIB');
if (is_numeric($value)) {
$oid = 'BLADE-MIB::' . $data . '.0';
$descr = $data;
discover_sensor($valid['sensor'], 'fanspeed', $device, $data, 0, 'snmp', $descr, 1, 1, null, null, null, null, $value);
discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, 0, 'snmp', $descr, 1, 1, null, null, null, null, $value);
}
}

2
includes/discovery/sensors/states/ibm-amm.inc.php
View File

@@ -27,7 +27,7 @@ if ($device['os'] == 'ibm-amm') {
if ($state_index_id) {
$states = array(
array($state_index_id,'uknown',0,1,3) ,
array($state_index_id,'unknown',0,1,3) ,
array($state_index_id,'good',1,2,0) ,
array($state_index_id,'warning',1,3,1) ,
array($state_index_id,'bad',1,4,2) ,

12
includes/discovery/sensors/temperatures/ibm-amm.inc.php
View File

@@ -11,8 +11,8 @@
*/
if ($device['os'] == 'ibm-amm') {
$oid = 'mmTemp.0';
$mmtemp = snmp_get($device, $oid, '-OsqnU', 'BLADE-MIB');
$oid = 'BLADE-MIB::mmTemp.0';
$mmtemp = snmp_get($device, $oid, '-OsqnU');
preg_match('/[\d\.]+/', $mmtemp, $temp_response);
if (!empty($temp_response[0])) {
@@ -25,11 +25,11 @@ if ($device['os'] == 'ibm-amm') {
$descr = 'Management module temperature';
$divisor = 1;
$current = $mmtemp;
discover_sensor($valid['sensor'], 'temperature', $device, $oid, 0, 'ibm-amm', $descr, $divisor, '1', null, null, null, null, $current);
discover_sensor($valid['sensor'], 'temperature', $device, $oid, $oid, 'ibm-amm', $descr, $divisor, '1', null, null, null, null, $current);
}
$oid = 'frontPanelTemp.0';
$fptemp = snmp_get($device, $oid, '-OsqnU', 'BLADE-MIB');
$oid = 'BLADE-MIB::frontPanelTemp.0';
$fptemp = snmp_get($device, $oid, '-OsqnU');
preg_match('/[\d\.]+/', $fptemp, $temp_response);
if (!empty($temp_response[0])) {
@@ -42,7 +42,7 @@ if ($device['os'] == 'ibm-amm') {
$descr = 'Front panel temperature';
$divisor = 1;
$current = $fptemp;
discover_sensor($valid['sensor'], 'temperature', $device, $oid, 0, 'ibm-amm', $descr, $divisor, '1', null, null, null, null, $current);
discover_sensor($valid['sensor'], 'temperature', $device, $oid, $oid, 'ibm-amm', $descr, $divisor, '1', null, null, null, null, $current);
}
}