From 9db13602e56789642be43fc16f4ff5059cf29bee Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Sun, 8 Apr 2012 16:00:32 +0000
Subject: [PATCH] small mods

git-svn-id: http://www.observium.org/svn/observer/trunk@2995 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/discovery/mempools/cemp.inc.php  | 2 +-
 includes/discovery/processors/ios.inc.php | 4 +---
 includes/functions.php                    | 4 ++--
 includes/polling/entity-physical.inc.php  | 2 ++
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/includes/discovery/mempools/cemp.inc.php b/includes/discovery/mempools/cemp.inc.php
index 2bdec8b5ad..d3c06fda3a 100755
--- a/includes/discovery/mempools/cemp.inc.php
+++ b/includes/discovery/mempools/cemp.inc.php
@@ -2,7 +2,7 @@
 
 if ($device['os_group'] == "cisco")
 {
-  echo("CISCO-ENHANCED-MEMORY-POOL: ");
+  echo(" CISCO-ENHANCED-MEMORY-POOL: ");
 
   $array = snmpwalk_cache_multi_oid($device, "cempMemPoolEntry", NULL, "CISCO-ENHANCED-MEMPOOL-MIB");
 
diff --git a/includes/discovery/processors/ios.inc.php b/includes/discovery/processors/ios.inc.php
index 0b999c18e5..c896186000 100755
--- a/includes/discovery/processors/ios.inc.php
+++ b/includes/discovery/processors/ios.inc.php
@@ -2,7 +2,7 @@
 
 if ($device['os_group'] == "cisco" || $device['os'] == "acsw")
 {
-  echo("CISCO-PROCESS-MIB : ");
+  echo("CISCO-PROCESS-MIB: ");
   $processors_array = snmpwalk_cache_oid($device, "cpmCPU", NULL, "CISCO-PROCESS-MIB");
   if ($debug) { print_r($processors_array); }
 
@@ -37,8 +37,6 @@ if ($device['os_group'] == "cisco" || $device['os'] == "acsw")
         echo("Moved RRD ");
       }
 
-      #echo("|".$descr."|");
-
       if (!strstr($descr, "No") && !strstr($usage, "No") && $descr != "")
       {
         discover_processor($valid['processor'], $device, $usage_oid, $index, "cpm", $descr, "1", $entry['juniSystemModuleCpuUtilPct'], $entPhysicalIndex, NULL);
diff --git a/includes/functions.php b/includes/functions.php
index ca03a8eb45..802324ee00 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -194,13 +194,13 @@ function addHost($host, $snmpver = 'v2c', $port = '161', $transport = 'udp')
               print_error("Given hostname does not match SNMP-read hostname ($snmphost)!");
             }
           } else {
-            print_error("No reply on community $community");
+            print_error("No reply on community $community using $snmpver");
           }
         }
         if (!$device_id)
         {
           /// Failed SNMP
-          print_error("Could not reach $host with given SNMP community");
+          print_error("Could not reach $host with given SNMP community using $snmpver");
         }
       } else {
         /// failed Reachability
diff --git a/includes/polling/entity-physical.inc.php b/includes/polling/entity-physical.inc.php
index 179d6d227b..664a921d02 100644
--- a/includes/polling/entity-physical.inc.php
+++ b/includes/polling/entity-physical.inc.php
@@ -103,4 +103,6 @@ foreach ($entPhysical_state as $epi => $entity)
 }
 // End Delete Entity state
 
+echo("\n");
+
 ?>