Changeset 129 for trunk

Timestamp:

06/07/05 15:31:15 (18 years ago)

Author:

bastiaans

Message:

web/templates/toga/cluster_extra.tpl:

• Renamed link to joblist

web/addons/toga/templates/header.tpl:

• Inclusion to archivelink template

web/addons/toga/index.php:

• Misc cleanup
• Setup skeleton for search

web/addons/toga/overview.php:

• Fixed showhosts bugs

web/addons/toga/conf.php:

• Cleanup
• Added TARCHD option for if a archive is present

web/addons/toga/libtoga.php:

• Don't use Ganglia's get_context, it messes stuff up

Location:

trunk/web

Files:

• addons/toga/conf.php (modified) (3 diffs)
• addons/toga/index.php (modified) (9 diffs)
• addons/toga/libtoga.php (modified) (2 diffs)
• addons/toga/overview.php (modified) (4 diffs)
• addons/toga/templates/header.tpl (modified) (2 diffs)
• templates/toga/cluster_extra.tpl (modified) (1 diff)

trunk/web/addons/toga/conf.php

@@ -1 +1 @@
 <?php
+// Show hosts in a jobview by default?
+//
+$default_showhosts = 1;
 
 // Path to Ganglia's web frontend root
@@ -15 +18 @@
 
 // How to mark nodes with a job in clusterimage
-// allcpus when all cpu's are in use
-// singlecpu when less than all cpus are in use
 //
-//$JOB_NODE_MARKING_ALLCPUS = "J";
-//$JOB_NODE_MARKING_SINGLECPU = "j";
 $JOB_NODE_MARKING = "J";
 
@@ -27 +26 @@
 $DATA_SOURCE = '127.0.0.1:8649';
 
+// Is there a jobarchive?
+//
+$TARCHD = 1;
+
 ?>

trunk/web/addons/toga/index.php

@@ -37 +37 @@
         global $self, $filter, $cluster_url, $get_metric_string;
         global $metrics, $reports, $m, $default_metric;
+        global $default_refresh;
 
         if( isset($default_metric) and !isset($m) )
@@ -46 +47 @@
                         $metricname = "load_one";
 
-        //$metricname = ($m) ? $m : $default_metric;
-        //printf( "m = %s, metricname = %s, default_metric = %s\n", $m, $metricname, $default_metric );
-        if ( $context == "control" && $controlroom < 0 )
-                $header = "header-nobanner";
-        else
-                $header = "header";
+        $header = "header";
 
         # Maintain our path through the grid tree.
         $me = $self . "@" . $grid[$self][AUTHORITY];
 
-        if ($initgrid) {
-                $gridstack = array();
-                $gridstack[] = $me;
-        } else if ($gridwalk=="fwd") {
+        $gridstack = array();
+        $gridstack[] = $me;
+
+        if ($gridwalk=="fwd") {
                 # push our info on gridstack, format is "name@url>name2@url".
                 if (end($gridstack) != $me) {
@@ -99 +95 @@
 
         # The page to go to when "Get Fresh Data" is pressed.
-        if (isset($page))
-                $tpl->assign("page",$page);
-        else
-                $tpl->assign("page","./");
+        $tpl->assign("page","./");
 
         # Templated Logo image
@@ -169 +162 @@
 
         if( array_key_exists( "id", $filter ) ) {
-                //$context_ranges[]="hour";
-                //$context_ranges[]="day";
-                //$context_ranges[]="week";
-                //$context_ranges[]="month";
-                //$context_ranges[]="year";
-                //if ($jobrange)
-                //      $context_ranges[]="job";
-
-                //$range_menu = "<B>Last</B>&nbsp;&nbsp;"
-                //      ."<SELECT NAME=\"r\" OnChange=\"toga_form.submit();\">\n";
-                //foreach ($context_ranges as $v) {
-                //      $url=rawurlencode($v);
-        //              $range_menu .= "<OPTION VALUE=\"$url\" ";
-        //              if ($v == $range)
-        //                       $range_menu .= "SELECTED";
-        //              $range_menu .= ">$v\n";
-        //      }
-        //      $range_menu .= "</SELECT>\n";
-
-        //      $tpl->assign("range_menu", $range_menu);
-
-                //$metricname = $m;
 
                 if (is_array($context_metrics) ) {
@@ -237 +208 @@
 }
 
-function includeJobview() {
+function includeSearchpage() {
         global $tpl;
 
-        $tpl->assignInclude( "main", "templates/jobview.tpl" );
+        $tpl->assignInclude( "main", "templates/search.tpl" );
+
+}
+
+function includeSearchThumb() {
+        global $tpl;
+
+        $tpl->assignInclude( "archive", "templates/inc_search.tpl" );
+
 }
 
@@ -249 +228 @@
 }
 
-function makeJobview() {
-
-}
-
 $tpl = new TemplatePower( "templates/index.tpl" );
 
@@ -262 +237 @@
 
                 includeOverview();
-                break;
-
-        //case "jobview":
-
-        //      includeJobview();
-        //      break;
+                if( $TARCHD )
+                        includeSearchThumb();
+                break;
+
+        case "search":
+
+                includeSearchPage();
+                break;
 
         default:
@@ -280 +257 @@
 $title = "Torque Report";
 makeHeader();
+$tpl->assign("cluster_url", rawurlencode($clustername) );
+$tpl->assign("cluster", $clustername );
 
 switch( $view ) {
@@ -289 +268 @@
                 break;
 
-        //case "jobview":
-
-        //      makeJobview();
-        //      break;
+        case "search":
+
+                include "./search.php";
+                makeSearchPage();
+                break;
 
         default:

trunk/web/addons/toga/libtoga.php

@@ -60 +60 @@
 chdir( $GANGLIA_PATH );
 
+$context = 'cluster';
+
 include_once "./conf.php";
 include_once "./functions.php";
 include_once "./ganglia.php";
-include_once "./get_context.php";
+//include_once "./get_context.php";
 include_once "./get_ganglia.php";
 
@@ -76 +78 @@
 //
 global $context, $clustername, $reports;
+
 //$clustername = $httpvars->getClusterName();
-//$context = 'cluster';
-
 
 global $default_metric;

trunk/web/addons/toga/overview.php

@@ -7 +7 @@
 //$tpl->assign( "self", "./index.php" );
 $tpl->assign( "clustername", $clustername );
+
+if( $TARCHD )
+        $tpl->assign( "cluster_url", rawurlencode($clustername) );
 
 $data_gatherer->parseXML();
@@ -426 +429 @@
         global $sortorder, $sortby, $filter, $sh, $hc, $m;
         global $cluster_url, $get_metric_string, $host_url, $metrics;
-        global $start, $end, $reports, $gnodes;
+        global $start, $end, $reports, $gnodes, $default_showhosts;
 
         $metricname = $m;
@@ -523 +526 @@
         $tpl->assignGlobal("f_jobs_nr", $f_jobs );
 
-        if( array_key_exists( "id", $filter ) ) {
+        if( array_key_exists( "id", $filter ) and $start_time ) {
                 $tpl->newBlock( "showhosts" );
 
@@ -545 +548 @@
                 $tpl->assign("cols_menu", $cols_menu);
 
-                if( $sh) $showhosts = $sh;
-                if( !$showhosts) $showhosts = 0;
+                $showhosts = isset($sh) ? $sh : $default_showhosts;
+                //if( !$showhosts) $showhosts = $default_showhosts;
                 $tpl->assign("checked$showhosts", "checked");
 

trunk/web/addons/toga/templates/header.tpl

@@ -29 +29 @@
      <INPUT TYPE="SUBMIT" VALUE="Get Fresh Data">
      </TD>
+     <TD></TD>
   </TR>
   <TR>
-     <TD COLSPAN="1">
+     <TD COLSPAN=1>
      {metric_menu} &nbsp;&nbsp;
      {range_menu}&nbsp;&nbsp;
@@ -39 +40 @@
       <B>{alt_view}</B>
      </TD>
+<!-- INCLUDE BLOCK : archive -->
   </TR>
   </TABLE>

trunk/web/templates/toga/cluster_extra.tpl

@@ -3 +3 @@
 <tr>
  <td valign=center>
-  <a href="./addons/toga/?c={cluster}"><b>Torque Job's</b></a>
+  <a href="./addons/toga/?c={cluster}"><b>Joblist</b></a>
  </td>
 </tr>