Changeset 728


Ignore:
Timestamp:
03/22/13 13:49:41 (9 years ago)
Author:
ramonb
Message:
  • changed seperator to _
  • changed job-id-incr to job_incr_id
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/0.4/jobmond/jobmond.py

    r724 r728  
    824824        global BATCH_API
    825825
    826         self.dp.multicastGmetric( 'zplugin-monarch-heartbeat', str( int( int( self.cur_time ) + int( self.timeoffset ) ) ) )
     826        self.dp.multicastGmetric( 'zplugin_monarch_heartbeat', str( int( int( self.cur_time ) + int( self.timeoffset ) ) ) )
    827827
    828828        running_jobs = 0
     
    843843        # Report running/queued jobs as seperate metric for a nice RRD graph
    844844        #
    845         self.dp.multicastGmetric( 'zplugin-monarch-rj', str( running_jobs ), 'uint32', 'jobs' )
    846         self.dp.multicastGmetric( 'zplugin-monarch-qj', str( queued_jobs ), 'uint32', 'jobs' )
     845        self.dp.multicastGmetric( 'zplugin_monarch_rj', str( running_jobs ), 'uint32', 'jobs' )
     846        self.dp.multicastGmetric( 'zplugin_monarch_qj', str( queued_jobs ), 'uint32', 'jobs' )
    847847
    848848        # Report down/offline nodes in batch (PBS only ATM)
     
    852852            domain        = fqdn_parts( socket.getfqdn() )[1]
    853853
    854             downed_nodes    = list()
    855             offline_nodes    = list()
     854            downed_nodes  = list()
     855            offline_nodes = list()
    856856       
    857857            l        = ['state']
     
    867867                    offline_nodes.append( name )
    868868
    869             downnodeslist        = do_nodelist( downed_nodes )
    870             offlinenodeslist    = do_nodelist( offline_nodes )
     869            downnodeslist    = do_nodelist( downed_nodes )
     870            offlinenodeslist = do_nodelist( offline_nodes )
    871871
    872872            down_str    = 'nodes=%s domain=%s reported=%s' %( string.join( downnodeslist, ';' ), domain, str( int( int( self.cur_time ) + int( self.timeoffset ) ) ) )
    873873            offl_str    = 'nodes=%s domain=%s reported=%s' %( string.join( offlinenodeslist, ';' ), domain, str( int( int( self.cur_time ) + int( self.timeoffset ) ) ) )
    874             self.dp.multicastGmetric( 'zplugin-monarch-down'   , down_str )
    875             self.dp.multicastGmetric( 'zplugin-monarch-offline', offl_str )
     874            self.dp.multicastGmetric( 'zplugin_monarch_down'   , down_str )
     875            self.dp.multicastGmetric( 'zplugin_monarch_offline', offl_str )
    876876
    877877        # Now let's spread the knowledge
     
    889889            for val in gmetric_val:
    890890
    891                 self.dp.multicastGmetric( 'zplugin-monarch-job-' + jobid + '-' + str(metric_increment), val )
     891                metric_name = 'zplugin_monarch_job_%s_%s' %( str(metric_increment) , str( jobid ) )
     892                self.dp.multicastGmetric( metric_name, val )
    892893
    893894                # Increase follow number if this jobinfo is split up amongst more than 1 gmetric
Note: See TracChangeset for help on using the changeset viewer.