nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

poller output cleanups (i think we should start to put some colour in here, to make it all sexypants)

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1649 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-08-05 23:00:35 +00:00
parent 693b56e6a9
commit 86f0647ded
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/polling/mempools.inc.php
+4 -4
View File
@@ -1,12 +1,11 @@
<?php
echo("Memory: ");
$query = "SELECT * FROM mempools WHERE device_id = '" . $device['device_id'] . "'";
$mempool_data = mysql_query($query);
while($mempool = mysql_fetch_array($mempool_data)) {
echo($mempool['mempool_descr'] . ": ");
echo("Mempool ". $mempool['mempool_descr'] . ": ");
$mempoolrrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("mempool-" . $mempool['mempool_type'] . "-" . $mempool['mempool_index'] . ".rrd");
@@ -35,7 +34,7 @@ while($mempool = mysql_fetch_array($mempool_data)) {
### Do we need a generic mempool poller?
}
$percent = round($mempool['used'] * $mempool['total'] * 100, 2);
$percent = round($mempool['used'] / $mempool['total'] * 100, 2);
echo($percent."% ");
@@ -51,10 +50,11 @@ while($mempool = mysql_fetch_array($mempool_data)) {
mysql_query($update_query);
if($debug) { echo($update_query); }
echo("\n");
}
unset($mempool_cache);
echo("\n");
?>
includes/polling/ports.inc.php
+1 -1
View File
@@ -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']];
includes/polling/processors.inc.php
+1 -1
View File
@@ -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)) {
includes/polling/storage.inc.php
+4 -4
View File
@@ -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");
?>
poller.php
+3 -3
View File
@@ -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 ";