Changeset 409 for trunk/jobmond

Timestamp:

07/06/07 14:16:44 (16 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/version.php:

• SVN version

web/addons/job_monarch/libtoga.php:

• need $start in my graph.php

jobmond/jobmond.py:

• added number of running and queued jobs metric reporting

web/addons/job_monarch/graph.php:

• added 'job_report' graph, shows running and queued jobs

web/addons/job_monarch/overview.php:

• included IMG to job_report graph

web/addons/job_monarch/index.php:

• added range menu
• fixed metric_menu selection now properly instantly refreshes graphs

web/addons/job_monarch/templates/overview.tpl:

• added job_report graph

File:

• trunk/jobmond/jobmond.py (modified) (5 diffs)

trunk/jobmond/jobmond.py

@@ -327 +327 @@
                 return incompatible
 
-        def multicastGmetric( self, metricname, metricval, valtype='string' ):
+        def multicastGmetric( self, metricname, metricval, valtype='string', units='' ):
 
                 """Call gmetric binary and multicast"""
@@ -348 +348 @@
                         gm = Gmetric( GMETRIC_TARGET_HOST, GMETRIC_TARGET_PORT )
 
-                        gm.send( str( metricname ), str( metricval ), str( self.dmax ) )
+                        gm.send( str( metricname ), str( metricval ), str( self.dmax ), units )
 
                 else:
@@ -359 +359 @@
 
                         cmd = cmd + ' -n' + str( metricname )+ ' -v"' + str( metricval )+ '" -t' + str( valtype ) + ' -d' + str( self.dmax )
+
+                        if len( units ) > 0:
+
+                                cmd = cmd + ' -u"' + units + '"'
 
                         debug_msg( 10, printTime() + ' ' + cmd )
@@ -776 +780 @@
                 self.dp.multicastGmetric( 'MONARCH-HEARTBEAT', str( int( int( self.cur_time ) + int( self.timeoffset ) ) ) )
 
+                running_jobs    = 0
+                queued_jobs     = 0
+
+                for jobid, jobattrs in self.jobs.items():
+
+                        if jobattrs[ 'status' ] == 'Q':
+
+                                queued_jobs += 1
+
+                        elif jobattrs[ 'status' ] == 'R':
+
+                                running_jobs += 1
+
+                self.dp.multicastGmetric( 'MONARCH-RJ', str( running_jobs ), 'uint32', 'jobs' )
+                self.dp.multicastGmetric( 'MONARCH-QJ', str( queued_jobs ), 'uint32', 'jobs' )
+
                 # Now let's spread the knowledge
                 #
@@ -922 +942 @@
                         return 'udp'
 
-        def send( self, name, value, dmax ):
-
-                msg             = self.makexdr( name, value, self.type, self.unitstr, self.slopestr, self.tmax, dmax )
+        def send( self, name, value, dmax, units = '' ):
+
+                if len( units ) == 0:
+                        units           = self.unitrs
+
+                msg             = self.makexdr( name, value, self.type, units, self.slopestr, self.tmax, dmax )
 
                 return self.socket.sendto( msg, self.hostport )