Changeset 604 for trunk/web2/addons/job_monarch/graph.php

Timestamp:

02/17/09 15:57:35 (15 years ago)

Author:

ramonb

Message:

job_monarch/jobstore.php,
job_monarch/graph.php,
job_monarch/js/monarch.js:

• changed node graph to use own graph.php, since Ganglia's graph.php is broken for jobs
• correctly set/mark jobstart
• correctly select time period for job ranges

File:

• trunk/web2/addons/job_monarch/graph.php (modified) (7 diffs)

trunk/web2/addons/job_monarch/graph.php

@@ -57 +57 @@
 $hostname = $h;
 
-# Assumes we have a $start variable (set in get_context.php).
-if ($size == "small") {
-        $height = 40;
-        $width = 130;
-} else if ($size == "medium") {
-        $height = 75;
-        $width = 300;
-} else {
-        $height = 100;
-        $width = 400;
-}
+//# Assumes we have a $start variable (set in get_context.php).
+//if ($size == "small") {
+//      $height = 40;
+//      $width = 130;
+//} else if ($size == "medium") {
+//      $height = 75;
+//      $width = 300;
+//} else {
+//      $height = 100;
+//      $width = 400;
+//}
+
+if( in_array( $size, array_keys( $graph_sizes ) ) )
+{
+        $height = $graph_sizes[ $size ][ 'height' ];
+        $width  = $graph_sizes[ $size ][ 'width' ];
+} 
+else 
+{
+        $height = $graph_sizes[ 'default' ][ 'height' ];
+        $width  = $graph_sizes[ 'default' ][ 'width' ];
+}
+
 
 if($command) {
@@ -75 +87 @@
 //printf( "cluster = %s hostname = %s metric = %s\n", $cluster, $hostname, $metricname );
 
-$trd = new TarchRrdGraph( $cluster, $hostname );
+if( $archive )
+{
+        $trd = new TarchRrdGraph( $cluster, $hostname );
+}
 //$rrd_files = $trd->getRrdFiles( $metricname, $start, $stop );
 
@@ -82 +97 @@
 $graph = $metricname;
 
-if (isset($graph)) {
+if( isset($graph) )
+{
         $series = '';
-        if( isset( $period_start ) && isset( $period_stop ) )
+
+        if( ( $archive ) && ( isset( $period_start ) && isset( $period_stop ) ) )
         {
                 $rrd_dirs = $trd->getRrdDirs( $period_start, $period_stop );
+        }
+        else
+        {
+                $rrd_dirs = array( "$rrds/$clustername/$hostname" );
         }
 
@@ -365 +386 @@
                 foreach( $rrd_dirs as $rrd_dir ) {
 
-                        if( $def_nr == 0 ) {
-                                $title_str = ":'${subtitle}'";
-                        } else {
+                        if( $def_nr == 0 )
+                        {
+                                if( $archive )
+                                {
+                                        $title_str = ":'${subtitle}'";
+                                }
+                                else
+                                {
+                                        $title_str = ":'${subtitle} (now $value)'";
+                                }
+                        }
+                        else 
+                        {
                                 $title_str = "";
                         }
@@ -387 +418 @@
 }
 
-//$title = "$hostname $style $metricname";
 $title = "$hostname";
 
-//# Set the graph title.
-//if($context == "meta") {
-//      $title = "$self $meta_designator $style last $range";
-//} else if ($context == "grid") {
-//      $title = "$grid $meta_designator $style last $range";
-//} else if ($context == "cluster") {
-//      $title = "$clustername $style last $range";
-//} else {
-//      if ($size == "small") {
-//              # Value for this graph define a background color.
-//              if (!$load_color) $load_color = "ffffff";
-//                      $background = "--color BACK#'$load_color'";
-
-//              $title = $hostname;
-//      } else {
-//              if ($style)
-//                      $title = "$hostname $style last $range";
-//              else
-//                      $title = $metricname;
-//      }
-//}
+if( !$load_color )
+{
+        $load_color = "ffffff";
+}
+
+$background = "--color BACK#'$load_color'";
 
 function determineXGrid( $p_start, $p_stop ) {
@@ -494 +509 @@
 
 # Calculate time range.
-if( isset($sourcetime) )
-{
+//if( isset($sourcetime) )
+//{
         //printf("yay");
 
-        $end = $sourcetime;
-        # Get_context makes start negative.
-        $start = $sourcetime + $start;
-
-        # Fix from Phil Radden, but step is not always 15 anymore.
-        if ($range=="month")
-                $end = floor($end / 672) * 672;
-
-        $command = RRDTOOL . " graph - --start $start --end $end ".
-                "--width $width --height $height $lower_limit ".
-                "--title '$title' $extras $background ".
-                $series;
-}
+//      $end = $sourcetime;
+//      # Get_context makes start negative.
+//      $start = $sourcetime + $start;
+
+//      # Fix from Phil Radden, but step is not always 15 anymore.
+//      if ($range=="month")
+//              $end = floor($end / 672) * 672;
+
+//      $command = RRDTOOL . " graph - --start $start --end $end ".
+//              "--width $width --height $height $lower_limit ".
+//              "--title '$title' $extras $background ".
+//              $series;
+//}
 
 #
@@ -520 +535 @@
 #       $series;
 
-else {
+//else {
         $command = RRDTOOL . " graph - --start $period_start --end $period_stop ".
                 "--width $width --height $height $lower_limit ".
                 "--title '$title' $extras $background ".
                 $series;
-}
+//}
 
 $debug=0;
 
 # Did we generate a command?   Run it.
-if($command) {
+if( $command )
+{
         /*Make sure the image is not cached*/
         header ("Expires: Mon, 26 Jul 1997 05:00:00 GMT");   // Date in the past