Changeset 571 for trunk/web2/addons/job_monarch

Timestamp:

01/26/09 16:03:50 (15 years ago)

Author:

ramonb

Message:

job_monarch/css/styles.css:

• changed padding for rrds

job_monarch/js/jobgrid.js:

• parse more rrds args

job_monarch/jobstore.php:

• also supply jobrange, start and load

Location:

trunk/web2/addons/job_monarch

Files:

• css/styles.css (modified) (1 diff)
• jobstore.php (modified) (3 diffs)
• js/jobgrid.js (modified) (5 diffs)

trunk/web2/addons/job_monarch/css/styles.css

@@ -39 +39 @@
 { 
    float: left; 
-   margin: 4px; 
+   margin: 2px; 
    margin-right: 0; 
-   padding: 5px;
+   padding: 2px;
 } 

trunk/web2/addons/job_monarch/jobstore.php

@@ -35 +35 @@
 }
 
-global $c, $clustername, $cluster;
+global $c, $clustername, $cluster, $metrics;
 
 // Grid Paging stuff
@@ -422 +422 @@
 function getNodes()
 {
-        global $jobs, $jobids, $clustername;
+        global $jobs, $jobids, $clustername, $metrics;
 
         $display_nodes  = array();
@@ -438 +438 @@
                                 if( !in_array( $jobnode, $display_nodes) )
                                 {
-                                        $display_nodes[]        = $jobnode;
+                                        $display_nodes[$jobid]  = $jobnode;
                                 }
                         }
                 }
         }
-        //print_r( $display_nodes );
+
         $node_results   = array();
         $result_count   = count( $display_nodes );
-        foreach( $display_nodes as $dnode )
-        {
-
+        foreach( $display_nodes as $jobid => $host )
+        {
                 $nr             = array();
                 $nr['c']        = $clustername;
-                $nr['h']        = $dnode;
+                $nr['h']        = $host ;
                 $nr['x']        = '5';
                 $nr['v']        = '0';
+
+                $cpus           = $metrics[$host]["cpu_num"]["VAL"];
+
+                if ( !$cpus )
+                {
+                        $cpus           = 1;
+                }
+
+                $load_one       = $metrics[$host]["load_one"]["VAL"];
+                $load           = ((float) $load_one) / $cpus;
+                $load_color     = load_color($load);
+
+                $nr['l']        = $load_color;
+
+                $job_runtime    = (int) $jobs[$jobid]['reported'] - (int) $jobs[$jobid]['start_timestamp'];
+                $job_window     = intval($job_runtime * 1.2);
+
+                $nr['jr']       = -$job_window;
+                $nr['js']       = (int) $jobs[$jobid]['start_timestamp'];
 
                 $node_results[] = $nr;

trunk/web2/addons/job_monarch/js/jobgrid.js

@@ -595 +595 @@
         {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: 'x', type: 'string', mapping: 'x'}
+        {name: 'l', type: 'string', mapping: 'l'},
+        {name: 'jr', type: 'string', mapping: 'jr'},
+        {name: 'js', type: 'string', mapping: 'js'}
       ]),
       listeners: {
@@ -634 +637 @@
         tpl: new Ext.XTemplate(
             '<tpl for=".">',
-            '<div class="rrd-float"><img src="../../graph.php?z=small&h={h}&x={x}&v={v}&c={c}" border="0"></div>',
+            '<div class="rrd-float"><img src="../../graph.php?z=small&c={c}&h={h}&l={l}&v={v}&x={x}&r=job&jr={jr}&js={js}" border="0"></div>',
             '</tpl>'
         )
@@ -641 +644 @@
     var images = new Ext.Panel({
         id:'images',
-        title:'My Images',
+        //title:'My Images',
         region:'center',
         bodyStyle: 'background: transparent',
-        margins: '5 5 5 0',
+        //margins: '2 2 2 0',
         layout:'fit',
         items: GraphView
@@ -655 +658 @@
                         height      : 300,
                         closeAction :'hide',
+                        title:  'Node graph details',
                         layout: 'fit',
                         tbar:   new Ext.form.ComboBox({
@@ -668 +672 @@
                                         selectOnFocus:true,
                                         xtype: 'combo',
-                                        width:190
+                                        width:190,
+                                        listeners: {
+                                                select: function(combo, record, index){
+                                                        var metric = record.data.name;
+                                                        // doe iets
+                                                }
+                                        }
+                                        
                                 }),
                         items:  [ images ]