mibs for RTTMON/IPSLA/SAA and cleaned up discovery

git-svn-id: http://www.observium.org/svn/observer/trunk@435 61d68cd4-352d-0410-923a-c4978735b2b8

includes/discovery/cisco-mempool.php

@@ -9,7 +9,7 @@
 
   ## Cisco Enhanced Mempool
   if($device['os'] == "IOS" || $device['os'] == "IOS XE") {
-    echo("Cisco ");
+
     $oids = shell_exec($config['snmpwalk'] . " -m CISCO-ENHANCED-MEMPOOL-MIB -v2c -CI -Osq -c ".$community." ".$hostname.":".$port." cempMemPoolName | sed s/cempMemPoolName.//g");
     $oids = trim($oids);
     foreach(explode("\n", $oids) as $data) {

includes/discovery/cisco-processors.php

@@ -9,7 +9,6 @@
 
   ## Cisco Processors
   if($device['os'] == "IOS" || $device['os'] == "IOS XE") {
-    echo("Cisco ");
     $oids = shell_exec($config['snmpwalk'] . " -m CISCO-PROCESS-MIB -v2c -CI -Osqn -c ".$community." ".$hostname.":".$port." .1.3.6.1.4.1.9.9.109.1.1.1.1.2 | sed s/.1.3.6.1.4.1.9.9.109.1.1.1.1.2.//g");
     $oids = trim($oids);
     foreach(explode("\n", $oids) as $data) {
@@ -47,4 +46,6 @@
 ##### SOMETIMES CPUS FALL OUT, DONT THEY?
 ##### ***********************************
 
+echo("\n");
+
 ?>

includes/discovery/cisco-pw.php

@@ -59,6 +59,8 @@ while ($cpw = mysql_fetch_array($query)) {
   }
 }
 
+echo("\n");
+
 }
 
 ?>

includes/discovery/cisco-vrf.php

@@ -45,5 +45,6 @@
    }
   }
 
+  echo("\n");
 
 ?>