Changeset 738 for branches/0.4/web/addons/job_monarch/overview.php

Timestamp:

03/24/13 19:45:18 (11 years ago)

Author:

ramonb

Message:

libtoga.php,
index.php:

• fix some weird issue range being overwritten by Ganglia

overview.php:

• give rjqj graph range job: as far back as earliest job started

File:

• branches/0.4/web/addons/job_monarch/overview.php (modified) (5 diffs)

branches/0.4/web/addons/job_monarch/overview.php

@@ -34 +34 @@
 }
 
+$rjqj_start = null;
 $ds         = new DataSource();
 $myxml_data = $ds->getData();
@@ -604 +605 @@
     }
 
-    // Running / queued amount jobs graph
-    //
-    if( $rjqj_host != null )
-    {
-
-        $rjqj_str  = "<A HREF=\"./graph.php?z=large&c=$clustername&g=job_report&r=$range&st=$cluster[LOCALTIME]\">";
-        $rjqj_str .= "<IMG BORDER=0 SRC=\"./graph.php?z=small&c=$clustername&g=job_report&r=$range&st=$cluster[LOCALTIME]\">";
-        $rjqj_str .= "</A>";
-
-        $tpl->gotoBlock( "_ROOT" );
-
-        $tpl->assign( "rjqj_graph", $rjqj_str );
-    }
 
     foreach( $sorted_jobs as $jobid => $sortdec ) 
@@ -812 +800 @@
                 $job_start = $start_time;
 
+
                 $view_cpus += $cpus;
 
@@ -818 +807 @@
                 if( $jobs[$jobid]['status'] == 'R' ) 
                 {
+                    if( $rjqj_start == null ) 
+                    {
+                        $rjqj_start = $start_time;
+                    }
+                    else if( $start_time < $rjqj_start )
+                    {
+                        $rjqj_start = $start_time;
+                    }
+
                     foreach( $jobs[$jobid]['nodes'] as $tempnode )
                     {
@@ -873 +871 @@
             }
         }
+    }
+    // Running / queued amount jobs graph
+    //
+    if( $rjqj_host != null )
+    {
+        $rjqj_graphargs = "?z=medium&c=$clustername&g=job_report&r=$range";
+        if( $range == 'job' )
+        {
+            $rjqj_end = time();
+            $rjqj_graphargs .= "&period_start=$rjqj_start&period_stop=$rjqj_end";
+        }
+        else
+        {
+            $rjqj_graphargs .= "&st=$cluster[LOCALTIME]";
+        }
+
+        $rjqj_str  = "<A HREF=\"./graph.php$rjqj_graphargs\">";
+        $rjqj_str .= "<IMG BORDER=0 SRC=\"./graph.php$rjqj_graphargs\">";
+        $rjqj_str .= "</A>";
+
+        $tpl->gotoBlock( "_ROOT" );
+
+        $tpl->assign( "rjqj_graph", $rjqj_str );
     }