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

Timestamp:

02/07/08 10:35:47 (16 years ago)

Author:

bastiaans

Message:

libtoga.php:

• added getUsingFQDN() functions to determine FQDN usage from overview etc
• fixed: moved column and row number header printing so that it will always be printed, even if there are nodes missing
• code cleanup
• added more comments

overview.php:

• check getUsingFQDN() whether or not to use a domain name for node hostnames
• added more comments

version.php:

• make sure it's know this is a SVN version

File:

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

trunk/web/addons/job_monarch/overview.php

@@ -44 +44 @@
 $gnodes         = $data_gatherer->getNodes();
 $cpus           = $data_gatherer->getCpus();
+$use_fqdn       = $data_gatherer->getUsingFQDN();
 
 function setupFilterSettings() 
@@ -507 +508 @@
         global $start, $end, $reports, $gnodes, $default_showhosts;
         global $COLUMN_QUEUED, $COLUMN_REQUESTED_MEMORY, $COLUMN_NODES, $hostname;
-        global $cluster;
+        global $cluster, $use_fqdn;
 
         $metricname             = $m;
@@ -552 +553 @@
         $view_name_nodes        = array();
 
+        // Is the "requested memory" column enabled in the config
+        //
         if( $COLUMN_REQUESTED_MEMORY ) 
         {
@@ -557 +560 @@
         }
 
+        // Is the "nodes hostnames" column enabled in the config
+        //
         if( $COLUMN_NODES ) 
         {
@@ -562 +567 @@
         }
 
+        // Is the "queued time" column enabled in the config
+        //
         if( $COLUMN_QUEUED ) 
         {
@@ -582 +589 @@
         }
 
+        // Running / queued amount jobs graph
+        //
         if( $rjqj_host != null )
         {
@@ -641 +650 @@
                                                 $hostnode       = $tempnode;
 
-                                                //if( substr( $hostnode, $domain_len ) != $jobs[$jobid][domain] ) 
-                                                //{
-                                                //      $hostnode = $hostnode. '.'. $jobs[$jobid][domain];
-                                                //}
+                                                if( $use_fqdn == 1)
+                                                {
+                                                        if( substr( $hostnode, $domain_len ) != $jobs[$jobid][domain] ) 
+                                                        {
+                                                                $hostnode = $hostnode. '.'. $jobs[$jobid][domain];
+                                                        }
+                                                }
 
                                                 if( $hostname == $hostnode ) 
@@ -804 +816 @@
                                                 foreach( $jobs[$jobid][nodes] as $mynode ) 
                                                 {
-                                                        //$myhost_href  = "./?c=".$clustername."&h=".$mynode.".".$jobs[$jobid][domain];
+                                                        if( $use_fqdn == 1)
+                                                        {
+                                                                $mynode = $mynode.".".$jobs[$jobid][domain];
+                                                        }
                                                         $myhost_href    = "./?c=".$clustername."&h=".$mynode;
                                                         $mynodehosts[]  = "<A HREF=\"".$myhost_href."\">".$mynode."</A>";
@@ -978 +993 @@
                         foreach ( $hosts_up as $host ) 
                         {
-                                //$domain_len           = 0 - strlen( $domain );
-
-                                //if( substr( $host, $domain_len ) != $domain ) 
-                                //{
-                                //      $host           = $host . '.' . $domain;
-                                //}
+                                $domain_len             = 0 - strlen( $domain );
+
+                                if( $use_fqdn )
+                                {
+                                        if( substr( $host, $domain_len ) != $domain ) 
+                                        {
+                                                $host           = $host . '.' . $domain;
+                                        }
+                                }
 
                                 $cpus                   = $metrics[$host]["cpu_num"]["VAL"];
@@ -1007 +1025 @@
                                 }
                         }
+
                         switch ( $sort ) 
                         {