From 0d6810c85a4d1d8f97f6f401086a07417dbb8e17 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Mon, 2 Aug 2010 22:38:46 +0000
Subject: [PATCH] hack to make *all* graphs draw, even if missing rrd

git-svn-id: http://www.observium.org/svn/observer/trunk@1629 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/device/mempools.inc.php  | 37 ++++++++++---------
 .../includes/graphs/device/processors.inc.php |  4 +-
 .../graphs/generic_multi_bits.inc.php         |  2 +
 html/includes/graphs/graph.inc.php            |  1 +
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/html/includes/graphs/device/mempools.inc.php b/html/includes/graphs/device/mempools.inc.php
index 0fe41ecb3..2ca7b3c74 100644
--- a/html/includes/graphs/device/mempools.inc.php
+++ b/html/includes/graphs/device/mempools.inc.php
@@ -5,24 +5,25 @@ $query = mysql_query("SELECT * FROM `mempools` where `device_id` = '".$id."'");
 
 include("includes/graphs/common.inc.php");
 
-  $rrd_options .= " -u 100 -l 0 -E -b 1024 ";
+$rrd_options .= " -u 100 -l 0 -E -b 1024 ";
 
-  $iter = "1"; $i=1;
-  $rrd_options .= " COMMENT:\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Cur\ \ \ \ Max\\\\n";
-  while($mempool = mysql_fetch_array($query)) {
-    if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
-    } elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
-    } elseif($iter=="7") {$colour="FF0084"; unset($iter); }
-    $descr = substr(str_pad(short_hrDeviceDescr($mempool['mempool_descr']), 28),0,28);
-    $descr = str_replace(":", "\:", $descr);
-    $rrd  = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("mempool-".$mempool['mempool_type']."-".$mempool['mempool_index'].".rrd");
-    $rrd_options .= " DEF:mempoolfree$i=$rrd:free:AVERAGE ";
-    $rrd_options .= " DEF:mempoolused$i=$rrd:used:AVERAGE ";
-    $rrd_options .= " CDEF:mempooltotal$i=mempoolused$i,mempoolused$i,mempoolfree$i,+,/,100,* ";
-    $rrd_options .= " LINE1:mempooltotal$i#" . $colour . ":'" . $descr . "' ";
-    $rrd_options .= " GPRINT:mempooltotal$i:LAST:%3.0lf";
-    $rrd_options .= " GPRINT:mempooltotal$i:MAX:%3.0lf\\\l ";
-    $iter++; $i++;
-  }
+$iter = "1"; $i=1;
+$rrd_options .= " COMMENT:'                                Cur    Max\\n'";
+while($mempool = mysql_fetch_array($query)) {
+  if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
+  } elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
+  } elseif($iter=="7") {$colour="FF0084"; unset($iter); }
+  $descr = substr(str_pad(short_hrDeviceDescr($mempool['mempool_descr']), 28),0,28);
+  $descr = str_replace(":", "\:", $descr);
+  $rrd  = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("mempool-".$mempool['mempool_type']."-".$mempool['mempool_index'].".rrd");
+  $rrd_options .= " DEF:mempoolfree$i=$rrd:free:AVERAGE ";
+  $rrd_options .= " DEF:mempoolused$i=$rrd:used:AVERAGE ";
+  $rrd_options .= " CDEF:mempooltotal$i=mempoolused$i,mempoolused$i,mempoolfree$i,+,/,100,* ";
+  $rrd_options .= " LINE1:mempooltotal$i#" . $colour . ":'" . $descr . "' ";
+  $rrd_options .= " GPRINT:mempooltotal$i:LAST:%3.0lf";
+  $rrd_options .= " GPRINT:mempooltotal$i:MAX:%3.0lf\\\l ";
+  $iter++; $i++;
+}
+$rrd_options .= " HRULE:0#999999";
 
 ?>
diff --git a/html/includes/graphs/device/processors.inc.php b/html/includes/graphs/device/processors.inc.php
index 4defb6135..daf875def 100644
--- a/html/includes/graphs/device/processors.inc.php
+++ b/html/includes/graphs/device/processors.inc.php
@@ -30,8 +30,6 @@ $scale_max = "100";
 
 $nototal = 1;
 
-if ($rrd_list) {
-  include ("includes/graphs/generic_multi_line.inc.php");
-}
+include ("includes/graphs/generic_multi_line.inc.php");
 
 ?>
diff --git a/html/includes/graphs/generic_multi_bits.inc.php b/html/includes/graphs/generic_multi_bits.inc.php
index 3106cdbb6..7805988c2 100644
--- a/html/includes/graphs/generic_multi_bits.inc.php
+++ b/html/includes/graphs/generic_multi_bits.inc.php
@@ -42,5 +42,7 @@ if($inverse) { $in = 'out'; $out = 'in'; } else { $in = 'in'; $out = 'out'; }
    $rrd_options .= " GPRINT:outbits:AVERAGE:%6.2lf%s";
    $rrd_options .= " GPRINT:outbits:MAX:%6.2lf%s\\\l";
   }
+$rrd_options .= " HRULE:0#999999";
+
 
 ?>
diff --git a/html/includes/graphs/graph.inc.php b/html/includes/graphs/graph.inc.php
index d8e2bb375..cc0d3a88e 100644
--- a/html/includes/graphs/graph.inc.php
+++ b/html/includes/graphs/graph.inc.php
@@ -113,6 +113,7 @@ if(!$auth)
     if($rrd_options) 
     {
       if($config['rrdcached']) { $rrd_switches = " --daemon ".$config['rrdcached'] . " "; }
+      $rrd_options .= " HRULE:0#999999";
       $rrd_cmd = $config['rrdtool'] . " graph $graphfile $rrd_options" . $rrd_switches;
       $woo = shell_exec($rrd_cmd);
       if($_GET['debug']) { echo("<pre>".$rrd_cmd."</pre>"); }