Changeset 708 for branches/0.4
- Timestamp:
- 03/21/13 18:27:15 (11 years ago)
- Location:
- branches/0.4/web
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/0.4/web/addons/job_monarch/graph.php
r433 r708 23 23 */ 24 24 25 global $metrics, $rrds, $range, $start, $r ;25 global $metrics, $rrds, $range, $start, $r, $conf; 26 26 $range = $r; 27 27 … … 506 506 $end = floor($end / 672) * 672; 507 507 508 $command = RRDTOOL. " graph - --start $start --end $end ".508 $command = $conf['rrdtool']. " graph - --start $start --end $end ". 509 509 "--width $width --height $height $lower_limit ". 510 510 "--title '$title' $extras $background ". … … 521 521 522 522 else { 523 $command = RRDTOOL. " graph - --start $period_start --end $period_stop ".523 $command = $conf['rrdtool'] . " graph - --start $period_start --end $period_stop ". 524 524 "--width $width --height $height $lower_limit ". 525 525 "--title '$title' $extras $background ". -
branches/0.4/web/addons/job_monarch/image.php
r688 r708 52 52 53 53 $httpvars = new HTTPVariables( $HTTP_GET_VARS, $_GET ); 54 $view = $httpvars->getHttpVar( " view" );54 $view = $httpvars->getHttpVar( "j_view" ); 55 55 $clustername = $httpvars->getClusterName(); 56 56 -
branches/0.4/web/addons/job_monarch/index.php
r688 r708 47 47 $httpvars = new HTTPVariables( $HTTP_GET_VARS, $_GET ); 48 48 $clustername = $httpvars->getClusterName(); 49 $view = $httpvars->getHttpVar( " view" );49 $view = $httpvars->getHttpVar( "j_view" ); 50 50 51 51 $filter = array(); -
branches/0.4/web/addons/job_monarch/overview.php
r655 r708 73 73 $ic->draw(); 74 74 75 $tpl->assign( "clusterimage", "./image.php?". session_name() . "=" . session_id() ."&c=".rawurlencode($clustername)."& view=big-clusterimage".$filter_image_url );75 $tpl->assign( "clusterimage", "./image.php?". session_name() . "=" . session_id() ."&c=".rawurlencode($clustername)."&j_view=big-clusterimage".$filter_image_url ); 76 76 77 77 //$tpl->assign( "clusterimage_width", $ic->getWidth() ); -
branches/0.4/web/addons/job_monarch/search.php
r411 r708 506 506 $val = $metrics[$host][$metricname]; 507 507 $class = "metric"; 508 $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\"";508 $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\""; 509 509 510 510 if ($val[TYPE]=="timestamp" or $always_timestamp[$metricname]) { -
branches/0.4/web/templates/job_monarch/cluster_extra.tpl
r706 r708 1 1 <HR> 2 2 <A HREF="./addons/job_monarch/?c={$cluster}"> 3 <IMG SRC="./addons/job_monarch/image.php?c={$cluster}& view=small-clusterimage" BORDER=0>3 <IMG SRC="./addons/job_monarch/image.php?c={$cluster}&j_view=small-clusterimage" BORDER=0> 4 4 </A> -
branches/0.4/web/templates/job_monarch/host_extra.tpl
r304 r708 1 <a href="./addons/job_monarch/?c={ cluster}&h={host}">2 <IMG SRC="./addons/job_monarch/image.php?c={ cluster}&h={host}&view=hostimage" BORDER=0>1 <a href="./addons/job_monarch/?c={$cluster}&h={$host}"> 2 <IMG SRC="./addons/job_monarch/image.php?c={$cluster}&h={$host}&j_view=hostimage" BORDER=0> 3 3 </a> 4 4 <hr>
Note: See TracChangeset
for help on using the changeset viewer.