Changeset 206 for trunk/web/addons/job_monarch/libtoga.php

Timestamp:

01/06/06 10:57:51 (17 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/conf.php:

• renamed TARCHD to JOB_ARCHIVE
• added options: JOB_ARCHIVE_DIR, RRDTOOL

web/addons/job_monarch/overview.php:

• renamed TARCHD to JOB_ARCHIVE

web/addons/job_monarch/index.php:

• renamed TARCHD to JOB_ARCHIVE

web/addons/job_monarch/libtoga.php:

• added usage of options: JOB_ARCHIVE_DIR, RRDTOOL

File:

• trunk/web/addons/job_monarch/libtoga.php (modified) (2 diffs)

trunk/web/addons/job_monarch/libtoga.php

@@ -55 +55 @@
 
 global $GANGLIA_PATH;
+global $RRDTOOL;
+global $JOB_ARCHIVE_DIR;
 
 $my_dir = getcwd();
@@ -230 +232 @@
         var $rrdbin, $rrdvalues, $clustername, $hostname, $tempdir, $tarchdir, $metrics;
 
-        function TarchRrdGraph( $clustername, $hostname, $rrdbin = '/usr/bin/rrdtool', $tarchdir = '/data/jobarch/rrds' ) {
-        
-                $this->rrdbin = $rrdbin;
+        function TarchRrdGraph( $clustername, $hostname ) {
+
+                global $RRDTOOL;
+                global $JOB_ARCHIVE_DIR;
+
+                $this->rrdbin = $RRDTOOL;
                 $this->rrdvalues = array();
-                $this->tarchdir = $tarchdir;
+                $this->tarchdir = $JOB_ARCHIVE_DIR;
                 $this->clustername = $clustername;
                 $this->hostname = $hostname;