Index: /branches/0.4/web/addons/job_monarch/graph.php =================================================================== --- /branches/0.4/web/addons/job_monarch/graph.php (revision 724) +++ /branches/0.4/web/addons/job_monarch/graph.php (revision 725) @@ -158,5 +158,5 @@ } - $rrd_dir = "$rrds/$clustername/$rjqj_host/"; + $rrd_dir = $conf['rrds'] . "/$clustername/$rjqj_host/"; $rj_rrd = $rrd_dir . "zplugin-monarch-rj.rrd"; Index: /branches/0.4/web/addons/job_monarch/libtoga.php =================================================================== --- /branches/0.4/web/addons/job_monarch/libtoga.php (revision 724) +++ /branches/0.4/web/addons/job_monarch/libtoga.php (revision 725) @@ -343,8 +343,8 @@ function TarchRrdGraph( $clustername, $hostname ) { - global $RRDTOOL; + global $conf; global $JOB_ARCHIVE_DIR; - $this->rrdbin = $RRDTOOL; + $this->rrdbin = $conf['rrdtool']; $this->rrdvalues = array(); $this->tarchdir = $JOB_ARCHIVE_DIR; Index: /branches/0.4/web/addons/job_monarch/templates/footer.tpl =================================================================== --- /branches/0.4/web/addons/job_monarch/templates/footer.tpl (revision 724) +++ /branches/0.4/web/addons/job_monarch/templates/footer.tpl (revision 725) @@ -2,8 +2,8 @@