diff --git a/includes/discovery/mempools/cemp.inc.php b/includes/discovery/mempools/cemp.inc.php index 732675496..ef940eae6 100755 --- a/includes/discovery/mempools/cemp.inc.php +++ b/includes/discovery/mempools/cemp.inc.php @@ -12,7 +12,7 @@ if($device['os'] == "ios" || $device['os_group'] == "ios") { foreach($array[$device['device_id']] as $index => $entry) { if(is_numeric($entry['cempMemPoolUsed']) && $entry['cempMemPoolValid'] == "true") { list($entPhysicalIndex) = explode(".", $index); - $entPhysicalDescr = snmp_get($device, "entPhysicalDescr.".$entPhysicalIndex, "-Oqv", "ENTITY-MIB"); + $entPhysicalName = snmp_get($device, "entPhysicalDescr.".$entPhysicalIndex, "-Oqv", "ENTITY-MIB"); $descr = $entPhysicalDescr." - ".$entry['cempMemPoolName']; $descr = str_replace("Cisco ", "", $descr); diff --git a/includes/discovery/processors/ios.inc.php b/includes/discovery/processors/ios.inc.php index a44c16ab0..c0dc566cd 100755 --- a/includes/discovery/processors/ios.inc.php +++ b/includes/discovery/processors/ios.inc.php @@ -38,7 +38,7 @@ if ($device['os'] == "ios" || $device['os_group'] == "ios") echo("Moved RRD "); } - echo("|".$descr."|"); + #echo("|".$descr."|"); if(!strstr($descr, "No") && !strstr($usage, "No") && $descr != "" ) { diff --git a/includes/rewrites.php b/includes/rewrites.php index 6f5455c21..83eab92e3 100644 --- a/includes/rewrites.php +++ b/includes/rewrites.php @@ -19,12 +19,12 @@ function rewrite_entity_descr ($descr) { $descr = str_replace("Switching Processor", "SP", $descr); $descr = str_replace("Sub-Module", "Module ", $descr); $descr = str_replace("DFC Card", "DFC", $descr); + $descr = str_replace("Centralized Forwarding Card", "CFC", $descr); $descr = str_replace("Power Supply Module", "PSU ", $descr); $descr = str_replace("/Voltage Sensor/", "Voltage", $descr); $descr = preg_replace("/^temperatures /", "", $descr); $descr = preg_replace("/^voltages /", "", $descr); - return $descr; } diff --git a/irc.php b/irc.php index 1d911f990..9dc81145d 100755 --- a/irc.php +++ b/irc.php @@ -49,7 +49,7 @@ class observiumbot $host = "chat.eu.freenode.net"; $port = 6667; -$nick = "ObserverBOT"; +$nick = "Observium"; $chan = "#observium"; $bot = &new observiumbot( );