Changeset 412

Timestamp:

07/06/07 16:36:09 (16 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/host_view.php:

• bugfixes to graph display new style

File:

• trunk/web/addons/job_monarch/host_view.php (modified) (3 diffs)

trunk/web/addons/job_monarch/host_view.php

@@ -74 +74 @@
         $rrdirs = $trd->getRrdDirs( $period_start, $period_stop );
 
+        $longtitle = "Batch Archive Node Report :: Powered by Job Monarch!";
+        $title = "Batch Archive Node Report";
+
+        makeHeader( 'host_view', $title, $longtitle );
+
         $metrics = $metrics[$hostname];
         $mymetrics = array();
-
-        $longtitle = "Batch Archive Node Report :: Powered by Job Monarch!";
-        $title = "Batch Archive Node Report";
-
-        makeHeader( 'host_view', $title, $longtitle );
 
         foreach( $rrdirs as $rrdir ) 
@@ -122 +122 @@
         $cluster_url=rawurlencode($clustername);
         $tpl->assign("cluster_url", $cluster_url);
-        $tpl->assign("graphargs", "h=$hostname&$get_metric_string&st=$cluster[LOCALTIME]&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop");
+        //$tpl->assign("graphargs", "h=$hostname&$get_metric_string&st=$cluster[LOCALTIME]&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop");
+        $tpl->assign("graphargs", "h=$hostname&$get_metric_string&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop");
 
         # For the node view link.
@@ -151 +152 @@
                else
                   {
-                     $graphargs = "c=$cluster_url&h=$hostname&v=$v[VAL]&m=$name"
-                       ."&z=medium&st=$cluster[LOCALTIME]&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop";
+                     //$graphargs = "c=$cluster_url&h=$hostname&v=$v[VAL]&m=$name"
+                     //  ."&z=medium&st=$cluster[LOCALTIME]&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop";
+                     $graphargs = "c=$cluster_url&h=$hostname&m=$name"
+                       ."&z=medium&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop";
                      # Adding units to graph 2003 by Jason Smith <smithj4@bnl.gov>.
                      if ($v[UNITS]) {