Changeset 602 for trunk

Timestamp:

02/16/09 23:58:17 (14 years ago)

Author:

ramonb

Message:

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

• changed host graph retrieval and display

Location:

trunk/web2/addons/job_monarch

Files:

• jobstore.php (modified) (5 diffs)
• js/monarch.js (modified) (2 diffs)
• libtoga.php (modified) (1 diff)

trunk/web2/addons/job_monarch/jobstore.php

@@ -25 +25 @@
 $queue                  = isset($_POST['queue']) ? $_POST['queue'] : null;
 $host                   = isset($_POST['host']) ? $_POST['host'] : null;
+$metricname             = isset($_POST['metricname']) ? $_POST['metricname'] : 'load_one';
 
 if( $jids != null )
@@ -431 +432 @@
 function getNodes()
 {
-        global $jobs, $jobids, $clustername, $metrics, $jid;
+        global $jobs, $jobids, $clustername, $metrics, $jid, $metricname;
+        global $always_timestamp, $always_constant;
 
         $display_nodes  = array();
@@ -439 +441 @@
         if( !$jobids && !$jid )
         {
+                // RB: todo replace with 0 result rows
+                //
                 printf("no jobid(s)\n");
                 return 1;
@@ -457 +461 @@
         {
                 $nr             = array();
-                $nr['c']        = $clustername;
-                $nr['h']        = $host ;
-                $nr['x']        = '5';
-                $nr['v']        = '0';
 
                 $cpus           = $metrics[$host]['cpu_num']['VAL'];
+
+                //print_r( $jobs[$jid] );
 
                 if ( !$cpus )
@@ -473 +475 @@
                 $load_color     = load_color($load);
 
-                $nr['l']        = $load_color;
-
-                $job_runtime    = (int) $jobs[$jid]['reported'] - (int) $jobs[$jid]['start_timestamp'];
-                $job_window     = intval($job_runtime * 1.2);
-
-                $nr['jr']       = -$job_window;
-                $nr['js']       = (int) $jobs[$jid]['start_timestamp'];
+
+                // RB: something broken here with JR / JS
+                //
+                //$job_runtime  = intval( $jobs[$jid]['reported'] ) - intval( $jobs[$jid]['start_timestamp'] );
+                $job_runtime    = date( 'u' ) - intval( $jobs[$jid]['start_timestamp'] );
+                $job_window     = intval( $job_runtime ) * 1.2;
+
+                $jobrange       = -$job_window;
+                $jobstart       = $jobs[$jid]['start_timestamp'];
+
                 $nr['jid']      = $jid;
+
+                $hostar         = array( $host );
+
+                list($min,$max) = find_limits( $hostar, $metricname );
+
+                $host_url       = rawurlencode( $host );
+                $cluster_url    = rawurlencode( $clustername );
+
+                $textval        = "";
+
+                $val            = $metrics[$host][$metricname];
+
+                // RB: haven't used this yet: link to Ganglia's host overview
+                // maybe later to popup?
+                //
+                //$host_link      = "\"../../?c=$cluster_url&h=$host_url&r=job&jr=$jobrange&js=$jobstart\"";
+
+                if ( $val["TYPE"] == "timestamp" || $always_timestamp[$metricname] )
+                {
+                        $textval        = date( "r", $val["VAL"] );
+                }
+                elseif ( $val["TYPE"] == "string" || $val["SLOPE"] == "zero" || $always_constant[$metricname] )
+                {
+                        $textval        = $val["VAL"] . " " . $val["UNITS"];
+                }
+                else
+                {
+                        $graphargs      = ($reports[$metricname]) ? "g=$metricname&" : "m=$metricname&";
+                        $graphargs      .= "c=$cluster_url&h=$host_url&l=$load_color&v=".$val['VAL']."&r=job&jr=$jobrange&js=$jobstart";
+
+                        if( $max > 0 )
+                        {
+                                $graphargs      .= "&x=$max&n=$min";
+                        }
+                }
+
+                $nr['ga']       = $graphargs;
 
                 $node_results[] = $nr;

trunk/web2/addons/job_monarch/js/monarch.js

@@ -877 +877 @@
                                 id:             'id'
                         },[
-                                {name: 'c', type: 'string', mapping: 'c'},
-                                {name: 'h', type: 'string', mapping: 'h'},
-                                {name: 'x', type: 'string', mapping: 'x'},
-                                {name: 'v', type: 'string', mapping: 'v'},
-                                {name: 'l', type: 'string', mapping: 'l'},
-                                {name: 'jr', type: 'string', mapping: 'jr'},
-                                {name: 'js', type: 'string', mapping: 'js'},
-                                {name: 'jid', type: 'string', mapping: 'jid'}
+                                {name: 'jid', type: 'string', mapping: 'jid'},
+                                {name: 'ga', type: 'string', mapping: 'ga'}
                         ]),
                         listeners:
@@ -929 +923 @@
                                 new Ext.XTemplate(
                                         '<tpl for=".">',
-                                        '<div class="rrd-float"><a href="../../graph.php?z=large&c={c}&h={h}&l={l}&v={v}\&x={x}&r=job&jr={jr}&js={js}" border="0" rel="lightbox[{jid}.{[globalWindowCount]}]"><img src="../../graph.php?z=small&c={c}&h={h}&l={l}&v={v}&x={x}&r=job&jr={jr}&js={js}" border="0"></a></div>',
+                                        '<div class="rrd-float"><a href="../../graph.php?z=large&{ga}" border="0" rel="lightbox[{jid}.{[globalWindowCount]}]"><img src="../../graph.php?z=small&{ga}" border="0"></a></div>',
                                         '</tpl>'
                                 )

trunk/web2/addons/job_monarch/libtoga.php

@@ -120 +120 @@
 // provide us with the correct metrics array
 //
-global $context, $clustername, $reports;
+global $context, $clustername, $reports, $always_timestamp, $always_constant;
 
 global $default_metric;