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

Timestamp:

03/24/13 02:07:26 (11 years ago)

Author:

ramonb

Message:

graph.php:

• fixed GET variables
• added overview graph size
• set jobstart color
• set rrd_dirs to current ganglia RRDs if overview-graph
• fixed RRD colors to new Ganglia conf array

overview.php:

• use our graph.php for RRDs
• set job start and period start/end

File:

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

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

@@ -36 +36 @@
 
 # Graph specific variables
-$size = escapeshellcmd( rawurldecode( $HTTP_GET_VARS["z"] ));
-$graph = escapeshellcmd( rawurldecode( $HTTP_GET_VARS["g"] ));
-$grid = escapeshellcmd( rawurldecode( $HTTP_GET_VARS["G"] ));
-$self = escapeshellcmd( rawurldecode( $HTTP_GET_VARS["me"] ));
-$max = escapeshellcmd( rawurldecode( $HTTP_GET_VARS["x"] ));
-$min = escapeshellcmd( rawurldecode( $HTTP_GET_VARS["n"] ));
-$value = escapeshellcmd( rawurldecode( $HTTP_GET_VARS["v"] ));
-$load_color = escapeshellcmd( rawurldecode( $HTTP_GET_VARS["l"] ));
-$vlabel = escapeshellcmd( rawurldecode( $HTTP_GET_VARS["vl"] ));
+$size = escapeshellcmd( rawurldecode( $_GET["z"] ));
+$graph = escapeshellcmd( rawurldecode( $_GET["g"] ));
+$grid = escapeshellcmd( rawurldecode( $_GET["G"] ));
+$self = escapeshellcmd( rawurldecode( $_GET["me"] ));
+$max = escapeshellcmd( rawurldecode( $_GET["x"] ));
+$min = escapeshellcmd( rawurldecode( $_GET["n"] ));
+$value = escapeshellcmd( rawurldecode( $_GET["v"] ));
+$load_color = escapeshellcmd( rawurldecode( $_GET["l"] ));
+$vlabel = escapeshellcmd( rawurldecode( $_GET["vl"] ));
 
 $cluster = $c;
@@ -61 +61 @@
     $width = 300;
 } 
+else if ($size == "overview-medium") 
+{
+    $height = 75;
+    $width = 300;
+} 
 else 
 {
@@ -67 +72 @@
 }
 
+$jobstart_color = "FF0000";
+
 if($command) 
 {
@@ -75 +82 @@
 
 $graph = $metricname;
+
+$rrd_dirs = Array();
 
 if (isset($graph)) 
@@ -81 +90 @@
     if( isset( $period_start ) && isset( $period_stop ) )
     {
-        $rrd_dirs = $trd->getRrdDirs( $period_start, $period_stop );
+        if( $size == 'overview-medium' )
+        {
+            $rrd_dirs[] = $conf['rrds'] . '/' . $cluster .'/'. $hostname;
+        }
+        else
+        {
+            $rrd_dirs = $trd->getRrdDirs( $period_start, $period_stop );
+        }
     }
 
@@ -122 +138 @@
                 ."DEF:'cpu_system${def_nr}'='${rrd_dir}/cpu_system.rrd':'sum':AVERAGE "
                 ."DEF:'cpu_idle${def_nr}'='${rrd_dir}/cpu_idle.rrd':'sum':AVERAGE "
-                ."AREA:'cpu_user${def_nr}'#${cpu_user_color}${user_str} "
-                ."STACK:'cpu_nice${def_nr}'#${cpu_nice_color}${nice_str} "
-                ."STACK:'cpu_system${def_nr}'#${cpu_system_color}${system_str} ";
+                ."AREA:'cpu_user${def_nr}'#".$conf['cpu_user_color']."${user_str} "
+                ."STACK:'cpu_nice${def_nr}'#".$conf['cpu_nice_color']."${nice_str} "
+                ."STACK:'cpu_system${def_nr}'#".$conf['cpu_system_color']."${system_str} ";
 
             if (file_exists("$rrd_dir/cpu_wio.rrd")) 
             {
                 $series .= "DEF:'cpu_wio${def_nr}'='${rrd_dir}/cpu_wio.rrd':'sum':AVERAGE "
-                    ."STACK:'cpu_wio${def_nr}'#${cpu_wio_color}${wio_str} ";
-            }
-
-            $series .= "STACK:'cpu_idle${def_nr}'#${cpu_idle_color}${idle_str} ";
+                    ."STACK:'cpu_wio${def_nr}'#".$conf['cpu_wio_color']."${wio_str} ";
+            }
+
+            $series .= "STACK:'cpu_idle${def_nr}'#".$conf['cpu_idle_color']."${idle_str} ";
 
             $def_nr++;
@@ -222 +238 @@
                 ."CDEF:'bmem_buffers${def_nr}'=mem_buffers${def_nr},1024,* "
                 ."CDEF:'bmem_used${def_nr}'='bmem_total${def_nr}','bmem_shared${def_nr}',-,'bmem_free${def_nr}',-,'bmem_cached${def_nr}',-,'bmem_buffers${def_nr}',- "
-                ."AREA:'bmem_used${def_nr}'#${mem_used_color}${memuse_str} "
-                ."STACK:'bmem_shared${def_nr}'#${mem_shared_color}${memshared_str} "
-                ."STACK:'bmem_cached${def_nr}'#${mem_cached_color}${memcached_str} "
-                ."STACK:'bmem_buffers${def_nr}'#${mem_buffered_color}${membuff_str} ";
+                ."AREA:'bmem_used${def_nr}'#".$conf['mem_used_color']."${memuse_str} "
+                ."STACK:'bmem_shared${def_nr}'#".$conf['mem_shared_color']."${memshared_str} "
+                ."STACK:'bmem_cached${def_nr}'#".$conf['mem_cached_color']."${memcached_str} "
+                ."STACK:'bmem_buffers${def_nr}'#".$conf['mem_buffered_color']."${membuff_str} ";
 
             if (file_exists("$rrd_dir/swap_total.rrd")) 
@@ -232 +248 @@
                     ."DEF:'swap_free${def_nr}'='${rrd_dir}/swap_free.rrd':'sum':AVERAGE "
                     ."CDEF:'bmem_swapped${def_nr}'='swap_total${def_nr}','swap_free${def_nr}',-,1024,* "
-                    ."STACK:'bmem_swapped${def_nr}'#${mem_swapped_color}${memswap_str} ";
-            }
-
-            $series .= "LINE2:'bmem_total${def_nr}'#${cpu_num_color}${total_str} ";
+                    ."STACK:'bmem_swapped${def_nr}'#".$conf['mem_swapped_color']."${memswap_str} ";
+            }
+
+            $series .= "LINE2:'bmem_total${def_nr}'#".$conf['cpu_num_color']."${total_str} ";
 
             $def_nr++;
@@ -270 +286 @@
                 ."DEF:'proc_run${def_nr}'='${rrd_dir}/proc_run.rrd':'sum':AVERAGE "
                 ."DEF:'cpu_num${def_nr}'='${rrd_dir}/cpu_num.rrd':'sum':AVERAGE ";
-            $series .="AREA:'load_one${def_nr}'#${load_one_color}${load_str} ";
-            $series .="LINE2:'cpu_num${def_nr}'#${cpu_num_color}${cpu_str} ";
-            $series .="LINE2:'proc_run${def_nr}'#${proc_run_color}${run_str} ";
+            $series .="AREA:'load_one${def_nr}'#".$conf['load_one_color']."${load_str} ";
+            $series .="LINE2:'cpu_num${def_nr}'#".$conf['cpu_num_color']."${cpu_str} ";
+            $series .="LINE2:'proc_run${def_nr}'#".$conf['proc_run_color']."${run_str} ";
 
             $def_nr++;
@@ -306 +322 @@
             $series .= "DEF:'bytes_in${def_nr}'='${rrd_dir}/bytes_in.rrd':'sum':AVERAGE "
                 ."DEF:'bytes_out${def_nr}'='${rrd_dir}/bytes_out.rrd':'sum':AVERAGE "
-                ."LINE2:'bytes_in${def_nr}'#${mem_cached_color}${in_str} "
-                ."LINE2:'bytes_out${def_nr}'#${mem_used_color}${out_str} ";
+                ."LINE2:'bytes_in${def_nr}'#".$conf['mem_cached_color']."${in_str} "
+                ."LINE2:'bytes_out${def_nr}'#".$conf['mem_used_color']."${out_str} ";
 
             $def_nr++;
@@ -341 +357 @@
             $series .= "DEF:'bytes_in${def_nr}'='${rrd_dir}/pkts_in.rrd':'sum':AVERAGE "
                 ."DEF:'bytes_out${def_nr}'='${rrd_dir}/pkts_out.rrd':'sum':AVERAGE "
-                ."LINE2:'bytes_in${def_nr}'#${mem_cached_color}${in_str} "
-                ."LINE2:'bytes_out${def_nr}'#${mem_used_color}${out_str} ";
+                ."LINE2:'bytes_in${def_nr}'#".$conf['mem_cached_color']."${in_str} "
+                ."LINE2:'bytes_out${def_nr}'#".$conf['mem_used_color']."${out_str} ";
 
             $def_nr++;
@@ -400 +416 @@
             $rrd_file = "$rrd_dir/$metricname.rrd";
             $series .= "DEF:'sum${def_nr}'='$rrd_file':'sum':AVERAGE "
-                ."AREA:'sum${def_nr}'#${default_metric_color}${title_str} ";
+                ."AREA:'sum${def_nr}'#".$conf['default_metric_color']."${title_str} ";
 
             $def_nr++;