Changeset 858 for branches/1.0
- Timestamp:
- 05/14/13 19:52:38 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.0/jobarchived/jobarchived.py
r857 r858 48 48 def processArgs( args ): 49 49 50 SHORT_L 50 SHORT_L = 'p:hvc:' 51 51 LONG_L = [ 'help', 'config=', 'pidfile=', 'version' ] 52 52 … … 55 55 global PIDFILE 56 56 57 PIDFILE 57 PIDFILE = None 58 58 59 59 try: … … 136 136 global JOB_SQL_DBASE, DAEMONIZE, RRDTOOL, JOB_TIMEOUT, MODRRDTOOL, JOB_SQL_PASSWORD, JOB_SQL_USER 137 137 138 ARCHIVE_PATH = cfg.get( 'DEFAULT', 'ARCHIVE_PATH' )139 140 ARCHIVE_HOURS_PER_RRD 141 142 DEBUG_LEVEL = cfg.getint( 'DEFAULT', 'DEBUG_LEVEL' )143 144 USE_SYSLOG = cfg.getboolean( 'DEFAULT', 'USE_SYSLOG' )145 146 SYSLOG_LEVEL = cfg.getint( 'DEFAULT', 'SYSLOG_LEVEL' )147 148 MODRRDTOOL = False138 ARCHIVE_PATH = cfg.get( 'DEFAULT', 'ARCHIVE_PATH' ) 139 140 ARCHIVE_HOURS_PER_RRD = cfg.getint( 'DEFAULT', 'ARCHIVE_HOURS_PER_RRD' ) 141 142 DEBUG_LEVEL = cfg.getint( 'DEFAULT', 'DEBUG_LEVEL' ) 143 144 USE_SYSLOG = cfg.getboolean( 'DEFAULT', 'USE_SYSLOG' ) 145 146 SYSLOG_LEVEL = cfg.getint( 'DEFAULT', 'SYSLOG_LEVEL' ) 147 148 MODRRDTOOL = False 149 149 150 150 try: … … 171 171 sys.exit( 1 ) 172 172 173 GMETAD_CONF = cfg.get( 'DEFAULT', 'GMETAD_CONF' )174 175 ARCHIVE_XMLSOURCE = cfg.get( 'DEFAULT', 'ARCHIVE_XMLSOURCE' )176 177 ARCHIVE_DATASOURCES = getlist( cfg.get( 'DEFAULT', 'ARCHIVE_DATASOURCES' ) )178 179 ARCHIVE_EXCLUDE_METRICS 180 181 JOB_SQL_DBASE = cfg.get( 'DEFAULT', 'JOB_SQL_DBASE' )182 JOB_SQL_USER = cfg.get( 'DEFAULT', 'JOB_SQL_USER' )173 GMETAD_CONF = cfg.get( 'DEFAULT', 'GMETAD_CONF' ) 174 175 ARCHIVE_XMLSOURCE = cfg.get( 'DEFAULT', 'ARCHIVE_XMLSOURCE' ) 176 177 ARCHIVE_DATASOURCES = getlist( cfg.get( 'DEFAULT', 'ARCHIVE_DATASOURCES' ) ) 178 179 ARCHIVE_EXCLUDE_METRICS = getlist( cfg.get( 'DEFAULT', 'ARCHIVE_EXCLUDE_METRICS' ) ) 180 181 JOB_SQL_DBASE = cfg.get( 'DEFAULT', 'JOB_SQL_DBASE' ) 182 JOB_SQL_USER = cfg.get( 'DEFAULT', 'JOB_SQL_USER' ) 183 183 JOB_SQL_PASSWORD = cfg.get( 'DEFAULT', 'JOB_SQL_PASSWORD' ) 184 184 185 JOB_TIMEOUT = cfg.getint( 'DEFAULT', 'JOB_TIMEOUT' ) 186 187 DAEMONIZE = cfg.getboolean( 'DEFAULT', 'DAEMONIZE' ) 188 185 JOB_TIMEOUT = cfg.getint( 'DEFAULT', 'JOB_TIMEOUT' ) 186 187 DAEMONIZE = cfg.getboolean( 'DEFAULT', 'DAEMONIZE' ) 189 188 190 189 return True … … 1183 1182 1184 1183 self.gridName = str( attrs.get( 'NAME', "" ) ) 1185 self.time = str( attrs.get( 'LOCALTIME', "" ) )1184 self.time = str( attrs.get( 'LOCALTIME', "" ) ) 1186 1185 1187 1186 debug_msg( 10, '`-Grid found: %s' %( self.gridName ) ) … … 1276 1275 """Setup a connection and file object to Ganglia's XML""" 1277 1276 1278 s = None1279 fd = None1277 s = None 1278 fd = None 1280 1279 data = None 1281 1280 slot = None … … 1305 1304 """Setup connection to XML source""" 1306 1305 1307 self.update_now 1306 self.update_now = True 1308 1307 1309 1308 self.slot.acquire() 1310 1309 1311 self.data = None1310 self.data = None 1312 1311 1313 1312 for res in socket.getaddrinfo( self.host, self.port, socket.AF_UNSPEC, socket.SOCK_STREAM ): … … 1655 1654 """Class for handling RRD activity""" 1656 1655 1657 myMetrics = { }1658 lastStored = { }1656 myMetrics = { } 1657 lastStored = { } 1659 1658 timeserials = { } 1660 1659 slot = None … … 1665 1664 global MODRRDTOOL 1666 1665 1667 self.block 1668 self.cluster 1669 self.config 1666 self.block = 0 1667 self.cluster = cluster 1668 self.config = config 1670 1669 self.slot = threading.Lock() 1671 1670 … … 1699 1698 1700 1699 host_dir = cluster_dir + '/' + host 1701 dirlist 1700 dirlist = os.listdir( host_dir ) 1702 1701 1703 1702 for dir in dirlist: … … 1755 1754 self.myMetrics[ host ][ metric['name'] ] = [ ] 1756 1755 else: 1757 self.myMetrics[ host ] = { }1758 self.myMetrics[ host ][ metric['name'] ] 1756 self.myMetrics[ host ] = { } 1757 self.myMetrics[ host ][ metric['name'] ] = [ ] 1759 1758 1760 1759 # Push new metric onto stack … … 1931 1930 """Make a RRD location/path and filename""" 1932 1931 1933 rrd_dir 1934 rrd_file 1932 rrd_dir = '%s/%s/%s/%s' %( check_dir(ARCHIVE_PATH), self.cluster, host, timeserial ) 1933 rrd_file = '%s/%s.rrd' %( rrd_dir, metricname ) 1935 1934 1936 1935 return rrd_dir, rrd_file … … 1986 1985 if metric['name'] == metricname: 1987 1986 1988 period 1989 1990 archive_secs 1987 period = self.determinePeriod( host, metric['time'] ) 1988 1989 archive_secs = ARCHIVE_HOURS_PER_RRD * (60 * 60) 1991 1990 1992 1991 if (int( metric['time'] ) - int( period ) ) > archive_secs: … … 2039 2038 heartbeat = 8 * int( interval ) 2040 2039 2041 params 2040 params = [ ] 2042 2041 2043 2042 params.append( '--step' ) … … 2062 2061 debug_msg( 9, 'rrdupdate: using timeserial %s for %s/%s' %( timeserial, host, metricname ) ) 2063 2062 2064 rrd_dir, rrd_file 2065 2066 update_list 2063 rrd_dir, rrd_file = self.makeRrdPath( host, metricname, timeserial ) 2064 2065 update_list = self.makeUpdateList( host, metriclist ) 2067 2066 2068 2067 if len( update_list ) > 0:
Note: See TracChangeset
for help on using the changeset viewer.