rda-python-metrics 1.0.32__tar.gz → 1.0.46__tar.gz

{rda_python_metrics-1.0.32/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.32
+Version: 1.0.46
 Summary: RDA Python Package to gather and view data usage metrics
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-metrics
@@ -17,6 +17,7 @@ Requires-Dist: geoip2
 Requires-Dist: ipinfo
 Requires-Dist: httplib2
 Requires-Dist: dnspython
+Requires-Dist: unidecode
 Dynamic: license-file
 
 RDA Python Package to gather and view data usage metrics.

{rda_python_metrics-1.0.32 → rda_python_metrics-1.0.46}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_metrics"
-version = "1.0.32"
+version = "1.0.46"
 authors = [
   { name="Zaihua Ji",  email="zji@ucar.edu" },
 ]
@@ -25,7 +25,8 @@ dependencies = [
   "geoip2",
   "ipinfo",
   "httplib2",
-  "dnspython"
+  "dnspython",
+  "unidecode"
 ]
 
 [tool.pytest.ini_options]
@@ -38,13 +39,14 @@ pythonpath = [
 
 [project.scripts]
 "logarch.py" = "rda_python_metrics.logarch:main"
-"fillawsusage" = "rda_python_metrics.fillaswusage:main"
+"fillawsusage" = "rda_python_metrics.fillawsusage:main"
 "fillcdgusage" = "rda_python_metrics.fillcdgusage:main"
 "fillcodusage" = "rda_python_metrics.fillcodusage:main"
 "fillcountry" = "rda_python_metrics.fillcountry:main"
 "fillendtime" = "rda_python_metrics.fillendtime:main"
 "fillglobususage" = "rda_python_metrics.fillglobususage:main"
 "fillgdexusage" = "rda_python_metrics.fillgdexusage:main"
+"fillzenodousage" = "rda_python_metrics.fillzenodousage:main"
 "fillipinfo" = "rda_python_metrics.fillipinfo:main"
 "filloneorder" = "rda_python_metrics.filloneorder:main"
 "fillosdfusage" = "rda_python_metrics.fillosdfusage:main"
@@ -54,9 +56,11 @@ pythonpath = [
 "pgperson" = "rda_python_metrics.pgperson:main"
 "pgusername" = "rda_python_metrics.pgusername:main"
 "viewallusage" = "rda_python_metrics.viewallusage:main"
+"viewawsusage" = "rda_python_metrics.viewawsusage:main"
 "viewcheckusage" = "rda_python_metrics.viewcheckusage:main"
 "viewcodusage" = "rda_python_metrics.viewcodusage:main"
 "viewordusage" = "rda_python_metrics.viewordusage:main"
+"viewosdfusage" = "rda_python_metrics.viewosdfusage:main"
 "viewrqstusage" = "rda_python_metrics.viewrqstusage:main"
 "viewtdsusage" = "rda_python_metrics.viewtdsusage:main"
 "viewwebfile" = "rda_python_metrics.viewwebfile:main"

rda_python_metrics-1.0.46/src/rda_python_metrics/fillawsusage.py

@@ -0,0 +1,210 @@
+#!/usr/bin/env python3
+#
+###############################################################################
+#
+#     Title : fillawsusage
+#    Author : Zaihua Ji,  zji@ucar.edu
+#      Date : 03/11/2022
+#             2025-03-26 transferred to package rda_python_metrics from
+#             https://github.com/NCAR/rda-database.git
+#   Purpose : python program to retrieve info from AWS logs 
+#             and fill table wusages in PgSQL database dssdb.
+# 
+#    Github : https://github.com/NCAR/rda-pythn-metrics.git
+#
+###############################################################################
+#
+import sys
+import re
+import glob
+from os import path as op
+from rda_python_common import PgLOG
+from rda_python_common import PgUtil
+from rda_python_common import PgFile
+from rda_python_common import PgDBI
+from . import PgIPInfo
+
+USAGE = {
+   'PGTBL'  : "awsusage",
+   'AWSDIR' : PgLOG.PGLOG["TRANSFER"] + "/AWSera5log",
+   'AWSLOG' : "{}/{}-00-00-00-*",
+   'PFMT'   : "YYYY/MM/DD"
+}
+
+DSIDS = {'nsf-ncar-era5' : 'd633000'}
+
+#
+# main function to run this program
+#
+def main():
+
+   params = []  # array of input values
+   argv = sys.argv[1:]
+   option = None
+
+   for arg in argv:
+      ms = re.match(r'^-(b|d|p|N)$', arg)
+      if ms:
+         opt = ms.group(1)
+         if opt == 'b':
+            PgLOG.PGLOG['BCKGRND'] = 1
+         elif option:
+            PgLOG.pglog("{}: Option -{} is present already".format(arg, option), PgLOG.LGWNEX)
+         else:
+            option = opt
+      elif re.match(r'^-', arg):
+         PgLOG.pglog(arg + ": Invalid Option", PgLOG.LGWNEX)
+      elif option:
+         params.append(arg)
+      else:
+         PgLOG.pglog(arg + ": Invalid Parameter", PgLOG.LGWNEX)
+   
+   if not (option and params): PgLOG.show_usage('fillawsusage')
+
+   PgDBI.dssdb_dbname()
+   cmdstr = "fillawsusage {}".format(' '.join(argv))
+   PgLOG.cmdlog(cmdstr)
+   PgFile.change_local_directory(USAGE['AWSDIR'])
+   filenames = get_log_file_names(option, params)
+   if filenames:
+      fill_aws_usages(filenames)
+   else:
+      PgLOG.pglog("No log file found for given command: " + cmdstr, PgLOG.LOGWRN)
+
+   PgLOG.pglog(None, PgLOG.LOGWRN)
+   sys.exit(0)
+
+#
+# get the log file dates 
+#
+def get_log_file_names(option, params):
+
+   filenames = {}
+   if option == 'd':
+      for dt in params:
+         pdate = PgUtil.format_date(dt)
+         pd = PgUtil.format_date(pdate, USAGE['PFMT'])
+         fname = USAGE['AWSLOG'].format(pd, pdate)
+         fnames = glob.glob(fname)
+         if fnames: filenames[pdate] = sorted(fnames)
+   else:
+      if option == 'N':
+         edate = PgUtil.curdate()
+         pdate = PgUtil.adddate(edate, 0, 0, -int(params[0]))
+      else:
+         pdate = PgUtil.format_date(params[0])
+         if len(params) > 1:
+            edate = PgUtil.adddate(PgUtil.format_date(params[1]), 0, 0, 1)
+         else:
+            edate = PgUtil.curdate()
+      while pdate < edate:
+         pd = PgUtil.format_date(pdate, USAGE['PFMT'])
+         fname = USAGE['AWSLOG'].format(pd, pdate)
+         fnames = glob.glob(fname)
+         if fnames: filenames[pdate] = sorted(fnames)
+         pdate = PgUtil.adddate(pdate, 0, 0, 1)
+
+   return filenames
+
+#
+# Fill AWS usages into table dssdb.awsusage of DSS PgSQL database from aws access logs
+#
+def fill_aws_usages(filenames):
+
+   year = cntall = addall = 0
+   for pdate in filenames:
+      fnames = filenames[pdate]
+      fcnt = len(fnames)
+      PgLOG.pglog("{}: Gathering AWS usage info from {} log files at {}".format(pdate, fcnt, PgLOG.current_datetime()), PgLOG.LOGWRN)
+      records = {}
+      cntadd = entcnt = 0
+      for logfile in fnames:
+         if not op.isfile(logfile):
+            PgLOG.pglog("{}: Not exists for Gathering AWS usage".format(logfile), PgLOG.LOGWRN)
+            continue
+         aws = PgFile.open_local_file(logfile)
+         if not aws: continue
+         while True:
+            line = aws.readline()
+            if not line: break
+            entcnt += 1
+            if entcnt%20000 == 0:
+               dcnt = len(records)
+               PgLOG.pglog("{}: {}/{} AWS log entries processed/records to add".format(pdate, entcnt, dcnt), PgLOG.WARNLG)
+   
+            ms = re.match(r'^\w+ ([\w-]+) \[(\S+).*\] ([\d\.]+) .+ REST\.GET\.OBJECT \S+ "GET.+" \d+ - (\d+) \d+ .* ".+" "(.+)" ', line)
+            if not ms: continue
+            values = list(ms.groups())
+            if values[0] not in DSIDS: continue
+            dsid = DSIDS[values[0]]
+            size = int(values[3])
+            ip = values[2]
+            engine = values[4]
+            moff = engine.find('/')
+            if moff > 0:
+               if moff > 20: moff = 20
+               method = engine[0:moff].upper()
+            else:
+               method = "AWS"
+            key = "{}:{}:{}".format(ip, dsid, method)
+            if key in records:
+               records[key]['size'] += size
+               records[key]['fcount'] += 1
+            else:
+               (year, quarter, date, time) = get_record_date_time(values[1])
+               iprec =  PgIPInfo.get_missing_ipinfo(ip)
+               if not iprec: continue
+               records[key] = {'ip' : ip, 'dsid' : dsid, 'date' : date, 'time' : time, 'quarter' : quarter,
+                               'size' : size, 'fcount' : 1, 'method' : method, 'engine' : engine,
+                               'org_type' : iprec['org_type'], 'country' : iprec['country'],
+                               'region' : iprec['region'], 'email' : iprec['email']}
+         aws.close()
+      if records: cntadd = add_usage_records(records, year)
+      PgLOG.pglog("{}: {} AWS usage records added for {} entries at {}".format(pdate, cntadd, entcnt, PgLOG.current_datetime()), PgLOG.LOGWRN)
+      cntall += entcnt
+      if cntadd:
+         addall += cntadd
+         if addall > cntadd:
+            PgLOG.pglog("{} AWS usage records added for {} entries at {}".format(addall, cntall, PgLOG.current_datetime()), PgLOG.LOGWRN)
+
+def get_record_date_time(ctime):
+   
+   ms = re.search(r'^(\d+)/(\w+)/(\d+):(\d+:\d+:\d+)$', ctime)
+   if ms:
+      d = int(ms.group(1))
+      m = PgUtil.get_month(ms.group(2))
+      y = ms.group(3)
+      t = ms.group(4)
+      q = 1 + int((m-1)/3)
+      return (y, q, "{}-{:02}-{:02}".format(y, m, d), t)
+   else:
+      PgLOG.pglog(ctime + ": Invalid date/time format", PgLOG.LGEREX)
+
+def add_usage_records(records, year):
+
+   cnt = 0
+   for key in records:
+      record = records[key]
+      cond = "date = '{}' AND time = '{}' AND ip = '{}'".format(record['date'], record['time'], record['ip'])
+      if PgDBI.pgget(USAGE['PGTBL'], '', cond, PgLOG.LGEREX): continue
+      if add_to_allusage(year, record):
+         cnt += PgDBI.pgadd(USAGE['PGTBL'], record, PgLOG.LOGWRN)
+
+   return cnt
+
+
+def add_to_allusage(year, pgrec):
+
+   record = {'source' : 'A'}
+   flds = ['ip', 'dsid', 'date', 'time', 'quarter', 'size', 'method',
+           'org_type', 'country', 'region', 'email']
+
+   for fld in flds:
+      record[fld] = pgrec[fld]
+
+   return PgDBI.add_yearly_allusage(year, record)
+
+#
+# call main() to start program
+#
+if __name__ == "__main__": main()

{rda_python_metrics-1.0.32 → rda_python_metrics-1.0.46}/src/rda_python_metrics/fillawsusage.usg

@@ -1,6 +1,6 @@
 
  Retrieves usage information from AWS Server logs under directory
-   ../rda/transer/AWSera5log/ to fill table 'wusage' in database 'rdadb'.
+   ../rda/transer/AWSera5log/ to fill table 'awsusage' in database 'rdadb'.
 
  Usage: fillawsusage [-b] [-d LogFileDates] [-N NumberDay] [-p BeginDate [Enddate]]
 

{rda_python_metrics-1.0.32 → rda_python_metrics-1.0.46}/src/rda_python_metrics/fillcdgusage.py

@@ -31,29 +31,30 @@ USAGE = {
 }
 
 DSIDS = {
-#   'ucar.cgd.cesm2.cam6.prescribed_sst_amip' : ['d651010'],
-#   'ucar.cgd.ccsm4.CLM_LAND_ONLY' : ['d651011'],
-#   'ucar.cgd.artmip' : ['d651012', 'd651016', 'd651017', 'd651018'],
-#   'tamip' : ['d651013'],
-#   'ucar.cgd.ccsm4.CLIVAR_LE' : ['d651014'],
-#   'ucar.cgd.cesm2.Gettelman_CESM2_ECS' : ['d651015'],
-#   'ucar.cgd.ccsm4.geomip.ssp5' : ['d651024'],
-#   'ucar.cgd.ccsm4.IOD-PACEMAKER' : ['d651021'],
-#   'ucar.cgd.ccsm4.past2k_transient' : ['651023'],
-#   'ucar.cgd.ccsm4.lowwarming' : ['d651025'],
-#   'ucar.cgd.ccsm4.CESM_CAM5_BGC_ME' : ['d651000'],
-#   'ucar.cgd.ccsm4.iTRACE' : ['d651022'],
-#   'ucar.cgd.ccsm4.so2_geoeng' : ['d651026'],
-#   'ucar.cgd.ccsm4.cesmLE' : ['d651027'],
-#   'ucar.cgd.ccsm4.CESM1-CAM5-DP' : ['d651028'],
-#   'ucar.cgd.ccsm4.amv_lens' : ['d651031'],
-#   'ucar.cgd.ccsm4.ATL-PACEMAKER' : ['d651032'],
-#   'ucar.cgd.ccsm4.pac-pacemaker' : ['d651033'],
-#   'ucar.cgd.ccsm4.SD-WACCM-X_v2.1' : ['d651034'],
-#   'ucar.cgd.ccsm4.amv_lens' : ['d651035'],
-#   'ucar.cgd.cesm2.cism_ismip6' : ['d651036'],
-#   'ucar.cgd.ccsm4.pliomip2' : ['d651037'],
-   # new added
+   'pi_cesm2_atm_river_analysis' : ['d010073'],
+   'na-cordex' : ['d316009'],
+   'ucar.cgd.cesm2.cam6.prescribed_sst_amip' : ['d651010'],
+   'ucar.cgd.ccsm4.CLM_LAND_ONLY' : ['d651011'],
+   'ucar.cgd.artmip' : ['d651012', 'd651016', 'd651017', 'd651018'],
+   'tamip' : ['d651013'],
+   'ucar.cgd.ccsm4.CLIVAR_LE' : ['d651014'],
+   'ucar.cgd.cesm2.Gettelman_CESM2_ECS' : ['d651015'],
+   'ucar.cgd.ccsm4.geomip.ssp5' : ['d651024'],
+   'ucar.cgd.ccsm4.IOD-PACEMAKER' : ['d651021'],
+   'ucar.cgd.ccsm4.past2k_transient' : ['651023'],
+   'ucar.cgd.ccsm4.lowwarming' : ['d651025'],
+   'ucar.cgd.ccsm4.CESM_CAM5_BGC_ME' : ['d651000'],
+   'ucar.cgd.ccsm4.iTRACE' : ['d651022'],
+   'ucar.cgd.ccsm4.so2_geoeng' : ['d651026'],
+   'ucar.cgd.ccsm4.cesmLE' : ['d651027'],
+   'ucar.cgd.ccsm4.CESM1-CAM5-DP' : ['d651028'],
+   'ucar.cgd.ccsm4.amv_lens' : ['d651031'],
+   'ucar.cgd.ccsm4.ATL-PACEMAKER' : ['d651032'],
+   'ucar.cgd.ccsm4.pac-pacemaker' : ['d651033'],
+   'ucar.cgd.ccsm4.SD-WACCM-X_v2.1' : ['d651034'],
+   'ucar.cgd.ccsm4.amv_lens' : ['d651035'],
+   'ucar.cgd.cesm2.cism_ismip6' : ['d651036'],
+   'ucar.cgd.ccsm4.pliomip2' : ['d651037'],
    'ucar.cgd.cesm2-waccm.s2s_hindcasts': ['d651040'],
    'ucar.cgd.CESM1.3_SH_storm_tracks': ['d651044'],
    'ucar.cgd.cesm2.waccm6.ssp245': ['d651045'],
@@ -67,13 +68,12 @@ DSIDS = {
    'ucar.cgd.ccsm4.PaleoIF' : ['d651052'],
    'ucar.cgd.ccsm4.b.e11.B20LE_fixedO3' : ['d651053'],
    'ucar.cgd.cesm2.single.forcing.large.ensemble' : ['d651055'],
-   'ucar.cgd.cesm2le.output': ['d651056'],    # 2025-01 done
+   'ucar.cgd.cesm2le.output': ['d651056'],
    'ucar.cgd.ccsm4.ARISE-SAI-1.5' : ['d651059'],
    'ucar.cgd.cesm2.s2s_hindcasts': ['d651060'],
    'ucar.cgd.cesm2.s2s_hindcasts.mjo': ['d651061'],
    'ucar.cgd.cesm2.s2s_hindcasts.tc_tracks': ['d651062'],
    'ucar.cgd.cesm2.s2s_hindcasts.cesm2.climo': ['d651063'],
-   #add 2025-08-06
    'ucar.cgd.ccsm4.cesmLME' : ['d651058'],
    'ucar.cgd.ccsm4.GLENS' : ['d651064'],
    'ucar.cgd.ccsm4.CESM2-CISM2-LIGtransient' : ['d651066'],
@@ -85,8 +85,13 @@ DSIDS = {
    'ucar.cgd.cesm1.cldmod': ['d651069'],
    'ucar.cgd.cesm2.marine.biogeochemistry': ['d651071'],
    'ucar.cgd.nw2.mom6': ['d651072'],
-#   'ucar.cgd.cesm2.smyle': ['d651065'],  # not done util the end of Aug.
-   
+   'ucar.cgd.cesm2.cam6.ppe': ['d651076'],
+   'ucar.cgd.cesm2.smyle': ['d651065'],
+# new added
+   'gridded_precip_and_temp' : ['d010078'],
+   '29_newman' : ['d010079'],
+   'waccm-x.ion.asymmetry' : ['d010081'],
+   'NARCCAP' : ['d316015']   
 }
 
 ALLIDS = list(DSIDS.keys())

{rda_python_metrics-1.0.32 → rda_python_metrics-1.0.46}/src/rda_python_metrics/fillgdexusage.py

@@ -30,44 +30,58 @@ USAGE = {
 }
 
 DSIDS = {
+   "14_schuster" : "d583138",
+   "384_duvivier" : "d583139",
+   "model_data_for_17_march_2015_storm_event" : "d583140",
+   "326_qingyu" : "d583141",
+   "354_fasullo" : "d583142",
+   "157_gaubert" : "d583143",
+   "370_gaubert" : "d583144",
+   "459" : "d583145",
+   "108_kristenk" : "d583146",
+   "82_abaker" : "d583147",
+   "215_grabow" : "d583148",
+   "222_duvivier" : "d583149",
+   "366_rberrios" : "d583150",
+   "210_dxyang" : "d583100",
+   "238_junkyung" : "d583101",
+   "361_islas" : "d583102",
+   "448" : "d583103",
+   "187_jaredlee" : "d583104",
+   "273_kdagon" : "d583105",
+   "149_liuh" : "d583106",
+   "279_schwantes" : "d583107",
+   "60_pinto" : "d583108",
+   "WACC_Dependence_on_Solar_Activity" : "d583109",
+   "275_domingom" : "d583110",
+   "445" : "d583111",
+   "TIE-GCM_2017_Solar_Storm" : "d583112",
+   "123_andrew" : "d583113",
+   "453" : "d583114",
+   "367_mclong" : "d583115",
+   "258_jiangzhu" : "d583116",
+   "136_hannay" : "d583117",
+   "173B_dcherian" : "d583118",
+   "407_islas" : "d583119",
+   "189_islas" : "d583120",
+   "289_shields" : "d583121",
+   "415_mcinerney" : "d583122",
+   "151_dll" : "d583123",
+   "460" : "d583124",
+   "117_phamkh" : "d583125",
+   "109_erichend" : "d583126",
+   "412" : "d583127",
+   "390_knocasio" : "d583128",
+   "382_kumar" : "d583129",
+   "470" : "d583130",
+   "371_abaker" : "d583131",
+   "CESM-cocco_CO2_experiments" : "d583132",
+   "fuel_moisture_content" : "d583133",
+   "81_rberrios" : "d583134",
+   "286_knocasio" : "d583135",
+   "383_stebbins" : "d583136",
+   "256_tilmes" : "d583137",
    '371_abaker' : 'd583131',
-   'CESM-cocco_CO2_experiments' : 'd583132',
-   '256_tilmes' : 'd583137',
-   'fuel_moisture_content' : 'd583133',
-   '81_rberrios' : 'd583134',
-   '210_dxyang' : 'd583100',
-   '286_knocasio' : 'd583135',
-   '238_junkyung' : 'd583101',
-   '361_islas' : 'd583102',
-   '448' : 'd583103',
-   '383_stebbins' : 'd583136',
-   '187_jaredlee' : 'd583104',
-   '273_kdagon' : 'd583105',
-   '149_liuh' : 'd583106',
-   '279_schwantes' : 'd583107',
-   '60_pinto' : 'd583108',
-   'WACC_Dependence_on_Solar_Activity' : 'd583109',
-   '275_domingom' : 'd583110',
-   '445' : 'd583111',
-   'TIE-GCM_2017_Solar_Storm' : 'd583112',
-   '123_andrew' : 'd583113',
-   '453' : 'd583114',
-   '367_mclong' : 'd583115',
-   '258_jiangzhu' : 'd583116',
-   '136_hannay' : 'd583117',
-   '173B_dcherian' : 'd583118',
-   '407_islas' : 'd583119',
-   '189_islas' : 'd583120',
-   '289_shields' : 'd583121',
-   '415_mcinerney' : 'd583122',
-   '151_dll' : 'd583123',
-   '460' : 'd583124',
-   '117_phamkh' : 'd583125',
-   '109_erichend' : 'd583126',
-   '412' : 'd583127',
-   '390_knocasio' : 'd583128',
-   '382_kumar' : 'd583129',
-   '470' : 'd583130',
    # icarus
    'icarus.experiment.403' : 'd789010',
    'icarus.experiment.404' : 'd789011',

{rda_python_metrics-1.0.32 → rda_python_metrics-1.0.46}/src/rda_python_metrics/fillglobususage.py

@@ -27,7 +27,7 @@ from . import PgIPInfo
 
 USAGE = {
    'PGTBL'  : "wusage",
-   'GBSDIR' : PgLOG.PGLOG["DSSDATA"] + "/work/logs/gridftp/",
+   'GBSDIR' : PgLOG.PGLOG["GDEXWORK"] + "/logs/gridftp/",
    'GBSLOG' : "access_log_gridftp0{}_{}",
 }
 
@@ -43,7 +43,7 @@ def main():
    
 
    for arg in argv:
-      ms = re.match(r'^-(b|d|p|N)$', arg)
+      ms = re.match(r'^-(b|d|f|p|N)$', arg)
       if ms:
          opt = ms.group(1)
          if opt == 'b':
@@ -80,7 +80,9 @@ def main():
 def get_log_file_names(option, params, datelimits):
 
    filenames = []
-   if option == 'd':
+   if option == 'f':
+      filenames = params
+   elif option == 'd':
       for pdate in params:
          fdate = PgUtil.format_date(pdate, 'MMDDYYYY')
          fname = USAGE['GBSLOG'].format('?', fdate)
@@ -147,18 +149,14 @@ def fill_globus_usages(fnames, datelimits):
          locflag = 'O' if re.match(r'^https://stratus\.', sline) else 'G'
          idx = wfile.find('?')
          if idx > -1: wfile = wfile[:idx]
-
-         if re.match(r'^curl', engine, re.I):
-            method = "CURL"
-         elif re.match(r'^wget', engine, re.I):
-            method = "WGET"
-         elif re.match(r'^python', engine, re.I):
-            method = "PYTHN"
+         moff = engine.find('/')
+         if moff > 0:
+            if moff > 20: moff = 20
+            method = engine[0:moff].upper()
          else:
             method = "WEB"
 
          key = "{}:{}:{}".format(ip, dsid, wfile) if stat == '206' else None
-
          if record:
             if key == pkey:
                record['size'] += size

{rda_python_metrics-1.0.32 → rda_python_metrics-1.0.46}/src/rda_python_metrics/fillglobususage.usg

@@ -3,14 +3,16 @@
    /gpfs/fs1/collections/rda/work/logs/gridftp/ to fill table 'wusage' in
    database 'rdadb'.
 
- Usage: fillglobususage [-b] [-d LogFileDates] [-N NumberDay] [-p BeginDate [Enddate]]
+ Usage: fillglobususage [-b] [-d LogFileDates] [-f LogFileNames] [-N NumberDay] [-p BeginDate [Enddate]]
 
-      select option, -d, -N or -p to run this application.
+      select option, -d, -f, -N or -p to run this application.
 
       - Option -b, log process information into logfile only;
 
       - Option -d, retrieve usage info from given log file dates; 
 
+      - Option -f, retrieve usage info from given log file names; 
+
       - Option -N, retrieve usage info in recent NumberDay days;
 
       - Option -p, retrieve usage info between given period. For missing EndDate,