Changeset 145 for trunk/web/addons/toga/search.php

Timestamp:

06/17/05 17:14:55 (18 years ago)

Author:

bastiaans

Message:

web/addons/toga/libtoga.php:

• Small bugfixes
• Added getRrdDirs and Files functions for graphs

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

• Small rearrangement

web/addons/toga/index.php:

• Outlining

web/addons/toga/search.php:

• Fixed graphing output!

web/addons/toga/graph.php

• Fixed to handle multiple RRD's from multiple timeperiods

File:

• trunk/web/addons/toga/search.php (modified) (8 diffs)

trunk/web/addons/toga/search.php

@@ -128 +128 @@
 }
 
+function epochToDatetime( $epoch ) {
+
+        return strftime( "%d-%m-%Y %H:%M:%S", $epoch );
+}
+
 function timeToEpoch( $time ) {
 
@@ -159 +164 @@
         global $clustername, $tpl, $id, $user, $name, $start_from_time, $start_to_time, $queue;
         global $end_from_time, $end_to_time, $filter, $default_showhosts, $m, $hosts_up;
+        global $start, $stop;
 
         $metricname = $m;
+        //printf("job_start = %s job_stop = %s\n", $job_start, $job_stop );
+        //printf("start = %s stop = %s\n", $start, $stop );
 
         $tpl->assign( "cluster", $clustername );
@@ -197 +205 @@
 
                         $nodes_nr = count( $nodes );
-                        $domain = $job[domain];
+
+                        // need to replace later with domain stored from dbase
+                        //
+                        //$job_domain = $job[domain];
+
+                        $myhost = $_SERVER[HTTP_HOST];
+                        $myhf = explode( '.', $myhost );
+                        $myhf = array_reverse( $myhf );
+                        array_pop( $myhf );
+                        $myhf = array_reverse( $myhf );
+                        $job_domain = implode( '.', $myhf );
+                        
+                        //print_r( $job );
+                        //printf( "job domain = %s\n", $job_domain);
                         $ppn = (int) $job[ppn] ? $job[ppn] : 1;
                         $cpus = $nodes_nr * $ppn;
@@ -204 +225 @@
                         $tpl->assign( "cpus", $cpus );
 
-                        $runningtime = intval( $job[stop_timestamp] - $job[start_timestamp] );
-                        $tpl->assign( "started", makeDate( $job[start_timestamp] ) );
-                        $tpl->assign( "finished", makeDate( $job[stop_timestamp] ) );
+                        $job_start = $job[start_timestamp];
+                        $job_stop = $job[stop_timestamp];
+                        $runningtime = intval( $job_stop - $job_start );
+                        $tpl->assign( "started", makeDate( $job_start ) );
+                        $tpl->assign( "finished", makeDate( $job_stop ) );
                         $tpl->assign( "runningtime", makeTime( $runningtime ) );
                         
@@ -223 +246 @@
 
                         # Present a width list
-                        $cols_menu = "<SELECT NAME=\"hc\" OnChange=\"toga_form.submit();\">\n";
+                        $cols_menu = "<SELECT NAME=\"hc\" OnChange=\"archive_search_form.submit();\">\n";
 
                         $hostcols = ($hc) ? $hc : 4;
@@ -243 +266 @@
                                 //bla
 
-                                if( !isset($start) ) $start="jobstart";
-                                if( !isset($stop) ) $stop="now";
-                                //$tpl->assign("start", $start);
-                                //$tpl->assign("stop", $stop);
+                                //printf("job_start = %s job_stop = %s\n", $job_start, $job_stop );
+                                //printf("start = %s stop = %s\n", $start, $stop );
+
+                                if( !$start ) // Add an additional 5 minutes before
+                                        $start = intval( $job_start - 600 );
+                                else
+                                        $start = datetimeToEpoch( $start );
+
+                                if( !$stop ) // Add an additional 5 minutes after
+                                        $stop = intval( $job_stop + 600 );
+                                else
+                                        $stop = datetimeToEpoch( $stop );
+
+                                //printf("start = %s stop = %s\n", $start, $stop );
+
+                                $tpl->assign("j_start", epochToDatetime( $start ) );
+                                $tpl->assign("j_stop", epochToDatetime( $stop ) );
+
+                                $hosts_up = array();
+
+                                foreach( $nodes as $mynode )
+                                        $hosts_up[] = $mynode[hostname];
+
+                                //print_r( $hosts_up );
 
                                 $sorted_hosts = array();
-                                $hosts_up = $jobs[$filter[id]][nodes];
-
-                                $r = intval($job_runningtime * 1.25);
-
-                                $jobrange = ($job_runningtime < 3600) ? -3600 : -$r ;
-                                $jobstart = $report_time - $job_runningtime;
-
-                                if ($reports[$metricname])
-                                        $metricval = "g";
-                                else
-                                        $metricval = "m";
+                                //$hosts_up = $jobs[$filter[id]][nodes];
 
                                 foreach ($hosts_up as $host ) {
-                                        $host = $host. '.'.$domain;
+                                        $host = $host. '.'.$job_domain;
                                         $cpus = $metrics[$host]["cpu_num"][VAL];
                                         if (!$cpus) $cpus=1;
@@ -307 +340 @@
                                         $val = $metrics[$host][$metricname];
                                         $class = "metric";
-                                        $host_link="\"?c=$cluster_url&h=$host_url&r=job&jr=$jobrange&js=$jobstart\"";
+                                        $host_link="\"?c=$cluster_url&h=$host_url&job_start=$job_start&job_stop=$job_stop&start=$start&stop=$stop\"";
 
                                         if ($val[TYPE]=="timestamp" or $always_timestamp[$metricname]) {
@@ -314 +347 @@
                                                 $textval = "$val[VAL] $val[UNITS]";
                                         } else {
-                                                $load_color = load_color($host_load[$host]);
-                                                $graphargs = ($reports[$metricname]) ? "g=$metricname&" : "m=$metricname&";
-                                                $graphargs .= "z=small&c=$cluster_url&h=$host_url&l=$load_color" ."&v=$val[VAL]&x=$max&n=$min&r=job&jr=$jobrange&js=$jobstart";
+                                                $graphargs = "z=small&c=$cluster_url&m=$metricname&h=$host_url&v=$val[VAL]&x=$max&n=$min&job_start=$job_start&job_stop=$job_stop&start=$start&stop=$stop";
                                         }
                                         if ($textval) {
                                                 $cell="<td class=$class>".  "<b><a href=$host_link>$host</a></b><br>".  "<i>$metricname:</i> <b>$textval</b></td>";
                                         } else {
-                                                $cell="<td><a href=$host_link>".  "<img src=\"../../graph.php?$graphargs\" ".  "alt=\"$host\" height=112 width=225 border=0></a></td>";
+                                                $cell="<td><a href=$host_link>".  "<img src=\"./graph.php?$graphargs\" ".  "alt=\"$host\" border=0></a></td>";
                                         }