Changeset 823 for branches/0.4/web

Timestamp:

04/11/13 18:41:32 (10 years ago)

Author:

ramonb

Message:

graph.php:

• pass min/max to rrdtool

overview.php:

• set units as rrd vertical label

Location:

branches/0.4/web/addons/job_monarch

Files:

• graph.php (modified) (2 diffs)
• overview.php (modified) (1 diff)

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

@@ -955 +955 @@
     }
         $command = $conf['rrdtool']. " graph - --start $start --end $end ".
+                "$upper_limit $lower_limit ".
                 "--width $width --height $height $lower_limit $vertical_label ".
                 "--title '$title' $extras $background ".
@@ -962 +963 @@
 {
     $command = $conf['rrdtool'] . " graph - --start $period_start --end $period_stop ".
+                "$upper_limit $lower_limit ".
                "--width $width --height $height $lower_limit --color BACK#$load_color $vertical_label ".
                "--title '$title' $extras $background ".

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

@@ -1119 +1119 @@
                     //printf("last job %s job start %s runningtime %s period start %s", $last_displayed_job, $jobstart, $job_runningtime, $period_start);
                     $graphargs     = ($reports[$metricname]) ? "g=$metricname&" : "m=$metricname&";
-                    $graphargs    .= "z=overview-medium&c=$cluster_url&r=$range&h=$host_url&l=$load_color&v=".$val['VAL']."&job_start=$job_start";
+                    $graphargs    .= "z=overview-medium&c=$cluster_url&r=$range&h=$host_url&l=$load_color&v=".$val['VAL']."&job_start=$job_start&vl=".$val['UNITS'];
                     $host_link     = "?j_view=overview-host&c=$cluster_url&r=$range&h=$host_url&job_start=$jobstart";