From 29b3d90fd8de4bd5b532328a3b1829f8785b42f3 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Fri, 9 Jul 2010 14:09:29 +0000 Subject: [PATCH] use precision for processors git-svn-id: http://www.observium.org/svn/observer/trunk@1321 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/polling/mempools.inc.php | 4 +++- includes/polling/processors.inc.php | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/polling/mempools.inc.php b/includes/polling/mempools.inc.php index c5862216f..010859e88 100755 --- a/includes/polling/mempools.inc.php +++ b/includes/polling/mempools.inc.php @@ -35,7 +35,7 @@ while($mempool = mysql_fetch_array($mempool_data)) { ### Do we need a generic mempool poller? } - $percent = round($mempool['used'] * $mempool['total'] * 100); + $percent = round($mempool['used'] * $mempool['total'] * 100, 2); echo($percent."% "); @@ -52,4 +52,6 @@ while($mempool = mysql_fetch_array($mempool_data)) { } +echo("\n"); + ?> diff --git a/includes/polling/processors.inc.php b/includes/polling/processors.inc.php index 1a18d71c0..5200d8bc8 100755 --- a/includes/polling/processors.inc.php +++ b/includes/polling/processors.inc.php @@ -13,8 +13,6 @@ while($processor = mysql_fetch_array($proc_data)) { $proc = snmp_get ($device, $processor['processor_oid'], "-O Uqnv"); } - - $procrrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("processor-" . $processor['processor_type'] . "-" . $processor['processor_index'] . ".rrd"); if (!is_file($procrrd)) { @@ -30,6 +28,8 @@ while($processor = mysql_fetch_array($proc_data)) { $proc = trim(str_replace("\"", "", $proc)); list($proc) = preg_split("@\ @", $proc); + $proc = round($proc / $processor['processor_precision'],2); + echo($proc . "%\n"); rrdtool_update($procrrd,"N:$proc");