From 11e3edbf2c8f9b3be038978baadf4bd11b88b848 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Mon, 5 Jul 2010 12:29:37 +0000
Subject: [PATCH] disable snmp timeouts for now, pending fixes

git-svn-id: http://www.observium.org/svn/observer/trunk@1295 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/pages/device/health.inc.php |  2 +-
 includes/snmp.inc.php            | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/html/pages/device/health.inc.php b/html/pages/device/health.inc.php
index 62c650b782..1065db422b 100644
--- a/html/pages/device/health.inc.php
+++ b/html/pages/device/health.inc.php
@@ -29,7 +29,7 @@ $type_text['temperatures'] = "Temperatures";
 $type_text['humidity'] = "Humidity";
 $type_text['memory'] = "Memory Pools";
 $type_text['storage'] = "Disk Usage";
-$type_text['diskio'] = "Disk IO";
+$type_text['diskio'] = "Disk I/O";
 $type_text['processors'] = "Processor Usage";
 $type_text['voltages'] = "Voltages";
 $type_text['fanspeeds'] = "Fan Speeds";
diff --git a/includes/snmp.inc.php b/includes/snmp.inc.php
index 663439f1a9..53a86cfc2e 100644
--- a/includes/snmp.inc.php
+++ b/includes/snmp.inc.php
@@ -13,7 +13,7 @@ function snmp_get ($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
   if($options) { $cmd .= " " . $options; }
   if($mib) { $cmd .= " -m " . $mib; }
   if($mibdir) { $cmd .= " -M " . $mibdir; } else { $cmd .= " -M ".$config['mibdir']; }
-  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$oid;
   if($debug) { echo("$cmd\n"); }
   $data = trim(shell_exec($cmd));
@@ -38,7 +38,7 @@ function snmp_walk($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
   if($options) { $cmd .= " $options "; }
   if($mib) { $cmd .= " -m $mib"; }
   if($mibdir) { $cmd .= " -M " . $mibdir; } else { $cmd .= " -M ".$config['mibdir']; }
-  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$oid;
   if($debug) { echo("$cmd\n"); }
   $data = trim(shell_exec($cmd));
@@ -62,7 +62,7 @@ function snmp_cache_cip($oid, $device, $array, $mib = 0)
   $cmd  = $snmpcommand . " -O snQ -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
   if($mib) { $cmd .= " -m $mib"; }
   $cmd .= " -M ".$config['install_dir']."/mibs/";
-  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$oid;
   $data = trim(shell_exec($cmd));
   $device_id = $device['device_id'];
@@ -101,7 +101,7 @@ function snmp_cache_ifIndex($device) {
   $cmd  = $snmpcommand . " -O Qs -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
   $cmd .= " -M ".$config['install_dir']."/mibs/";
   $cmd .= " -m IF-MIB ifIndex";  
-  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $data = trim(shell_exec($cmd));
   $device_id = $device['device_id'];
   foreach(explode("\n", $data) as $entry) {
@@ -196,7 +196,7 @@ function snmpwalk_cache_twopart_oid($oid, $device, $array, $mib = 0) {
   $cmd  = $snmpcommand . " -O QUs -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
   $cmd .= " -M ".$config['install_dir']."/mibs/";
   if($mib) { $cmd .= " -m $mib"; }
-  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$oid;
   $data = trim(shell_exec($cmd));
   $device_id = $device['device_id'];
@@ -224,7 +224,7 @@ function snmpwalk_cache_threepart_oid($oid, $device, $array, $mib = 0) {
   $cmd  = $snmpcommand . " -O QUs -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
   $cmd .= " -M ".$config['install_dir']."/mibs/";
   if($mib) { $cmd .= " -m $mib"; }
-  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$oid;
   $data = trim(shell_exec($cmd));
   $device_id = $device['device_id'];
@@ -253,7 +253,7 @@ function snmp_cache_slotport_oid($oid, $device, $array, $mib = 0) {
   $cmd  = $snmpcommand . " -O QUs -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
   if($mib) { $cmd .= " -m $mib"; }
   $cmd .= " -M ".$config['install_dir']."/mibs/";
-  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$oid;
   $data = trim(shell_exec($cmd));
   $device_id = $device['device_id'];
@@ -284,7 +284,7 @@ function snmp_cache_oid($oid, $device, $array, $mib = 0) {
   $cmd  = $snmpcommand . " -O UQs -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
   if($mib) { $cmd .= " -m $mib"; }
   $cmd .= " -M ".$config['install_dir']."/mibs/";
-  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$oid;
   $data = trim(shell_exec($cmd));
   $device_id = $device['device_id'];
@@ -311,7 +311,7 @@ function snmp_cache_port_oids($oids, $port, $device, $array, $mib=0) {
   $cmd = $config['snmpget'] . " -O vq -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
   $cmd .= " -M ".$config['install_dir']."/mibs/";
   if($mib) { $cmd .= " -m $mib"; }
-  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$string;
   $data = trim(shell_exec($cmd));
   $x=0;
@@ -330,7 +330,7 @@ function snmp_cache_portIfIndex ($device, $array) {
   global $config;
   $cmd = $config['snmpwalk'] . " -CI -m CISCO-STACK-MIB -O q -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
   $cmd .= " -M ".$config['install_dir']."/mibs/";
-  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " portIfIndex";
   $output = trim(shell_exec($cmd));
   $device_id = $device['device_id'];
@@ -349,7 +349,7 @@ function snmp_cache_portName ($device, $array) {
   global $config;
   $cmd = $config['snmpwalk'] . " -CI -m CISCO-STACK-MIB -O Qs -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
   $cmd .= " -M ".$config['install_dir']."/mibs/";
-  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " portName";
   $output = trim(shell_exec($cmd));
   $device_id = $device['device_id'];