Changeset 761 for branches

Timestamp:

03/27/13 21:12:42 (11 years ago)

Author:

ramonb

Message:

• speedup

Location:

branches/0.4/web/addons/job_monarch

Files:

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

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

@@ -23 +23 @@
  */
 
-global $rrds, $range, $start, $r, $conf, $m;
-$range = $r;
+global $rrds, $start, $r, $conf, $m;
 
 include "./libtoga.php";
-
-$my_dir = getcwd();
-
-global $context;
-
-$context = 'cluster';
-
-chdir( $GANGLIA_PATH );
-
-include "./ganglia.php";
-include "./get_ganglia.php";
-
-chdir( $my_dir );
-
-if ( !empty( $_GET ) ) 
-{
-        extract( $_GET );
-}
-
-$sourcetime = $st;
 
 # Graph specific variables
@@ -59 +38 @@
 $vlabel = escapeshellcmd( rawurldecode( $_GET["vl"] ));
 $j_title = escapeshellcmd( rawurldecode( $_GET["t"] ));
+$hostname = escapeshellcmd( rawurldecode( $_GET["h"] ));
+$range = escapeshellcmd( rawurldecode( $_GET["r"] ));
+
+if( strpos( $size, 'overview' ) )
+{
+    $my_dir = getcwd();
+
+    global $context;
+
+    $context = 'host';
+
+    chdir( $GANGLIA_PATH );
+
+    include "./ganglia.php";
+    include "./get_ganglia.php";
+
+    chdir( $my_dir );
+}
+
+if ( !empty( $_GET ) ) 
+{
+        extract( $_GET );
+}
+
+$sourcetime = $st;
+
 
 $cluster = $c;
 $metricname = ($g) ? $g : $m;
-$hostname = $h;
 
 # Assumes we have a $start variable (set in get_context.php).
@@ -173 +177 @@
         $def_nr = 0;
 
-        foreach( $metrics as $bhost => $bmetric )
-        {
-            foreach( $bmetric as $mname => $mval )
-            {
-                if( ( $mname == 'zplugin_monarch_rj' ) || ($mname == 'zplugin_monarch_qj') )
-                {
-                    $rjqj_host      = $bhost;
-                }
-            }
-        }
-
-        $rrd_dir = $conf['rrds'] . "/$clustername/$rjqj_host/";
+        $rrd_dir = $conf['rrds'] . "/$clustername/$hostname/";
 
         $rj_rrd    = $rrd_dir . "zplugin_monarch_rj.rrd";

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

@@ -890 +890 @@
     if( $rjqj_host != null )
     {
-        $rjqj_graphargs = "?z=medium&c=$clustername&g=job_report&r=$range";
+        $rjqj_graphargs = "?z=overview-medium&c=$clustername&h=$rjqj_host&g=job_report&r=$range";
         if( $range == 'job' )
         {