Changeset 708


Ignore:
Timestamp:
03/21/13 18:27:15 (8 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
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/0.4/web/addons/job_monarch/graph.php

    r433 r708  
    2323 */
    2424
    25 global $metrics, $rrds, $range, $start, $r;
     25global $metrics, $rrds, $range, $start, $r, $conf;
    2626$range = $r;
    2727
     
    506506                $end = floor($end / 672) * 672;
    507507
    508         $command = RRDTOOL . " graph - --start $start --end $end ".
     508        $command = $conf['rrdtool']. " graph - --start $start --end $end ".
    509509                "--width $width --height $height $lower_limit ".
    510510                "--title '$title' $extras $background ".
     
    521521
    522522else {
    523         $command = RRDTOOL . " graph - --start $period_start --end $period_stop ".
     523        $command = $conf['rrdtool'] . " graph - --start $period_start --end $period_stop ".
    524524                "--width $width --height $height $lower_limit ".
    525525                "--title '$title' $extras $background ".
  • branches/0.4/web/addons/job_monarch/image.php

    r688 r708  
    5252
    5353$httpvars = new HTTPVariables( $HTTP_GET_VARS, $_GET );
    54 $view = $httpvars->getHttpVar( "view" );
     54$view = $httpvars->getHttpVar( "j_view" );
    5555$clustername = $httpvars->getClusterName();
    5656
  • branches/0.4/web/addons/job_monarch/index.php

    r688 r708  
    4747$httpvars = new HTTPVariables( $HTTP_GET_VARS, $_GET );
    4848$clustername = $httpvars->getClusterName();
    49 $view = $httpvars->getHttpVar( "view" );
     49$view = $httpvars->getHttpVar( "j_view" );
    5050
    5151$filter = array();
  • branches/0.4/web/addons/job_monarch/overview.php

    r655 r708  
    7373        $ic->draw();
    7474
    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 );
    7676
    7777        //$tpl->assign( "clusterimage_width", $ic->getWidth() );
  • branches/0.4/web/addons/job_monarch/search.php

    r411 r708  
    506506                                        $val = $metrics[$host][$metricname];
    507507                                        $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\"";
    509509
    510510                                        if ($val[TYPE]=="timestamp" or $always_timestamp[$metricname]) {
  • branches/0.4/web/templates/job_monarch/cluster_extra.tpl

    r706 r708  
    11<HR>
    22<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>
    44</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>
    33</a>
    44<hr>
Note: See TracChangeset for help on using the changeset viewer.