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

Timestamp:

06/20/05 14:50:55 (18 years ago)

Author:

bastiaans

Message:

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

• First checkin of host_view template

web/addons/toga/host_view.php:

• Modified host view for toga (archive)
• Will parse same periods as search

web/addons/toga/templates/search.tpl, web/addons/toga/search.php, web/addons/toga/graph.php:

• Renamed start and stop to period_start and period_stop

web/addons/toga/index.php:

• Added inclusion of host_view if specified

File:

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

trunk/web/addons/toga/search.php

@@ -164 +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;
+        global $period_start, $period_stop;
 
         $metricname = $m;
@@ -269 +269 @@
                                 //printf("start = %s stop = %s\n", $start, $stop );
 
-                                if( !$start ) // Add an additional 5 minutes before
-                                        $start = intval( $job_start - 600 );
+                                if( !$period_start ) // Add an additional 5 minutes before
+                                        $period_start = intval( $job_start - (intval( $runningtime * 0.10 ) ) );
                                 else
-                                        $start = datetimeToEpoch( $start );
-
-                                if( !$stop ) // Add an additional 5 minutes after
-                                        $stop = intval( $job_stop + 600 );
+                                        $period_start = datetimeToEpoch( $period_start );
+
+                                if( !$period_stop ) // Add an additional 5 minutes after
+                                        $period_stop = intval( $job_stop + (intval( $runningtime * 0.10 ) ) );
                                 else
-                                        $stop = datetimeToEpoch( $stop );
+                                        $period_stop = datetimeToEpoch( $period_stop );
 
                                 //printf("start = %s stop = %s\n", $start, $stop );
 
-                                $tpl->assign("j_start", epochToDatetime( $start ) );
-                                $tpl->assign("j_stop", epochToDatetime( $stop ) );
+                                $tpl->assign("period_start", epochToDatetime( $period_start ) );
+                                $tpl->assign("period_stop", epochToDatetime( $period_stop ) );
 
                                 $hosts_up = array();
@@ -340 +340 @@
                                         $val = $metrics[$host][$metricname];
                                         $class = "metric";
-                                        $host_link="\"?c=$cluster_url&h=$host_url&job_start=$job_start&job_stop=$job_stop&start=$start&stop=$stop\"";
+                                        $host_link="\"?c=$cluster_url&h=$host_url&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop\"";
 
                                         if ($val[TYPE]=="timestamp" or $always_timestamp[$metricname]) {
@@ -347 +347 @@
                                                 $textval = "$val[VAL] $val[UNITS]";
                                         } else {
-                                                $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";
+                                                $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&period_start=$period_start&period_stop=$period_stop";
                                         }
                                         if ($textval) {