From 548dc82f8e0099a62bf7900465ea42ef2397aa15 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Thu, 29 Jul 2010 22:20:38 +0000
Subject: [PATCH] small fixes

git-svn-id: http://www.observium.org/svn/observer/trunk@1536 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/storage/usage.inc.php   | 2 +-
 html/pages/device/health/storage.inc.php     | 3 +--
 includes/polling/applications/apache.inc.php | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/includes/graphs/storage/usage.inc.php b/html/includes/graphs/storage/usage.inc.php
index cad06ec56..aa71be974 100644
--- a/html/includes/graphs/storage/usage.inc.php
+++ b/html/includes/graphs/storage/usage.inc.php
@@ -7,6 +7,7 @@ include("includes/graphs/common.inc.php");
 
 $rrd_options .= " -b 1024";
 
+
   $iter = "1";
   $sql = mysql_query("SELECT * FROM storage where storage_id = '".mres($_GET['id'])."'");
   $rrd_options .= " COMMENT:'                    Size      Free   % Used\\n'";
@@ -22,7 +23,6 @@ $rrd_options .= " -b 1024";
     $rrd_options .= " DEF:$storage[storage_id]free=$rrd:free:AVERAGE";
     $rrd_options .= " CDEF:$storage[storage_id]size=$storage[storage_id]used,$storage[storage_id]free,+";
     $rrd_options .= " CDEF:$storage[storage_id]perc=$storage[storage_id]used,$storage[storage_id]size,/,100,*";
-
     $rrd_options .= " LINE1.25:$storage[storage_id]perc#" . $colour . ":'$descr'";
     $rrd_options .= " GPRINT:$storage[storage_id]size:LAST:%6.2lf%sB";
     $rrd_options .= " GPRINT:$storage[storage_id]free:LAST:%6.2lf%sB";
diff --git a/html/pages/device/health/storage.inc.php b/html/pages/device/health/storage.inc.php
index 33c3957b8..9bf06b49a 100644
--- a/html/pages/device/health/storage.inc.php
+++ b/html/pages/device/health/storage.inc.php
@@ -44,8 +44,7 @@ while($drive = mysql_fetch_array($query)) {
           <a href='$fs_url' $fs_popup>".print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $left_background, $perc . "%", "ffffff", $right_background)."</a>
           </td><td>" . $free . "</td><td></td></tr>");
 
-
-  $graph_array['id'] = $storage['storage_id'];
+  $graph_array['id'] = $drive['storage_id'];
   $graph_array['type'] = $graph_type;
 
   echo("<tr bgcolor='$row_colour'><td colspan=6>");
diff --git a/includes/polling/applications/apache.inc.php b/includes/polling/applications/apache.inc.php
index bcb8f58ca..879bc6e2d 100644
--- a/includes/polling/applications/apache.inc.php
+++ b/includes/polling/applications/apache.inc.php
@@ -6,6 +6,7 @@ $apache_rrd   = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-apache-".
 $apache_cmd  = $config['snmpget'] ." -m NET-SNMP-EXTEND-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
 $apache_cmd .= " nsExtendOutputFull.6.97.112.97.99.104.101";
 $apache  = `$apache_cmd`;
+echo($apache_cmd);
 list ($total_access, $total_kbyte, $cpuload, $uptime, $reqpersec, $bytespersec, $bytesperreq, $busyworkers, $idleworkers, 
       $score_wait, $score_start, $score_reading, $score_writing, $score_keepalive, $score_dns, $score_closing, $score_logging, $score_graceful, $score_idle, $score_open) = explode("\n", $apache);