Changeset 416 for trunk

Timestamp:

07/06/07 17:54:04 (17 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/overview.php:

• fix: don't display running/queued jobs rrd graph if the metrics are not found

File:

• trunk/web/addons/job_monarch/overview.php (modified) (1 diff)

trunk/web/addons/job_monarch/overview.php

@@ -568 +568 @@
         $last_displayed_job     = null;
 
-        $rjqj_str =  "<IMG SRC=\"./graph.php?z=small&c=$clustername&g=job_report&r=$range&st=$cluster[LOCALTIME]\">";
-
-        $tpl->gotoBlock( "_ROOT" );
-
-        $tpl->assign( "rjqj_graph", $rjqj_str );
+        $rjqj_host              = null;
+
+        foreach( $metrics as $bhost => $bmetric )
+        {
+                foreach( $bmetric as $mname => $mval )
+                {
+                        if( ( $mname == 'MONARCH-RJ' ) || ($mname == 'MONARCH-QJ') )
+                        {
+                                $rjqj_host      = $bhost;
+                        }
+                }
+        }
+
+        if( $rjqj_host != null )
+        {
+
+                $rjqj_str =  "<IMG SRC=\"./graph.php?z=small&c=$clustername&g=job_report&r=$range&st=$cluster[LOCALTIME]\">";
+
+                $tpl->gotoBlock( "_ROOT" );
+
+                $tpl->assign( "rjqj_graph", $rjqj_str );
+        }
 
         foreach( $sorted_jobs as $jobid => $sortdec )