mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hack to make *all* graphs draw, even if missing rrd

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1629 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-08-02 22:38:46 +00:00
parent e2fa3e1fa9
commit 0d6810c85a
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/device/mempools.inc.php
+19 -18
View File
@@ -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";
?>
html/includes/graphs/device/processors.inc.php
+1 -3
View File
@@ -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");
?>
html/includes/graphs/generic_multi_bits.inc.php
+2
View File
@@ -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";
?>
html/includes/graphs/graph.inc.php
+1
View File
@@ -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>"); }