Changeset 733

Timestamp:

03/24/13 14:32:34 (10 years ago)

Author:

ramonb

Message:

graph.php:

• fixed load color background

overview.php:

• use our own host_overview not Ganglia's anymore (has no job range/start anymore)

Location:

branches/0.4/web/addons/job_monarch

Files:

• graph.php (modified) (2 diffs)
• overview.php (modified) (3 diffs)

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

@@ -524 +524 @@
 
 # Calculate time range.
-if( isset($sourcetime) )
+if ( isset($sourcetime) )
 {
     $end = $sourcetime;
@@ -532 +532 @@
     # Fix from Phil Radden, but step is not always 15 anymore.
     if ($range=="month")
+    {
         $end = floor($end / 672) * 672;
-
-    $command = $conf['rrdtool']. " graph - --start $start --end $end ".
-        "--width $width --height $height $lower_limit ".
-        "--title '$title' $extras $background ".
-        $series;
-}
-else 
+    }
+        $command = $conf['rrdtool']. " graph - --start $start --end $end ".
+                "--width $width --height $height $lower_limit ".
+                "--title '$title' $extras $background ".
+                $series;
+}
+else
 {
     $command = $conf['rrdtool'] . " graph - --start $period_start --end $period_stop ".
-        "--width $width --height $height $lower_limit ".
-        "--title '$title' $extras $background ".
-        $series;
+               "--width $width --height $height $lower_limit --color BACK#$load_color ".
+               "--title '$title' $extras $background ".
+               $series;
 }
 
 $debug=0;
+
+if( !isset( $load_color ) )
+{
+    $load_color = '000000';
+}
 
 # Did we generate a command?   Run it.

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

@@ -1019 +1019 @@
                     }
                 }
+                $cpus             = 0;
 
                 $cpus             = $metrics[$host]["cpu_num"]["VAL"];
 
-                if ( !$cpus )
+                if( $cpus == 0 )
                 {
                     $cpus        = 1;
@@ -1081 +1082 @@
                 $val         = $metrics[$host][$metricname];
                 $class       = "metric";
-                $host_link   = "\"../../?c=$cluster_url&h=$host_url&r=job&jr=$jobrange&js=$jobstart\"";
 
                 if ( $val["TYPE"] == "timestamp" || $always_timestamp[$metricname] ) 
@@ -1101 +1101 @@
                     $graphargs     = ($reports[$metricname]) ? "g=$metricname&" : "m=$metricname&";
                     $graphargs     .= "z=overview-medium&c=$cluster_url&h=$host_url&l=$load_color&v=".$val['VAL']."&job_start=$job_start&period_start=$period_start&period_stop=$period_end";
+                    $host_link   = "\"?j_view=host&c=$cluster_url&h=$host_url&job&jr=$jobrange&js=$jobstart&period_start=$period_start&period_stop=$period_end\"";
                     if( $max > 0 ) 
                     {