Changeset 241


Ignore:
Timestamp:
04/07/06 12:42:02 (15 years ago)
Author:
bastiaans
Message:

web/addons/job_monarch/conf.php:

  • added option COLUMN_REQUESTED_MEMORY to enable/disable showing req. mem

web/addons/job_monarch/version.php:

  • version increase to 0.1.1

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

  • req. mem column is now a template block
  • added template block for queued since column (not yet used)

web/addons/job_monarch/overview.php:

  • req. mem column will now only be displayed if enabled in conf.php

web/addons/job_monarch/footer.php:

  • removed some bogus
Location:
trunk/web/addons/job_monarch
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/web/addons/job_monarch/conf.php

    r219 r241  
    33//
    44$default_showhosts = 1;
     5
     6// Show the column job attribute 'requested memory'?
     7//
     8$COLUMN_REQUESTED_MEMORY = 0;
    59
    610// Path to Ganglia's web frontend root
  • trunk/web/addons/job_monarch/footer.php

    r231 r241  
    2626$tpl->prepare();
    2727$tpl->assign("webfrontend-version",$version["webfrontend"]);
    28 $tpl->assign("togaweb-version", "0.1");
    29 $tpl->assign("togaarch-version", "0.1");
    30 $tpl->assign("togaplug-version", "0.1");
     28//$tpl->assign("togaweb-version", "0.1.1");
     29//$tpl->assign("togaarch-version", "0.1.1");
     30//$tpl->assign("togaplug-version", "0.1.1");
    3131
    3232if ($version["gmetad"]) {
  • trunk/web/addons/job_monarch/overview.php

    r240 r241  
    2424
    2525global $GANGLIA_PATH, $clustername, $tpl, $filter, $cluster, $get_metric_string, $cluster_url, $sh;
    26 global $hosts_up, $m, $start, $end, $filterorder;
     26global $hosts_up, $m, $start, $end, $filterorder, $COLUMN_REQUESTED_MEMORY;
    2727
    2828//$tpl->assign("_ROOT.summary", "" );
     
    509509        $view_name_nodes = array();
    510510
     511        if( $COLUMN_REQUESTED_MEMORY ) {
     512                $tpl->newBlock( "column_req_mem" );
     513                $tpl->gotoBlock( "node" );
     514        }
     515
    511516        foreach( $sorted_jobs as $jobid => $sortdec ) {
    512517
     
    598603                                $domain = $jobs[$jobid][domain];
    599604                                $tpl->assign("req_cpu", makeTime( timeToEpoch( $jobs[$jobid][requested_time] ) ) );
    600                                 $tpl->assign("req_memory", $jobs[$jobid][requested_memory] );
    601 
     605
     606                                if( $COLUMN_REQUESTED_MEMORY ) {
     607                                        $tpl->newBlock( "column_req_mem" );
     608                                        $tpl->assign( "req_memory", $jobs[$jobid][requested_memory] );
     609                                        $tpl->gotoBlock( "node" );
     610                                }
    602611
    603612                                $ppn = (int) $jobs[$jobid][ppn] ? $jobs[$jobid][ppn] : 1;
  • trunk/web/addons/job_monarch/templates/overview.tpl

    r240 r241  
    144144<TH><B><A HREF="#" onClick="setSort( 'queue' )">Queue</A></B></TH>
    145145<TH><B><A HREF="#" onClick="setSort( 'name' )" ALT="Jobname" TITLE="Jobname">Name</A></B></TH>
    146 <TH><B><A HREF="#" onClick="setSort( 'req_cpu' )">Req. CPU time</A></B></TH>
    147 <TH><B><A HREF="#" onClick="setSort( 'req_mem' )">Req. Memory</A></B></TH>
     146<TH><B><A HREF="#" onClick="setSort( 'req_cpu' )" ALT="Requested CPU Time (walltime)" TITLE="Requested CPU Time (walltime)">Req. CPU time</A></B></TH>
     147<!-- START BLOCK : column_req_mem -->
     148<TH><B><A HREF="#" onClick="setSort( 'req_mem' )" ALT="Requested Memory" TITLE="Requested Memory">Req. Memory</A></B></TH>
     149<!-- END BLOCK : column_req_mem -->
    148150<TH><B><A HREF="#" onClick="setSort( 'nodes' )" ALT="Nodes" TITLE="Nodes">N</A>/<A HREF="#" onClick="setSort( 'cpus' )" ALT="Processors" TITLE="Processors">P</A></B></TH>
     151<!-- START BLOCK : column_queued -->
     152<TH><B><A HREF="#" onClick="setSort( 'queued' )">Queued</A></B></TH>
     153<!-- END BLOCK : column_queued -->
    149154<TH><B><A HREF="#" onClick="setSort( 'start' )">Started</A></B></TH>
    150155<TH><B><A HREF="#" onClick="setSort( 'runningtime' )">Runningtime</A></B></TH>
     
    167172    </TD>
    168173    <TD>{req_cpu}</TD>
     174<!-- START BLOCK : column_req_mem -->
    169175    <TD>{req_memory}</TD>
     176<!-- END BLOCK : column_req_mem -->
    170177    <TD>{nodes}/{cpus}</TD>
    171178    <TD>{started}</TD>
  • trunk/web/addons/job_monarch/version.php

    r225 r241  
    2222 */
    2323
    24 $monarchversion = "0.1";
     24$monarchversion = "0.1.1";
    2525?>
Note: See TracChangeset for help on using the changeset viewer.