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

Merge pull request #3645 from laf/issue-3633

Browse Source
This commit is contained in:
Søren Rosiak
2016-06-14 19:00:23 +02:00
committed by GitHub
parent 1b97411b40 e1ee0df0fa
commit 366c43c1ae
3 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
includes/discovery/sensors/current/rfc1628.inc.php
View File

@@ -1,5 +1,10 @@
<?php
$divisor = 10;
if ($device['os'] == 'poweralert') {
$divisor = 1;
}
// RFC1628 UPS
if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modules_compat']['rfc1628'][$device['os']]) {
echo 'RFC1628 ';
@@ -21,7 +26,7 @@ if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modul
$type = 'rfc1628';
$index = (500 + $current_id);
discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', null, null, null, null, $current);
discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current);
}
}
@@ -41,7 +46,7 @@ if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modul
$type = 'rfc1628';
$index = $i;
discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', null, null, null, null, $current);
discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current);
}
$oids = trim(snmp_walk($device, '1.3.6.1.2.1.33.1.3.2.0', '-OsqnU'));
@@ -60,7 +65,7 @@ if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modul
$type = 'rfc1628';
$index = (100 + $i);
discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', null, null, null, null, $current);
discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current);
}
$oids = trim(snmp_walk($device, '1.3.6.1.2.1.33.1.5.2.0', '-OsqnU'));
@@ -79,6 +84,6 @@ if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modul
$type = 'rfc1628';
$index = (200 + $i);
discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', null, null, null, null, $current);
discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current);
}
}//end if

15
includes/discovery/sensors/frequencies/rfc1628.inc.php
View File

@@ -20,7 +20,10 @@ if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modul
$divisor = 10;
if ($device['os'] == 'huaweiups') {
$divisor = 100;
};
}
if ($device['os'] == 'poweralert') {
$divisor = 1;
}
$index = '3.2.0.'.$i;
discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current);
}
@@ -32,7 +35,10 @@ if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modul
$divisor = 10;
if ($device['os'] == 'huaweiups') {
$divisor = 100;
};
}
if ($device['os'] == 'poweralert') {
$divisor = 1;
}
$index = '4.2.0';
discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current);
@@ -43,7 +49,10 @@ if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modul
$divisor = 10;
if ($device['os'] == 'huaweiups') {
$divisor = 100;
};
}
if ($device['os'] == 'poweralert') {
$divisor = 1;
}
$index = '5.1.0';
discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current);
}//end if

12
includes/discovery/sensors/voltages/rfc1628.inc.php
View File

@@ -16,9 +16,9 @@ if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modul
$volt_id = $split_oid[(count($split_oid) - 1)];
$volt_oid = "1.3.6.1.2.1.33.1.2.5.$volt_id";
$divisor = 10;
if ($device['os'] == 'poweralert') {
if ($device['os'] == 'poweralert' || $device['os'] == 'poweralert') {
$divisor = 1;
};
}
$volt = (snmp_get($device, $volt_oid, '-O vq') / $divisor);
$descr = 'Battery'.(count(explode("\n", $oids)) == 1 ? '' : ' '.($volt_id + 1));
$type = 'rfc1628';
@@ -41,9 +41,9 @@ if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modul
$type = 'rfc1628';
$divisor = 10;
if ($device['os'] == 'netmanplus') {
if ($device['os'] == 'netmanplus' || $device['os'] == 'poweralert') {
$divisor = 1;
};
}
$current = (snmp_get($device, $volt_oid, '-Oqv') / $divisor);
$index = $i;
@@ -65,7 +65,7 @@ if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modul
$divisor = 10;
if ($device['os'] == 'netmanplus' || $device['os'] == 'poweralert') {
$divisor = 1;
};
}
$current = (snmp_get($device, $volt_oid, '-Oqv') / $divisor);
$index = (100 + $i);
@@ -87,7 +87,7 @@ if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modul
$divisor = 10;
if ($device['os'] == 'netmanplus' || $device['os'] == 'poweralert') {
$divisor = 1;
};
}
$current = (snmp_get($device, $volt_oid, '-Oqv') / $divisor);
$index = (200 + $i);