Ignore:
Timestamp:
03/21/13 18:27:15 (9 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
File:
1 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 ".
Note: See TracChangeset for help on using the changeset viewer.