Changeset 206

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

Location:

trunk/web/addons/job_monarch

Files:

• conf.php (modified) (1 diff)
• index.php (modified) (2 diffs)
• libtoga.php (modified) (2 diffs)
• overview.php (modified) (1 diff)

trunk/web/addons/job_monarch/conf.php

@@ -28 +28 @@
 // Is there a jobarchive?
 //
-$TARCHD = 1;
+$JOB_ARCHIVE = 1;
+
+// Path to the job archive
+//
+$JOB_ARCHIVE_DIR = '/data/jobarch/rrds';
+
+// Path to rrdtool binary
+//
+$RRDTOOL = '/usr/bin/rrdtool';
 
 ?>

trunk/web/addons/job_monarch/index.php

@@ -73 +73 @@
         global $metrics, $reports, $m, $default_metric;
         global $default_refresh, $filterorder, $view;
-        global $TARCHD, $period_start, $period_stop, $h, $id;
+        global $JOB_ARCHIVE, $period_start, $period_stop, $h, $id;
         global $job_start, $job_stop;
         
@@ -293 +293 @@
         }
 
-        if( $TARCHD ) {
+        if( $JOB_ARCHIVE ) {
                 $tpl->newBlock( "search" );
                 $tpl->assignGlobal( "cluster_url", rawurlencode($clustername) );

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;

trunk/web/addons/job_monarch/overview.php

@@ -10 +10 @@
 $tpl->assign( "clustername", $clustername );
 
-if( $TARCHD )
+if( $JOB_ARCHIVE )
         $tpl->assign( "cluster_url", rawurlencode($clustername) );