nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-27 08:02:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added load as a new category

Browse Source
This commit is contained in:
laf
2015-04-30 19:04:19 +01:00
parent 496c8d611f
commit 9f9a7a8602
5 changed files with 62 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/discovery/current/apc.inc.php
-1
View File
@@ -177,7 +177,6 @@ if ($device['os'] == "apc")
$oid_array = array(
array('HighPrecOid' => 'upsHighPrecOutputCurrent', 'AdvOid' => 'upsAdvOutputCurrent', 'type' => 'apc', 'index' => 0, 'descr' => 'Current Drawn', 'divisor' => 10, 'mib' => '+PowerNet-MIB'),
array('HighPrecOid' => 'upsHighPrecOutputLoad', 'AdvOid' => 'upsAdvOutputLoad', 'type' => 'apc', 'index' => 0, 'descr' => 'Current Load', 'divisor' => 10, 'mib' => '+PowerNet-MIB'),
);
foreach ($oid_array as $item) {
$low_limit = NULL;
includes/discovery/load.inc.php
+15
View File
@@ -0,0 +1,15 @@
<?php
echo("Load: ");
// Include all discovery modules
$include_dir = "includes/discovery/load";
include("includes/include-dir.inc.php");
if ($debug) { print_r($valid['sensor']['load']); }
check_valid_sensors($device, 'current', $valid['load']);
echo("\n");
?>
includes/discovery/load/apc.inc.php
+43
View File
@@ -0,0 +1,43 @@
<?php
// APC
if ($device['os'] == "apc") {
echo "APC Load ";
# UPS
$oid_array = array(
array('HighPrecOid' => 'upsHighPrecOutputLoad', 'AdvOid' => 'upsAdvOutputLoad', 'type' => 'apc', 'index' => 0, 'descr' => 'Current Load', 'divisor' => 10, 'mib' => '+PowerNet-MIB'),
);
foreach ($oid_array as $item) {
$low_limit = NULL;
$low_limit_warn = NULL;
$warn_limit = NULL;
$high_limit = NULL;
$oids = snmp_get($device, $item['HighPrecOid'].'.'.$item['index'], "-OsqnU", $item['mib']);
if (empty($oids)) {
$oids = snmp_get($device, $item['AdvOid'].'.'.$item['index'], "-OsqnU", $item['mib']);
$current_oid = $item['AdvOid'];
} else {
$current_oid = $item['HighPrecOid'];
}
if (!empty($oids)) {
if ($debug) {
print_r($oids);
}
$oids = trim($oids);
if ($oids) {
echo $item['type'] . ' ' . $item['mib'] . ' UPS';
}
if (stristr($current_oid, "HighPrec")) {
$current = $oids / $item['divisor'];
} else {
$current = $oids;
$item['divisor'] = 1;
}
discover_sensor($valid['sensor'], 'load', $device, $current_oid.'.'.$item['index'], $current_oid.'.'.$item['index'], $item['type'], $item['descr'], $item['divisor'], 1, $low_limit, $low_limit_warn, $warn_limit, $high_limit, $current);
}
}
}
?>
includes/discovery/sensors.inc.php
+1
View File
@@ -18,5 +18,6 @@ include("includes/discovery/current.inc.php");
include("includes/discovery/power.inc.php");
include("includes/discovery/fanspeeds.inc.php");
include("includes/discovery/charge.inc.php");
include("includes/discovery/load.inc.php");
?>
includes/polling/sensors.inc.php
+3 -1
View File
@@ -21,7 +21,9 @@ $supported_sensors = array('current' => 'A',
'voltage' => 'V',
'temperature' => 'C',
'dbm' => 'dBm',
'charge' => '%');
'charge' => '%',
'load' => '%'
);
foreach ($supported_sensors as $sensor_type => $sensor_unit)
{