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

Timestamp:

04/06/07 13:21:35 (17 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/conf.php:

• added COLUMN_NODES option to display job node hostnames column

web/addons/job_monarch/search.php,
web/addons/job_monarch/overview.php:

• added handling of COLUMN_NODES

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

• added COLUMN_NODES to html

File:

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

trunk/web/addons/job_monarch/overview.php

@@ -24 +24 @@
 
 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, $hostname, $piefilter;
+global $hosts_up, $m, $start, $end, $filterorder, $COLUMN_REQUESTED_MEMORY, $COLUMN_QUEUED, $COLUMN_NODES, $hostname, $piefilter;
 
 $data_gatherer = new DataGatherer( $clustername );
@@ -466 +466 @@
         global $cluster_url, $get_metric_string, $host_url, $metrics;
         global $start, $end, $reports, $gnodes, $default_showhosts;
-        global $COLUMN_QUEUED, $COLUMN_REQUESTED_MEMORY, $hostname;
+        global $COLUMN_QUEUED, $COLUMN_REQUESTED_MEMORY, $COLUMN_NODES, $hostname;
         $metricname = $m;
 
@@ -512 +512 @@
         if( $COLUMN_REQUESTED_MEMORY ) {
                 $tpl->newBlock( "column_header_req_mem" );
+        }
+
+        if( $COLUMN_NODES ) {
+                $tpl->newBlock( "column_header_nodes" );
         }
 
@@ -642 +646 @@
                                 }
 
+
                                 if( $COLUMN_QUEUED ) {
                                         $tpl->newBlock( "column_queued" );
@@ -658 +663 @@
                                 $view_jobs++;
 
-                                if( $jobs[$jobid][status] == 'R' )
+                                if( $jobs[$jobid][status] == 'R' ) {
                                         foreach( $jobs[$jobid][nodes] as $tempnode )
                                                 $view_name_nodes[] = $tempnode;
-                                else if( $jobs[$jobid][status] == 'Q' )
+
+                                        if( $COLUMN_NODES ) {
+                                                $tpl->newBlock( "column_nodes" );
+                                                $nodes_hostnames = implode( " ", $jobs[$jobid][nodes] );
+                                                $tpl->assign( "nodes_hostnames", $nodes_hostnames );
+                                                $tpl->gotoBlock( "node" );
+                                        }
+                                } else if( $jobs[$jobid][status] == 'Q' ) {
                                         $view_nodes += (int) $jobs[$jobid][nodes];
+                                }
 
                                 if( $even ) {