Index: /trunk/web/addons/job_monarch/conf.php =================================================================== --- /trunk/web/addons/job_monarch/conf.php (revision 240) +++ /trunk/web/addons/job_monarch/conf.php (revision 241) @@ -3,4 +3,8 @@ // $default_showhosts = 1; + +// Show the column job attribute 'requested memory'? +// +$COLUMN_REQUESTED_MEMORY = 0; // Path to Ganglia's web frontend root Index: /trunk/web/addons/job_monarch/footer.php =================================================================== --- /trunk/web/addons/job_monarch/footer.php (revision 240) +++ /trunk/web/addons/job_monarch/footer.php (revision 241) @@ -26,7 +26,7 @@ $tpl->prepare(); $tpl->assign("webfrontend-version",$version["webfrontend"]); -$tpl->assign("togaweb-version", "0.1"); -$tpl->assign("togaarch-version", "0.1"); -$tpl->assign("togaplug-version", "0.1"); +//$tpl->assign("togaweb-version", "0.1.1"); +//$tpl->assign("togaarch-version", "0.1.1"); +//$tpl->assign("togaplug-version", "0.1.1"); if ($version["gmetad"]) { Index: /trunk/web/addons/job_monarch/overview.php =================================================================== --- /trunk/web/addons/job_monarch/overview.php (revision 240) +++ /trunk/web/addons/job_monarch/overview.php (revision 241) @@ -24,5 +24,5 @@ global $GANGLIA_PATH, $clustername, $tpl, $filter, $cluster, $get_metric_string, $cluster_url, $sh; -global $hosts_up, $m, $start, $end, $filterorder; +global $hosts_up, $m, $start, $end, $filterorder, $COLUMN_REQUESTED_MEMORY; //$tpl->assign("_ROOT.summary", "" ); @@ -509,4 +509,9 @@ $view_name_nodes = array(); + if( $COLUMN_REQUESTED_MEMORY ) { + $tpl->newBlock( "column_req_mem" ); + $tpl->gotoBlock( "node" ); + } + foreach( $sorted_jobs as $jobid => $sortdec ) { @@ -598,6 +603,10 @@ $domain = $jobs[$jobid][domain]; $tpl->assign("req_cpu", makeTime( timeToEpoch( $jobs[$jobid][requested_time] ) ) ); - $tpl->assign("req_memory", $jobs[$jobid][requested_memory] ); - + + if( $COLUMN_REQUESTED_MEMORY ) { + $tpl->newBlock( "column_req_mem" ); + $tpl->assign( "req_memory", $jobs[$jobid][requested_memory] ); + $tpl->gotoBlock( "node" ); + } $ppn = (int) $jobs[$jobid][ppn] ? $jobs[$jobid][ppn] : 1; Index: /trunk/web/addons/job_monarch/templates/overview.tpl =================================================================== --- /trunk/web/addons/job_monarch/templates/overview.tpl (revision 240) +++ /trunk/web/addons/job_monarch/templates/overview.tpl (revision 241) @@ -144,7 +144,12 @@