Changeset 3554

Show
Ignore:
Timestamp:
10/22/2009 03:19:44 PM (1 month ago)
Author:
brian
Message:

General fixes; update to metric_thumbnails script.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • GraphUsers/gratia/setup/setup.py

    r2794 r3554  
    3333              'gratia_web_dev = gratia.tools.gratia_web_dev:main', 
    3434              'gratia_web = gratia.tools.gratia_web:main', 
    35               'gridscan_download = gratia.tools.gridscan_download:main', 
    3635              'static_graphs = gratia.tools.static_graphs:main', 
    3736              'site_normalization = gratia.tools.site_normalization:main', 

  • GraphUsers/gratia/src/gratia/config/gratia_graphs.xml

    r3499 r3554  
    99  <import module="gratia.config" data_file="gratia_cumulative_queries.xml" /> 
    1010  <import module="gratia.config" data_file="gratia_status_queries.xml" /> 
     11  <import module="gratia.config" data_file="gratia_events_queries.xml" /> 
    1112  <import module="gratia.config" data_file="gratia_user_queries.xml"/> 
    1213  <import module="gratia.config" data_file="gratia_vo_queries.xml"/> 
    …… 
    8485  </class> 
    8586 
     87  <class type="Grapher" name="gratia_events_grapher"> 
     88    <attribute name="display_name"> Gratia Events Graphs </attribute> 
     89    <queryobj> GratiaEventsQueries </queryobj> 
     90  </class> 
     91 
    8692  <class type="Grapher" name="rsv_grapher"> 
    8793    <attribute name="display_name"> RSV Graphs </attribute> 

  • GraphUsers/gratia/src/gratia/config/text_queries.xml

    r3499 r3554  
    88  <import module="gratia.config" data_file="gratia_data_queries.xml" /> 
    99  <import module="gratia.config" data_file="gratia_status_queries.xml" /> 
     10  <import module="gratia.config" data_file="gratia_events_queries.xml" /> 
    1011  <import module="gratia.config" data_file="gratia_user_queries.xml" /> 
    1112  <import module="gratia.config" data_file="gratia_vo_queries.xml" /> 
    …… 
    2223    <attribute name="timeout">600</attribute> 
    2324    <queryobj> GratiaStatusQueries </queryobj> 
     25    <queryobj> GratiaEventsQueries </queryobj> 
    2426    <queryobj> GratiaDataQueries </queryobj> 
    2527    <queryobj> GratiaPieQueries </queryobj> 
    …… 
    5860  <class type="CsvGenerator" name="query_csv"> 
    5961    <queryobj> GratiaStatusQueries </queryobj> 
     62    <queryobj> GratiaEventsQueries </queryobj> 
    6063    <queryobj> GratiaDataQueries </queryobj> 
    6164    <queryobj> GratiaPieQueries </queryobj> 

  • GraphUsers/gratia/src/gratia/config/website-devel.xml

    r3499 r3554  
    4444    <mount location="/gratia_dev/cumulative_graphs" content="image/png"> <instance name="gratia_cumulative_grapher" /> </mount> 
    4545    <mount location="/gratia_dev/status_graphs" content="image/png"> <instance name="gratia_status_grapher" /> </mount> 
     46    <mount location="/gratia_dev/events_graphs" content="image/png"> <instance name="gratia_events_grapher" /> </mount> 
    4647    <mount location="/gratia_dev/gridscan_graphs" content="image/png"> <instance name="gridscan_grapher" /> </mount> 
    4748    <mount location="/gratia_dev/gip_graphs" content="image/png"> <instance name="gip_grapher" /> </mount> 

  • GraphUsers/gratia/src/gratia/config/website.xml

    r3499 r3554  
    4242    <mount location="/gratia/cumulative_graphs" content="image/png"> <instance name="gratia_cumulative_grapher" /> </mount> 
    4343    <mount location="/gratia/status_graphs" content="image/png"> <instance name="gratia_status_grapher" /> </mount> 
     44    <mount location="/gratia/events_graphs" content="image/png"> <instance name="gratia_events_grapher" /> </mount> 
    4445    <mount location="/gratia/gridscan_graphs" content="image/png"> <instance name="gridscan_grapher" /> </mount> 
    4546    <mount location="/gratia/gip_graphs" content="image/png"> <instance name="gip_grapher" /> </mount> 

  • GraphUsers/gratia/src/gratia/database/query_handler.py

    r3527 r3554  
    180180                    rname = str(r_dom.getElementsByTagName("Name")[0].\ 
    181181                        firstChild.data) 
     182                except: 
     183                    continue 
     184                rg_to_r[rgname] = rname 
     185                r_to_rg[rname] = rgname 
     186                try: 
    182187                    wlcgname = str(r_dom.getElementsByTagName("AccountingName")\ 
    183188                        [0].firstChild.data) 
    184189                except: 
    185190                    continue 
    186                 rg_to_r[rgname] = rname 
    187191                wlcg_to_r[wlcgname] = rname 
    188                 r_to_rg[rname] = rgname 
    189192                r_to_wlcg[rname] = wlcgname 
    190193        return r_to_rg, r_to_wlcg, rg_to_r, wlcg_to_r 
    …… 
    199202            return rg_to_r.get(pivot, pivot) 
    200203        if preference == 'resource_group': 
     204            print r_to_rg 
    201205            return r_to_rg.get(pivot, pivot) 
    202206        if preference == 'wlcg': 

  • GraphUsers/gratia/src/gratia/tools/atlas_statistics.py

    r2997 r3554  
    4444    now = now.strftime('%Y-%m-%d %H:%M') 
    4545    end = end.strftime('%Y-%m-%d %H:%M') 
    46     info = {'name': 'CERN', 'fromDate': now, 'toDate': end} 
     46    info = {'name': '', 'fromDate': now, 'toDate': end, 'activity': '0'} 
    4747    info = urllib.urlencode(info) 
    4848    url = dashboard_t0_url + '?' + info 

  • GraphUsers/gratia/src/gratia/tools/metric_thumbnails.py

    r2149 r3554  
    1414 
    1515cms_transfers = 'http://t2.unl.edu/phedex/xml/quantity_cumulative' 
     16datasvc_cms_transfers_prod = 'http://cmsweb.cern.ch/phedex/datasvc/json/prod/transferhistory' 
     17datasvc_cms_transfers_debug = 'http://cmsweb.cern.ch/phedex/datasvc/json/debug/transferhistory' 
    1618 
    1719CMS_owned = ['USCMS-FNAL', 'GLOW', 'Purdue', 'CIT_CMS_T2', 'Nebraska', 'MIT_CMS', 'UCSDT2', 'UFlorida'] 
    …… 
    6971    print "\tFrom US sites: %.3f PB" % (from_total/1000) 
    7072    print "\tTo US sites: %.3f PB" % (to_total/1000) 
     73 
     74def sum_phedex_transferhistory_pb(results): 
     75    results = eval(results, {'null': None}, {}) 
     76    results = results['phedex'] 
     77    total = 0 
     78    for link_data in results['link']: 
     79        for data in link_data['transfer']: 
     80            total += int(data['done_bytes']) 
     81    return total / 1000.**5 
     82 
     83def do_cms_stats(now): 
     84    next_year = now.year + int(now.month == 12) 
     85    next_month = (now.month % 12) + 1 
     86    end = datetime.datetime(next_year, next_month, 1) 
     87    info_dict = {'from': 'T%_US_%', 'binwidth': '86400'} 
     88    info_dict['starttime'] = now.strftime('%Y-%m-%d %H:%M:%S') 
     89    info_dict['endtime'] = end.strftime('%Y-%m-%d %H:%M:%S') 
     90    info = urllib.urlencode(info_dict) 
     91    # From US sites; prod 
     92    url = datasvc_cms_transfers_prod + '?' + info 
     93    results = urllib2.urlopen(url).read() 
     94    from_total = sum_phedex_transferhistory_pb(results) 
     95    # debug 
     96    url = datasvc_cms_transfers_debug + '?' + info 
     97    results = urllib2.urlopen(url).read() 
     98    from_total += sum_phedex_transferhistory_pb(results) 
     99 
     100    # To US sites; prod 
     101    info_dict['to'] = 'T%_US_%' 
     102    del info_dict['from'] 
     103    info = urllib.urlencode(info_dict) 
     104    url = datasvc_cms_transfers_prod + '?' + info 
     105    results = urllib2.urlopen(url).read() 
     106    to_total = sum_phedex_transferhistory_pb(results) 
     107    # debug 
     108    url = datasvc_cms_transfers_debug + '?' + info 
     109    results = urllib2.urlopen(url).read() 
     110    to_total = sum_phedex_transferhistory_pb(results) 
     111 
     112    print "\tFrom US sites: %.3f PB" % from_total 
     113    print "\tTo US sites: %.3f PB" % to_total 
     114 
    71115 
    72116def dojobstats(now): 

  • GraphUsers/gratia/src/gratia/tools/rsv_calc.py

    r2886 r3554  
    120120        print "insert data" 
    121121        for site in sites: 
     122            print site, sites[site] 
    122123            insert_data(curs, name=site, resource_type='site', 
    123124                time_length=interval, starttime=convert_to_datetime(starttime), 

  • GraphUsers/gratia/src/gratia/web/__init__.py

    r3313 r3554  
    552552 
    553553    def fetch_gridscan(self, site): 
    554         doc = urllib2.urlopen('http://scan.grid.iu.edu/cgi-bin/show_results' \ 
    555             '?grid=1') 
     554        return [] 
     555        #doc = urllib2.urlopen('http://scan.grid.iu.edu/cgi-bin/show_results' \ 
     556        #    '?grid=1') 
    556557        in_row = False 
    557558        in_font = False