From 7922783d4bda82085e9c0213445ae375bc1fe0f9 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sun, 18 Jul 2010 12:42:00 +0000
Subject: [PATCH] changelog update. fix parser. fix mempools cmp (removed old
 debugging both)

git-svn-id: http://www.observium.org/svn/observer/trunk@1416 61d68cd4-352d-0410-923a-c4978735b2b8
---
 CHANGELOG                             | 8 +++++++-
 includes/polling/mempools-cmp.inc.php | 2 +-
 includes/port-descr-parser.inc.php    | 3 ---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 76d8f8500..b3bc0bef4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,18 +5,24 @@ Release 0.10.7 ( SVN )
 
 * Project name has changed to Observium
 * rrdcached support
+* Support of ADSL-LINE-MIB and new ports display mode designed
+  for service providers with DSLAMs and MSANs
 * Discovery of new device/os types : 
   Apple Airport, Axis Camera, Motorola Netopia, APC Switch PDU,
   Extreme Extremware, Redback, ZyXEL ZyWALL, DELL DRAC,
   Dell PowerVault, Allied Telesis, Cisco NX-OS, MGE Evolution UPS
   HP JetDirect printers, APC STS/ATS, Mikrotic RouterOS,
   AKCP SensorProbe3
+* New structure for device graphing to aid 3rd party addons
 * Temperature detection from CISCO-ENTITY-SENSOR-MIB
 * Graphing of statistics from DISKIO-MIB
 * Ongoing unification of all sensors into one 'sensors' framework
 * Detection and polling of frequency, voltage and ampage stats
   for many UPSes and power switching hardware
-
+* Detection of Extremeware / XOS versions and hardware
+* Detection of several Allied Telesis devices and their versions
+  and hardware
+* Added a lot of MIBs
 
 Release 0.10.6 ( 21st June 2010 )
 
diff --git a/includes/polling/mempools-cmp.inc.php b/includes/polling/mempools-cmp.inc.php
index 473c1ad6d..55ad416ae 100755
--- a/includes/polling/mempools-cmp.inc.php
+++ b/includes/polling/mempools-cmp.inc.php
@@ -6,7 +6,7 @@
   $pool_cmd .= " ciscoMemoryPoolUsed.$oid ciscoMemoryPoolFree.$oid ciscoMemoryPoolLargestFree.$oid";
   $pool_cmd .= " | cut -f 1 -d ' '";
 
-  echo("$pool_cmd");
+  if($debug) {echo("$pool_cmd");}
 
   $pool = shell_exec($pool_cmd);
 
diff --git a/includes/port-descr-parser.inc.php b/includes/port-descr-parser.inc.php
index 9e7ceab43..3e18e02a1 100644
--- a/includes/port-descr-parser.inc.php
+++ b/includes/port-descr-parser.inc.php
@@ -1,4 +1,3 @@
-
 <?php
 
   ## Very basic parser to parse classic Observium-type schemes.
@@ -6,8 +5,6 @@
 
   unset ($port_ifAlias);
 
-  echo("parser!");
-
   echo($this_port['ifAlias']);
 
   list($type,$descr) = preg_split("/[\:\[\]\{\}\(\)]/", $this_port['ifAlias']);