Additional packaging; ready to be tested on SL4.

git-svn-id: svn://t2.unl.edu/brian/GraphUsers/gratia@1980 1fda6f16-4416-0410-bfd6-867a04880151

config/DBParam.xml.rpmnew

+<graphtool-config>
+
+  <import module="graphtool.database.connection_manager"> ConnectionManager </import>
+
+  <class name="GratiaConnMan" type="ConnectionManager">
+    <attribute name="default"> gratia </attribute>
+    
+    <connection name="gratia">
+      <attribute name="Interface"> MySQL </attribute>
+      <attribute name="Database"> gratia </attribute>
+      <attribute name="Host"> gratia-db01.fnal.gov </attribute>
+      <attribute name="AuthDBUsername"> ****** </attribute>
+      <attribute name="AuthDBPassword"> ****** </attribute>
+      <attribute name="Port"> 3320 </attribute>
+    </connection>
+
+    <connection name="gratia-itb">
+      <attribute name="Interface"> MySQL </attribute>
+      <attribute name="Database"> gratia_itb </attribute>
+      <attribute name="Host"> gratia-db01.fnal.gov </attribute>
+      <attribute name="AuthDBUsername"> ****** </attribute>
+      <attribute name="AuthDBPassword"> ****** </attribute>
+      <attribute name="Port"> 3320 </attribute>
+    </connection>
+
+  </class>
+
+  <class name="GIPConnMan" type="ConnectionManager">
+    <attribute name="default"> gip </attribute>
+    
+    <connection name="gip"> 
+      <attribute name="Interface"> MySQL </attribute>
+      <attribute name="Database"> gip </attribute>
+      <attribute name="Host"> osg-test2.unl.edu </attribute>
+      <attribute name="Port">49152</attribute>
+      <attribute name="AuthDBUsername"> ****** </attribute>
+      <attribute name="AuthDBPassword"> ****** </attribute>
+    </connection>
+
+  </class>
+
+  <class name="RSVConnMan" type="ConnectionManager">
+    <attribute name="default"> rsv </attribute>
+    
+    <connection name="rsv"> 
+      <attribute name="Interface"> MySQL </attribute>
+      <attribute name="Database"> gratia </attribute>
+      <attribute name="Host"> sonofsam.uits.indiana.edu </attribute>
+      <attribute name="Port">49152</attribute>
+      <attribute name="AuthDBUsername"> ****** </attribute>
+      <attribute name="AuthDBPassword"> ****** </attribute>
+    </connection>
+
+  </class>
+
+  <class name="RegistrationDB" type="ConnectionManager">
+
+    <attribute name="default"> regdb </attribute>
+
+    <connection name="regdb">
+      <attribute name="Interface"> MySQL </attribute>
+      <attribute name="Database"> registration </attribute>
+      <attribute name="AuthDBUsername"> ****** </attribute>
+      <attribute name="AuthDBPassword"> ****** </attribute>
+    </connection>
+
+  </class>
+
+</graphtool-config>

config/gip_schema

+create database `gip`;
+
+CREATE TABLE `ce_info` (
+  `time` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `runningJobs` int(11) default NULL,
+  `totalCpus` int(11) default NULL,
+  `lrmsType` varchar(10) default NULL,
+  `lrmsVersion` varchar(32) default NULL,
+  `freeCpus` int(11) default NULL,
+  `hostName` varchar(63) default NULL,
+  `waitingJobs` int(11) default NULL,
+  KEY `time_key` (`time`),
+  KEY `host_key` (`hostName`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+create index time_key on ce_info(time);
+create index host_key on ce_info(hostName);
+
+CREATE TABLE `compactor` (
+  `size` varchar(32) default NULL,
+  `last` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+CREATE TABLE `cpu_score` (
+  `cpu` varchar(255) default NULL,
+  `si2k` int(11) default NULL,
+  `si2k6` int(11) default NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `se_info` (
+  `date` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `se` varchar(255) default NULL,
+  `site` varchar(255) default NULL,
+  `total` bigint(20) default NULL,
+  `free` bigint(20) default NULL,
+  UNIQUE KEY `se_info_idx` (`date`,`se`),
+  KEY `se_info_date` (`date`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+create unique index se_info_idx on se_info(date, se);
+create index se_info_date on se_info(date);
+
+CREATE TABLE `site_info` (
+  `sitename` varchar(255) default NULL,
+  `cename` varchar(255) default NULL,
+  UNIQUE KEY `site_pair` (`sitename`,`cename`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+create unique index site_pair on site_info(sitename, cename);
+
+CREATE TABLE `subcluster_score` (
+  `timestamp` datetime default NULL,
+  `site` varchar(255) default NULL,
+  `cluster` varchar(255) default NULL,
+  `subcluster` varchar(255) default NULL,
+  `ncores` int(11) default NULL,
+  `si2k_score` int(11) default NULL,
+  `ownership` varchar(255) default NULL,
+  `proc` varchar(255) default NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `vo_info` (
+  `time` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `runningJobs` int(11) default NULL,
+  `totalCpus` int(11) default NULL,
+  `freeJobSlots` int(11) default NULL,
+  `maxTotalJobs` int(11) default NULL,
+  `totalJobs` int(11) default NULL,
+  `status` varchar(32) default NULL,
+  `lrmsType` varchar(10) default NULL,
+  `lrmsVersion` varchar(32) default NULL,
+  `vo` varchar(32) default NULL,
+  `assignedJobSlots` int(11) default NULL,
+  `freeCpus` int(11) default NULL,
+  `waitingJobs` int(11) default NULL,
+  `maxRunningJobs` int(11) default NULL,
+  `hostName` varchar(64) default NULL,
+  `queue` varchar(32) default NULL,
+  KEY `host_idx` (`hostName`),
+  KEY `time_idx` (`time`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+create index host_idx on vo_info(hostName, time);
+

config/gratia_data.cron

+01 0-23/8 * * *   root static_graphs
+01-59/10 * * * *  root gip_record
+01 0-23/8 * * *   root gratia_voms_query
+01 0 * * *        root gip_subcluster_record
+01 01 1,10,20 * * root wlcg_pledge_email
+01 04 * * *       root ligo_summary
+03 04 * * *       root cms_summary

config/registration_schema

+
+create database registration;
+
+CREATE TABLE `vo_to_rs` (
+  `VO Name` longtext character set utf8,
+  `Site Name` varchar(255) character set utf8 default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+

setup.py

@@ -50,7 +50,11 @@ setup(name="OSG-Gratia-Viewer",
       },
 
       data_files=[('/etc/init.d', ['config/GratiaWeb']),
-          ('/etc/', ['config/wlcg_email.conf.rpmnew']),
+          ('/etc/', ['config/wlcg_email.conf.rpmnew',
+                     'config/DBParam.xml.rpmnew']),
+          ('/usr/share/GratiaWeb/', ['config/gip_schema',
+                                     'config/registration_schema']),
+          ('/etc/cron.d/', ['config/gratia_data.cron']),
       ],
 
       namespace_packages = ['gratia']

src/gratia/tools/wlcg_pledge_email.py

@@ -33,12 +33,12 @@ def loadConfig():
     cp = ConfigParser.ConfigParser()
 
     fps = []
-
     try:
         from pkg_resources import resource_stream
         fps.append(resource_stream("gratia.config", "wlcg_email.conf"))
     except:
         pass
+    fps.append('/etc/wlcg_email.conf')
 
     parser = optparse.OptionParser()
     parser.add_option("-c", "--config", dest="config", help="Comma-separated "\