diff --git a/includes/polling/mempools.inc.php b/includes/polling/mempools.inc.php index c0aad509bb..877aac2715 100755 --- a/includes/polling/mempools.inc.php +++ b/includes/polling/mempools.inc.php @@ -1,12 +1,11 @@ diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index 5f3b543bc5..91f547ee46 100755 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -93,7 +93,7 @@ $port_query = mysql_query("SELECT * FROM `ports` WHERE `device_id` = '".$device['device_id']."'"); while ($port = mysql_fetch_array($port_query)) { - echo(" --> " . $port['ifDescr'] . " "); + echo("Port " . $port['ifDescr'] . " "); if($port_stats[$device['device_id']][$port['ifIndex']] && $port['ignore'] == "0") { // Check to make sure Port data is cached. $this_port = &$port_stats[$device['device_id']][$port['ifIndex']]; diff --git a/includes/polling/processors.inc.php b/includes/polling/processors.inc.php index 79517e631f..41b2d9a8d7 100755 --- a/includes/polling/processors.inc.php +++ b/includes/polling/processors.inc.php @@ -4,7 +4,7 @@ $query = "SELECT * FROM processors WHERE device_id = '" . $device['device_id'] . $proc_data = mysql_query($query); while($processor = mysql_fetch_array($proc_data)) { - echo("Checking CPU " . $processor['processor_descr'] . "... "); + echo("Processor " . $processor['processor_descr'] . "... "); $file = $config['install_dir']."/includes/polling/processors-".$processor['processor_type'].".inc.php"; if(is_file($file)) { diff --git a/includes/polling/storage.inc.php b/includes/polling/storage.inc.php index f0b056ee96..9ff8c5c0dc 100755 --- a/includes/polling/storage.inc.php +++ b/includes/polling/storage.inc.php @@ -2,13 +2,13 @@ $storage_cache = array(); -echo("Storage: "); +#echo("Storage: "); $query = "SELECT * FROM storage WHERE device_id = '" . $device['device_id'] . "'"; $storage_data = mysql_query($query); while($storage = mysql_fetch_array($storage_data)) { - echo($storage['storage_descr'] . ": "); + echo("Storage ".$storage['storage_descr'] . ": "); $storage_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("storage-" . $storage['storage_mib'] . "-" . safename($storage['storage_descr']) . ".rrd"); @@ -52,10 +52,10 @@ while($storage = mysql_fetch_array($storage_data)) { if($debug) { echo("$update_query\n"); } mysql_query($update_query); + echo("\n"); + } unset($storage); -echo("\n"); - ?> diff --git a/poller.php b/poller.php index f1ee026a7d..87b4dcc087 100755 --- a/poller.php +++ b/poller.php @@ -105,9 +105,9 @@ while ($device = mysql_fetch_assoc($device_query)) $sysDescr = trim(shell_exec($config['snmpget'] . " -m SNMPv2-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " sysDescr.0")); $sysName = strtolower($sysName); -# $hrSystemUptime = snmp_get($device, ".1.3.6.1.2.1.25.1.1.0", "-Oqv", "HOST-RESOURCES-MIB"); + $hrSystemUptime = snmp_get($device, ".1.3.6.1.2.1.25.1.1.0", "-Oqv", "HOST-RESOURCES-MIB"); - echo("UPTIMES: ".$hrSystemUptime."|".$sysUptime."]"); +# echo("UPTIMES: ".$hrSystemUptime."|".$sysUptime."]"); if ($hrSystemUptime != "" && !strpos($hrSystemUptime, "No")) { @@ -286,7 +286,7 @@ while ($device = mysql_fetch_assoc($device_query)) $device_end = utime(); $device_run = $device_end - $device_start; $device_time = substr($device_run, 0, 5); $poll_update .= $poll_separator . "`last_polled_timetaken` = '$device_time'"; - echo("$device_end - $device_start; $device_time $device_run"); + #echo("$device_end - $device_start; $device_time $device_run"); echo("Polled in $device_time seconds\n"); $poll_update_query = "UPDATE `devices` SET ";