Changeset 725 for branches/0.4/web


Ignore:
Timestamp:
03/22/13 12:02:36 (11 years ago)
Author:
ramonb
Message:

graph.php:

  • fixed rrd dir: running/queued jobs graph working again

templates/footer.tpl:

  • renamed Ganglia to Ganglia web

libtoga.php:

  • fixed rrdtool path
Location:
branches/0.4/web/addons/job_monarch
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/0.4/web/addons/job_monarch/graph.php

    r723 r725  
    158158        }
    159159
    160         $rrd_dir = "$rrds/$clustername/$rjqj_host/";
     160        $rrd_dir = $conf['rrds'] . "/$clustername/$rjqj_host/";
    161161
    162162        $rj_rrd    = $rrd_dir . "zplugin-monarch-rj.rrd";

  • branches/0.4/web/addons/job_monarch/libtoga.php

    r723 r725  
    343343    function TarchRrdGraph( $clustername, $hostname )
    344344    {
    345         global $RRDTOOL;
     345        global $conf;
    346346        global $JOB_ARCHIVE_DIR;
    347347
    348         $this->rrdbin        = $RRDTOOL;
     348        $this->rrdbin        = $conf['rrdtool'];
    349349        $this->rrdvalues    = array();
    350350        $this->tarchdir        = $JOB_ARCHIVE_DIR;

  • branches/0.4/web/addons/job_monarch/templates/footer.tpl

    r321 r725  
    22<CENTER>
    33<FONT SIZE="-1" class=footer>
    4 <A HREF="https://subtrac.sara.nl/oss/jobmonarch/">Job Monarch</A> version {monarch-version}
    5 <A HREF="https://subtrac.sara.nl/oss/jobmonarch/">Check for Updates.</A><BR>
     4<A HREF="https://oss.trac.surfsara.nl/jobmonarch/">Job Monarch</A> version {monarch-version}
     5<A HREF="https://oss.trac.surfsara.nl/jobmonarch/">Check for Updates.</A><BR>
    66
    7 Ganglia version {webfrontend-version}<BR>
     7Ganglia web version {webfrontend-version}<BR>
    88
    99Downloading and parsing ganglia's XML tree took {parsetime}.<BR>
Note: See TracChangeset for help on using the changeset viewer.