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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of rda-python-metrics might be problematic. Click here for more details.

Files changed (61) hide show
  1. {rda_python_metrics-1.0.32/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.33}/PKG-INFO +1 -1
  2. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/pyproject.toml +2 -2
  3. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillosdfusage.py +2 -1
  4. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33/src/rda_python_metrics.egg-info}/PKG-INFO +1 -1
  5. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics.egg-info/entry_points.txt +1 -1
  6. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/LICENSE +0 -0
  7. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/MANIFEST.in +0 -0
  8. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/README.md +0 -0
  9. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/setup.cfg +0 -0
  10. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/PgIPInfo.py +0 -0
  11. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/PgView.py +0 -0
  12. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/__init__.py +0 -0
  13. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillawsusage.py +0 -0
  14. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillawsusage.usg +0 -0
  15. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillcdgusage.py +0 -0
  16. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillcdgusage.usg +0 -0
  17. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillcodusage.py +0 -0
  18. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillcodusage.usg +0 -0
  19. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillcountry.py +0 -0
  20. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillendtime.py +0 -0
  21. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillgdexusage.py +0 -0
  22. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillgdexusage.usg +0 -0
  23. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillglobususage.py +0 -0
  24. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillglobususage.usg +0 -0
  25. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillipinfo.py +0 -0
  26. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillipinfo.usg +0 -0
  27. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/filloneorder.py +0 -0
  28. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/filloneorder.usg +0 -0
  29. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillosdfusage.usg +0 -0
  30. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillrdadb.py +0 -0
  31. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillrdadb.usg +0 -0
  32. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/filltdsusage.py +0 -0
  33. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/filltdsusage.usg +0 -0
  34. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/filluser.py +0 -0
  35. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/filluser.usg +0 -0
  36. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/logarch.py +0 -0
  37. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/logarch.usg +0 -0
  38. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/pgperson.py +0 -0
  39. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/pgsyspath.py +0 -0
  40. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/pgusername.py +0 -0
  41. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewallusage.py +0 -0
  42. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewallusage.usg +0 -0
  43. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewcheckusage.py +0 -0
  44. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewcheckusage.usg +0 -0
  45. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewcodusage.py +0 -0
  46. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewcodusage.usg +0 -0
  47. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewordusage.py +0 -0
  48. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewordusage.usg +0 -0
  49. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewrqstusage.py +0 -0
  50. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewrqstusage.usg +0 -0
  51. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewtdsusage.py +0 -0
  52. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewtdsusage.usg +0 -0
  53. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewwebfile.py +0 -0
  54. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewwebfile.usg +0 -0
  55. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewwebusage.py +0 -0
  56. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/viewwebusage.usg +0 -0
  57. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics.egg-info/SOURCES.txt +0 -0
  58. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics.egg-info/dependency_links.txt +0 -0
  59. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics.egg-info/requires.txt +0 -0
  60. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics.egg-info/top_level.txt +0 -0
  61. {rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/tests/test_metrics.py +0 -0
{rda_python_metrics-1.0.32/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.33}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_metrics
3
- Version: 1.0.32
3
+ Version: 1.0.33
4
4
  Summary: RDA Python Package to gather and view data usage metrics
5
5
  Author-email: Zaihua Ji <zji@ucar.edu>
6
6
  Project-URL: Homepage, https://github.com/NCAR/rda-python-metrics
{rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/pyproject.toml RENAMED
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
6
6
 
7
7
  [project]
8
8
  name = "rda_python_metrics"
9
- version = "1.0.32"
9
+ version = "1.0.33"
10
10
  authors = [
11
11
  { name="Zaihua Ji", email="zji@ucar.edu" },
12
12
  ]
@@ -38,7 +38,7 @@ pythonpath = [
38
38
 
39
39
  [project.scripts]
40
40
  "logarch.py" = "rda_python_metrics.logarch:main"
41
- "fillawsusage" = "rda_python_metrics.fillaswusage:main"
41
+ "fillawsusage" = "rda_python_metrics.fillawsusage:main"
42
42
  "fillcdgusage" = "rda_python_metrics.fillcdgusage:main"
43
43
  "fillcodusage" = "rda_python_metrics.fillcodusage:main"
44
44
  "fillcountry" = "rda_python_metrics.fillcountry:main"
{rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics/fillosdfusage.py RENAMED
@@ -129,11 +129,12 @@ def fill_osdf_usages(fnames):
129
129
  PgLOG.pglog("{}: {}/{} OSDF log entries processed/records added".format(logfile, entcnt, cntadd), PgLOG.WARNLG)
130
130
 
131
131
  ms = re.match(r'^\[(\S+)\] \[Objectname:\/ncar\/rda\/([a-z]\d{6})\/(\S+)\].* \[Host:(\S+)\].* \[AppInfo:(\S+)\].* \[Read:(\d+)\]', line)
132
- if not ms or ms.group(4) == 'N/A': continue
132
+ if not ms: continue
133
133
  dt = ms.group(1)
134
134
  dsid = ms.group(2)
135
135
  wfile = ms.group(3)
136
136
  ip = ms.group(4)
137
+ if ip == 'N/A': ip = '0.0.0.0'
137
138
  engine = ms.group(5)
138
139
  size = int(ms.group(6))
139
140
  (year, quarter, date, time) = get_record_date_time(dt)
{rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33/src/rda_python_metrics.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_metrics
3
- Version: 1.0.32
3
+ Version: 1.0.33
4
4
  Summary: RDA Python Package to gather and view data usage metrics
5
5
  Author-email: Zaihua Ji <zji@ucar.edu>
6
6
  Project-URL: Homepage, https://github.com/NCAR/rda-python-metrics
{rda_python_metrics-1.0.32 → rda_python_metrics-1.0.33}/src/rda_python_metrics.egg-info/entry_points.txt RENAMED
@@ -1,5 +1,5 @@
1
1
  [console_scripts]
2
- fillawsusage = rda_python_metrics.fillaswusage:main
2
+ fillawsusage = rda_python_metrics.fillawsusage:main
3
3
  fillcdgusage = rda_python_metrics.fillcdgusage:main
4
4
  fillcodusage = rda_python_metrics.fillcodusage:main
5
5
  fillcountry = rda_python_metrics.fillcountry:main