From 399b00589a3a353728f93f57b4e94e8929c35294 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Mon, 12 Sep 2011 02:51:01 +0000 Subject: [PATCH] fixes to netstat poller (fixes issue on debian where MIBs aren't automatically loaded) git-svn-id: http://www.observium.org/svn/observer/trunk@2445 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/polling/netstats-icmp.inc.php | 2 +- includes/polling/netstats-ip.inc.php | 4 ++-- includes/polling/netstats-snmp.inc.php | 2 +- includes/polling/netstats-tcp.inc.php | 4 ++-- includes/polling/netstats-udp.inc.php | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/includes/polling/netstats-icmp.inc.php b/includes/polling/netstats-icmp.inc.php index 6b896c0db..9bb392918 100755 --- a/includes/polling/netstats-icmp.inc.php +++ b/includes/polling/netstats-icmp.inc.php @@ -25,7 +25,7 @@ if ($device['os'] != "Snom") $snmpstring .= " $oid.0"; } - $data_array = snmpwalk_cache_oid($device, "IP-MIB::icmp", array()); + $data_array = snmpwalk_cache_oid($device, "icmp", array(), "IP-MIB"); $rrdupdate = "N"; diff --git a/includes/polling/netstats-ip.inc.php b/includes/polling/netstats-ip.inc.php index 7ce35949e..c505be5cc 100755 --- a/includes/polling/netstats-ip.inc.php +++ b/includes/polling/netstats-ip.inc.php @@ -20,7 +20,7 @@ if ($device['os'] != "Snom") { $oid_ds = truncate($oid, 19, ''); $rrd_create .= " DS:$oid_ds:COUNTER:600:U:100000000000"; - $snmpstring .= " $oid.0"; + $snmpstring .= " IP-MIB::".$oid.".0"; } $data = snmp_get_multi($device, $snmpstring); @@ -50,4 +50,4 @@ if ($device['os'] != "Snom") unset($oids, $data, $data_array, $oid); -?> \ No newline at end of file +?> diff --git a/includes/polling/netstats-snmp.inc.php b/includes/polling/netstats-snmp.inc.php index 4bc48ed9e..56d5e28ec 100755 --- a/includes/polling/netstats-snmp.inc.php +++ b/includes/polling/netstats-snmp.inc.php @@ -23,7 +23,7 @@ if ($device['os'] != "Snom") $rrd_create .= " DS:$oid_ds:COUNTER:600:U:100000000000"; } - $data_array = snmpwalk_cache_oid($device, "SNMPv2-MIB::snmp", array()); + $data_array = snmpwalk_cache_oid($device, "snmp", array(), "SNMPv2-MIB"); $rrdupdate = "N"; diff --git a/includes/polling/netstats-tcp.inc.php b/includes/polling/netstats-tcp.inc.php index 622032981..7c5531d9f 100755 --- a/includes/polling/netstats-tcp.inc.php +++ b/includes/polling/netstats-tcp.inc.php @@ -21,7 +21,7 @@ if ($device['os'] != "Snom") { $oid_ds = truncate($oid, 19, ''); $rrd_create .= " DS:$oid_ds:COUNTER:600:U:10000000"; ## Limit to 10MPPS - $snmpstring .= " $oid.0"; + $snmpstring .= " TCP-MIB::".$oid.".0"; } $snmpstring .= " tcpHCInSegs.0"; @@ -54,4 +54,4 @@ if ($device['os'] != "Snom") unset($oids, $data, $data_array, $oid, $protos); } -?> \ No newline at end of file +?> diff --git a/includes/polling/netstats-udp.inc.php b/includes/polling/netstats-udp.inc.php index 382dc5ff4..bb5521637 100755 --- a/includes/polling/netstats-udp.inc.php +++ b/includes/polling/netstats-udp.inc.php @@ -19,7 +19,7 @@ if ($device['os'] != "Snom") { $oid_ds = truncate($oid, 19, ''); $rrd_create .= " DS:$oid_ds:COUNTER:600:U:1000000"; ## Limit to 1MPPS? - $snmpstring .= " $oid.0"; + $snmpstring .= " UDP-MIB::".$oid.".0"; } $data = snmp_get_multi($device, $snmpstring); @@ -47,4 +47,4 @@ if ($device['os'] != "Snom") unset($oids, $data, $data_array, $oid, $protos, $snmpstring); -?> \ No newline at end of file +?>