Changeset 409 for trunk/web/addons/job_monarch/overview.php

Timestamp:

07/06/07 14:16:44 (17 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/version.php:

• SVN version

web/addons/job_monarch/libtoga.php:

• need $start in my graph.php

jobmond/jobmond.py:

• added number of running and queued jobs metric reporting

web/addons/job_monarch/graph.php:

• added 'job_report' graph, shows running and queued jobs

web/addons/job_monarch/overview.php:

• included IMG to job_report graph

web/addons/job_monarch/index.php:

• added range menu
• fixed metric_menu selection now properly instantly refreshes graphs

web/addons/job_monarch/templates/overview.tpl:

• added job_report graph

File:

• trunk/web/addons/job_monarch/overview.php (modified) (3 diffs)

trunk/web/addons/job_monarch/overview.php

@@ -25 +25 @@
 global $GANGLIA_PATH, $clustername, $tpl, $filter, $cluster, $get_metric_string, $cluster_url, $sh;
 global $hosts_up, $m, $start, $end, $filterorder, $COLUMN_REQUESTED_MEMORY, $COLUMN_QUEUED, $COLUMN_NODES, $hostname, $piefilter;
-global $longtitle, $title;
+global $longtitle, $title, $range;
 
 $tpl->assign( "clustername", $clustername );
@@ -502 +502 @@
 {
         global $jobs, $nodes, $heartbeat, $clustername, $tpl;
-        global $sortorder, $sortby, $filter, $sh, $hc, $m;
+        global $sortorder, $sortby, $filter, $sh, $hc, $m, $range;
         global $cluster_url, $get_metric_string, $host_url, $metrics;
         global $start, $end, $reports, $gnodes, $default_showhosts;
         global $COLUMN_QUEUED, $COLUMN_REQUESTED_MEMORY, $COLUMN_NODES, $hostname;
+        global $cluster;
 
         $metricname             = $m;
@@ -567 +568 @@
         $last_displayed_job     = null;
 
-        foreach( $metrics as $bhost => $bmetric )
-        {
-                foreach( $bmetric as $mname => $mval )
-                {
-                        if( ( $mname == 'MONARCH-RJ' ) || ($mname == 'MONARCH-QJ') )
-                        {
-                                $rjqj_host      = $bhost;
-                        }
-                }
-        }
-        //$rjqj_str =  "<IMG SRC=\"../../graph.php?z=small&c=$cluster_url&h=$rjqj_host&m=MONARCH-QJ&r=job&jr=$jobrange&js=$jobstart\">";
-        //printf( $rjqj_str, '' );
+        $rjqj_str =  "<IMG SRC=\"./graph.php?z=small&c=$clustername&g=job_report&r=$range&st=$cluster[LOCALTIME]\">";
+
+        $tpl->gotoBlock( "_ROOT" );
+
+        $tpl->assign( "rjqj_graph", $rjqj_str );
 
         foreach( $sorted_jobs as $jobid => $sortdec )