Changeset 708 for branches/0.4/web/addons

Timestamp:

03/21/13 18:27:15 (10 years ago)

Author:

ramonb

Message:

web/templates/job_monarch/host_extra.tpl:

• updated to Dwoo variables
• renamed view -> j_view to prevent conflict with Ganglia

web/templates/job_monarch/cluster_extra.tpl,
addons/job_monarch/image.php,
web/addons/job_monarch/index.php,
web/addons/job_monarch/overview.php,
web/addons/job_monarch/search.php:

• renamed view -> j_view to prevent conflict with Ganglia

addons/job_monarch/graph.php:

• get rrdtool location from Ganglia's conf

Location:

branches/0.4/web/addons/job_monarch

Files:

• graph.php (modified) (3 diffs)
• image.php (modified) (1 diff)
• index.php (modified) (1 diff)
• overview.php (modified) (1 diff)
• search.php (modified) (1 diff)

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

@@ -23 +23 @@
  */
 
-global $metrics, $rrds, $range, $start, $r;
+global $metrics, $rrds, $range, $start, $r, $conf;
 $range = $r;
 
@@ -506 +506 @@
                 $end = floor($end / 672) * 672;
 
-        $command = RRDTOOL . " graph - --start $start --end $end ".
+        $command = $conf['rrdtool']. " graph - --start $start --end $end ".
                 "--width $width --height $height $lower_limit ".
                 "--title '$title' $extras $background ".
@@ -521 +521 @@
 
 else {
-        $command = RRDTOOL . " graph - --start $period_start --end $period_stop ".
+        $command = $conf['rrdtool'] . " graph - --start $period_start --end $period_stop ".
                 "--width $width --height $height $lower_limit ".
                 "--title '$title' $extras $background ".

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

@@ -52 +52 @@
 
 $httpvars = new HTTPVariables( $HTTP_GET_VARS, $_GET );
-$view = $httpvars->getHttpVar( "view" );
+$view = $httpvars->getHttpVar( "j_view" );
 $clustername = $httpvars->getClusterName();
 

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

@@ -47 +47 @@
 $httpvars = new HTTPVariables( $HTTP_GET_VARS, $_GET );
 $clustername = $httpvars->getClusterName();
-$view = $httpvars->getHttpVar( "view" );
+$view = $httpvars->getHttpVar( "j_view" );
 
 $filter = array();

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

@@ -73 +73 @@
         $ic->draw();
 
-        $tpl->assign( "clusterimage", "./image.php?". session_name() . "=" . session_id() ."&c=".rawurlencode($clustername)."&view=big-clusterimage".$filter_image_url );
+        $tpl->assign( "clusterimage", "./image.php?". session_name() . "=" . session_id() ."&c=".rawurlencode($clustername)."&j_view=big-clusterimage".$filter_image_url );
 
         //$tpl->assign( "clusterimage_width", $ic->getWidth() );

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

@@ -506 +506 @@
                                         $val = $metrics[$host][$metricname];
                                         $class = "metric";
-                                        $host_link="\"?view=host&c=$cluster_url&h=$host_url&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop\"";
+                                        $host_link="\"?j_view=host&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]) {