Changeset 406

Timestamp:

07/05/07 17:49:25 (16 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/index.php:

• moved (duplicate) makeHeader when overview
• fix for metrics compilation list

web/addons/job_monarch/overview.php:

• added makeHeader call

Location:

trunk/web/addons/job_monarch

Files:

• index.php (modified) (6 diffs)
• overview.php (modified) (4 diffs)

trunk/web/addons/job_monarch/index.php

@@ -92 +92 @@
 }
 
-function makeHeader( $page_call ) {
+function makeHeader( $page_call, $title, $longtitle ) {
 
         global $tpl, $grid, $context, $initgrid;
-        global $jobrange, $jobstart, $title, $longtitle;
+        global $jobrange, $jobstart;
         global $page, $gridwalk, $clustername;
         global $parentgrid, $physical, $hostname;
@@ -154 +154 @@
                 exit;
         }
+        $tpl->gotoBlock( "_ROOT" );
 
         if( $view != "search" )
@@ -159 +160 @@
 
         $tpl->assign( "date", date("r") );
+        //printf("lg %s\n", $longtitle );
+        //printf("title %s\n", $title );
         $tpl->assign( "longpage_title", $longtitle );
         $tpl->assign( "page_title", $title );
@@ -207 +210 @@
 
         if (!count($metrics)) {
-                echo "<h4>Cannot find any metrics for selected cluster \"$clustername\", exiting.</h4>\n";       echo "Check ganglia XML tree (telnet $ganglia_ip $ganglia_port)\n";
+                echo "<h4>Cannot find any metrics for selected cluster \"$clustername\", exiting.</h4>\n";
+                echo "Check ganglia XML tree (telnet $ganglia_ip $ganglia_port)\n";
                 exit;
         }
+        reset($metrics);
         $firsthost = key($metrics);
-        foreach ($metrics[$firsthost] as $m => $foo)
-                $context_metrics[] = $m;
-
-        foreach ($reports as $r => $foo)
-                $context_metrics[] = $r;
+
+        $mmfh   = array();
+
+        $mmfh   = $metrics[$firsthost];
+
+        $context_metrics        = array();
+
+        //foreach ($mmfh as $mm => $mfoo)
+        foreach( $mmfh as $mm => $bla )
+        {
+                $context_metrics[] = $mm;
+        }
+
+        foreach ($reports as $mr => $mfoo)
+                $context_metrics[] = $mr;
 
         $node_menu .= "<B><A HREF=\"./?c=".rawurlencode($clustername)."\">Joblist</A></B> ";
@@ -329 +344 @@
         }
 
-        if( $JOB_ARCHIVE && $page_call == 'index' ) {
+        if( $JOB_ARCHIVE && $page_call == 'overview' ) {
                 $tpl->newBlock( "search" );
                 $tpl->assignGlobal( "cluster_url", rawurlencode($clustername) );
@@ -420 +435 @@
 $longtitle = "Batch Report :: Powered by Job Monarch!";
 $title = "Batch Report";
-makeHeader( 'index' );
+//makeHeader( 'index' );
 $tpl->assign("cluster_url", rawurlencode($clustername) );
 $tpl->assign("cluster", $clustername );

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;
 
 $tpl->assign( "clustername", $clustername );
@@ -62 +63 @@
         session_start();
 
+        unset( $_SESSION["data"] );
         $_SESSION["data"]       = &$myxml_data;
 
@@ -565 +567 @@
         $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, '' );
+
         foreach( $sorted_jobs as $jobid => $sortdec ) 
         {
@@ -869 +884 @@
         }
 
-        makeHeader( 'overview' );
+        //print_r( $metrics );
+
+        global $longtitle, $title;
+
+        $longtitle = "Batch Report :: Powered by Job Monarch!";
+        $title = "Batch Report";
+
+        makeHeader( 'overview', $title, $longtitle );
 
         setupFilterSettings();