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

refactor: Updated Ups nut support

Browse Source
This commit is contained in:
arrmo
2016-12-20 03:34:42 -06:00
committed by Neil Lathwood
parent 17f5cfef90
commit 0cc9e774f9
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
html/includes/graphs/application/ups-nut_voltage_battery.inc.php
View File

@@ -34,7 +34,8 @@ $addarea = 1;
$transparency = 33; $transparency = 33;
$rrd_filename = rrd_name($device['hostname'], array('app', 'ups-nut', $app['app_id'])); $rrd_filename = rrd_name($device['hostname'], array('app', 'ups-nut', $app['app_id']));
$array = array( $array = array(
'battery_voltage' => array('descr' => 'Current','colour' => '50C150',), 'battery_voltage' => array('descr' => 'Input','colour' => '630606',),
'battery_nominal' => array('descr' => 'Nominal','colour' => '50C150',)
); );
$i = 0; $i = 0;

2
html/includes/graphs/application/ups-nut_voltage_input.inc.php
View File

@@ -34,7 +34,7 @@ $transparency = 33;
$rrd_filename = rrd_name($device['hostname'], array('app', 'ups-nut', $app['app_id'])); $rrd_filename = rrd_name($device['hostname'], array('app', 'ups-nut', $app['app_id']));
$array = array( $array = array(
'input_voltage' => array('descr' => 'Input','colour' => '630606',), 'input_voltage' => array('descr' => 'Input','colour' => '630606',),
'nominal_voltage' => array('descr' => 'Nominal','colour' => '50C150',), 'line_nominal' => array('descr' => 'Nominal','colour' => '50C150',)
); );
$i = 0; $i = 0;

27
includes/polling/applications/ups-nut.inc.php
View File

@@ -20,15 +20,28 @@
* *
*/ */
// (2016-11-25, R.Morris) ups-nut, try "extend" -> if not, fall back to "exec" support.
// -> Similar to approach used by Distro, but skip "legacy UCD-MIB shell support"
//
//NET-SNMP-EXTEND-MIB::nsExtendOutputFull."ups-nut" //NET-SNMP-EXTEND-MIB::nsExtendOutputFull."ups-nut"
$name = 'ups-nut'; $name = 'ups-nut';
$app_id = $app['app_id']; $app_id = $app['app_id'];
$oid = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.7.117.112.115.45.110.117.116'; $oid = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.7.117.112.115.45.110.117.116';
$ups_nut = snmp_get($device, $oid, '-Oqv'); $ups_nut = snmp_get($device, $oid, '-Oqv');
// If "extend" (used above) fails, try "exec" support.
// Note, exec always splits outputs on newline, so need to use snmp_walk (not a single SNMP entry!)
if (!$ups_nut) {
// Data is in an array, due to how "exec" works with ups-nut.sh output, so snmp_walk to retrieve it
$oid = '.1.3.6.1.4.1.2021.7890.2.101';
$ups_nut=snmp_walk($device, $oid, '-Oqv');
}
//print_r(array_values(explode("\n", $ups_nut)));
echo ' '.$name; echo ' '.$name;
list ($charge, $battery_low, $remaining, $bat_volt, $input_volt, $line_volt, $load) = explode("\n", $ups_nut); // (2016-11-25, R.Morris) Correct list and data below, to match latest ups-nut.sh script (missing one input, and misaligned).
list ($charge, $battery_low, $remaining, $bat_volt, $bat_nom, $line_nom, $input_volt, $load) = explode("\n", $ups_nut);
$rrd_name = array('app', $name, $app_id); $rrd_name = array('app', $name, $app_id);
$rrd_def = array( $rrd_def = array(
@@ -36,20 +49,24 @@ $rrd_def = array(
'DS:battery_low:GAUGE:600:0:100', 'DS:battery_low:GAUGE:600:0:100',
'DS:time_remaining:GAUGE:600:0:U', 'DS:time_remaining:GAUGE:600:0:U',
'DS:battery_voltage:GAUGE:600:0:U', 'DS:battery_voltage:GAUGE:600:0:U',
'DS:battery_nominal:GAUGE:600:0:U',
'DS:line_nominal:GAUGE:600:0:U',
'DS:input_voltage:GAUGE:600:0:U', 'DS:input_voltage:GAUGE:600:0:U',
'DS:nominal_voltage:GAUGE:600:0:U',
'DS:load:GAUGE:600:0:100' 'DS:load:GAUGE:600:0:100'
); );
//print_r(array_values($rrd_def));
$fields = array( $fields = array(
'charge' => $charge, 'charge' => $charge,
'battery_low' => $battery_low, 'battery_low' => $battery_low,
'time_remaining' => $remaining/60, 'time_remaining' => $remaining/60,
'battery_voltage' => $bat_volt, 'battery_voltage' => $bat_volt,
'input_voltage' => $line_volt, 'battery_nominal' => $bat_nom,
'nominal_voltage' => $input_volt, 'line_nominal' => $line_nom,
'load' => $load, 'input_voltage' => $input_volt,
'load' => $load
); );
//print_r(array_values($fields));
$tags = compact('name', 'app_id', 'rrd_name', 'rrd_def'); $tags = compact('name', 'app_id', 'rrd_name', 'rrd_def');
data_update($device, 'app', $tags, $fields); data_update($device, 'app', $tags, $fields);