Changeset 708 for branches/0.4/web/addons/job_monarch/graph.php

Timestamp:

03/21/13 18:27:15 (11 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:

• branches/0.4/web/addons/job_monarch/graph.php (modified) (3 diffs)

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 ".