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

Updated rrdtool_update() to use new array format

Browse Source
This commit is contained in:
laf
2015-08-18 16:26:55 +00:00
parent 84a0b8f676
commit 987634e463
65 changed files with 591 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
includes/polling/netstats-snmp.inc.php
View File

@@ -36,7 +36,7 @@ if ($device['os'] != 'Snom') {
'snmpProxyDrops',
);
unset($snmpstring, $rrdupdate, $snmpdata, $snmpdata_cmd, $rrd_create);
unset($snmpstring, $fields, $snmpdata, $snmpdata_cmd, $rrd_create);
$rrd_file = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename('netstats-snmp.rrd');
$rrd_create = $config['rrd_rra'];
@@ -48,7 +48,7 @@ if ($device['os'] != 'Snom') {
$data_array = snmpwalk_cache_oid($device, 'snmp', array(), 'SNMPv2-MIB');
$rrdupdate = array();
$fields = array();
foreach ($oids as $oid) {
if (is_numeric($data_array[0][$oid])) {
$value = $data_array[0][$oid];
@@ -56,8 +56,7 @@ if ($device['os'] != 'Snom') {
else {
$value = 'U';
}
$rrdupdate[] = $value;
$fields[$oid] = $value;
}
if (isset($data_array[0]['snmpInPkts']) && isset($data_array[0]['snmpOutPkts'])) {
@@ -65,7 +64,7 @@ if ($device['os'] != 'Snom') {
rrdtool_create($rrd_file, $rrd_create);
}
rrdtool_update($rrd_file, $rrdupdate);
rrdtool_update($rrd_file, $fields);
$graphs['netstat_snmp'] = true;
$graphs['netstat_snmp_pkt'] = true;
}