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

Revert "Patch from Paul Gear, for Custom MIB data handling (non-integer)"

Browse Source 
This reverts commit d3cddffdc7.
This commit is contained in:
arrmo
2016-01-17 17:06:30 -06:00
parent 027586bb8e
commit 734f9bc34e
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
includes/snmp.inc.php
View File

@@ -1040,19 +1040,22 @@ function oid_rrd_type($oid, $mibdef)
case 'INTEGER':
case 'Integer32':
return 'GAUGE:600:U:U';
// FIXME
return false;
case 'Counter32':
// FIXME
return false;
case 'Counter64':
return 'COUNTER:600:0:U';
case 'Gauge32':
case 'Unsigned32':
return 'GAUGE:600:0:U';
return 'GAUGE:600:U:U';
}
return false;
} // oid_rrd_type
@@ -1121,7 +1124,7 @@ function save_mibs($device, $mibname, $oids, $mibdef, &$graphs)
foreach ($oids as $index => $array) {
foreach ($array as $obj => $val) {
// build up the device_oid row for saving into the database
$numvalue = is_numeric($val) ? $val + 0 : 0;
$numvalue = preg_match('/^\d+$/', $val) ? $val : null;
$deviceoids[] = array(
'device_id' => $device['device_id'],
'oid' => $mibdef[$obj]['oid'].".".$index,