reqmgr2ms-monitor 2.2.6rc2__tar.gz → 2.2.6rc4__tar.gz

{reqmgr2ms-monitor-2.2.6rc2/src/python/reqmgr2ms_monitor.egg-info → reqmgr2ms-monitor-2.2.6rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: reqmgr2ms-monitor
-Version: 2.2.6rc2
+Version: 2.2.6rc4
 Summary: UNKNOWN
 Home-page: https://github.com/dmwm/WMCore
 Maintainer: CMS DMWM Group

reqmgr2ms-monitor-2.2.6rc4/bin/adhoc-scripts/adjustMongoDocs.py

@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+"""
+File       : adjustMongoDocs.py
+Author     : Valentin Kuznetsov <vkuznet AT gmail dot com>
+Description: adjust documents in MongoDB with given schema
+The script loops over given db documents (from given db name
+and collection) and add to each document a new schema provided
+via input file name, e.g.
+
+# new schema addition:
+cat > /tmp/schema.json << EOF
+{"foo": 1}
+EOF
+
+# run script to update all documents in test.test database and add to them
+# a json structure presented in /tmp/schema.json file
+adjustMongoDocs.py --fin=/tmp/schema.json --dburi=localhost:8230 --dbname=test --dbcoll=test --verbose 1
+
+NOTE: the script can run from any location assuming it has proper db uri with
+credentials and availability of mongo db outside of its own cluster, but most
+likely it will be run on mongo db k8s cluster
+"""
+
+import argparse
+import json
+from pymongo import MongoClient
+
+
+class OptionParser(object):
+    "Helper class to handle script options"
+
+    def __init__(self):
+        "User based option parser"
+        self.parser = argparse.ArgumentParser(prog='PROG')
+        self.parser.add_argument("--fin", action="store",
+                                 dest="fin", default="", help="Input file with update fields")
+        self.parser.add_argument("--dburi", action="store",
+                                 dest="dburi", default="", help="MongoDB URI")
+        self.parser.add_argument("--dbname", action="store",
+                                 dest="dbname", default="", help="MongoDB database")
+        self.parser.add_argument("--dbcoll", action="store",
+                                 dest="dbcoll", default="", help="MongoDB collection")
+        self.parser.add_argument("--verbose", action="store",
+                                 dest="verbose", default=0, help="verbosity level")
+
+
+def adjust():
+    """
+    helper script to update documents in MongoDB with given db name/collection
+    and schema file (which should contain new addition, in form of JSON, to the
+    db documents)
+    """
+    optmgr = OptionParser()
+    opts = optmgr.parser.parse_args()
+    conn = MongoClient(host=opts.dburi)
+    dbname = opts.dbname
+    dbcoll = opts.dbcoll
+    verbose = opts.verbose
+    schema = {}
+    with open(opts.fin, 'r', encoding='utf-8') as istream:
+        schema = json.load(istream)
+    if schema:
+        if verbose:
+            print("read data from '%s', %s/%s" % (opts.dburi, dbname, dbcoll))
+        records = [r for r in conn[dbname][dbcoll].find()]
+        for doc in records:
+            if verbose:
+                print("update doc=%s with schema=%s" % (doc, schema))
+            conn[dbname][dbcoll].update_one(doc, {'$set': schema}, upsert=True)
+
+
+if __name__ == '__main__':
+    adjust()

{reqmgr2ms-monitor-2.2.6rc2 → reqmgr2ms-monitor-2.2.6rc4}/bin/adhoc-scripts/parseUnifiedCampaigns.py

@@ -281,12 +281,11 @@ def insertTestCampaigns(mgr):
                    'SecondaryLocation': ["T1_US_FNAL_Disk", "T2_CH_CERN"],
                    'SiteBlackList': [], 'SiteWhiteList': ["T1_US_FNAL", "T2_CH_CERN"]}
 
-    testCamp = ("CMSSW_10_6_1_patch1_Step1", "CMSSW_10_6_1_patch1_Step2",
-                "CMSSW_7_3_2__test2inwf-1510737328", "CMSSW_11_2_0_pre6__fullsim_noPU_2021_14TeV-1599843628",
-                "RelVal_Generic_Campaign", "DMWM_Test",
-                "Agent212_Val", "Agent214_Val", "Agent216_Val",
-                "Sept2022_Val", "Oct2022_Val", "Nov2022_Val", "Dec2022_Val", "Jan2023_Val",
-                "HG2209_Val", "HG2210_Val", "HG2211_Val", "HG2212_Val", "HG2301_Val")
+    testCamp = ("CMSSW_7_3_2__test2inwf-1510737328", "CMSSW_11_2_0_pre6__fullsim_noPU_2021_14TeV-1599843628",
+                "RelVal_Generic_Campaign", "DMWM_Test", "Integ_Test",
+                "Agent227_Val", "Agent229_Val", "Agent2211_Val",
+                "Nov2023_Val", "Dec2023_Val", "Jan2024_Val", "Feb2024_Val", "Mar2024_Val"
+                "HG2312_Val", "HG2401_Val", "HG2402_Val", "HG2403_Val")
     for campName in testCamp:
         defaultCamp['CampaignName'] = campName
         upload(mgr, defaultCamp)

{reqmgr2ms-monitor-2.2.6rc2 → reqmgr2ms-monitor-2.2.6rc4}/bin/wmagent-mod-config

@@ -288,6 +288,13 @@ def modifyConfiguration(config, **args):
     if hasattr(config, "ArchiveDataReporter"):
         config.ArchiveDataReporter.WMArchiveURL = args["wmarchive_url"]
 
+        # custom WMArchiveReporter
+    if hasattr(config, "WorkflowUpdater"):
+        config.WorkflowUpdater.rucioUrl = args["rucio_host"]
+        config.WorkflowUpdater.rucioAuthUrl = args["rucio_auth"]
+        if args.get("mspileup_url", None):
+            config.WorkflowUpdater.msPileupUrl = args["mspileup_url"]
+
     return config
 
 
@@ -315,7 +322,7 @@ def main(argv=None):
                                          "reqmgr2_url=", "acdc_url=", "amq_auth_file=", "dbs3_url=",
                                          "dqm_url=", "grafana_token=", "requestcouch_url=", "central_logdb_url=",
                                          "wmarchive_url=", "amq_credentials=",
-                                         "rucio_account=", "rucio_host=", "rucio_auth="])
+                                         "rucio_account=", "rucio_host=", "rucio_auth=", "mspileup_url="])
 
         except getopt.error as msg:
             raise Usage(msg)
@@ -339,7 +346,7 @@ def main(argv=None):
                           '--amq_auth_file', '--dbs3_url', '--dqm_url',
                           '--grafana_token', '--requestcouch_url', '--central_logdb_url',
                           '--wmarchive_url', '--amq_credentials',
-                          '--rucio_account', '--rucio_host', '--rucio_auth'):
+                          '--rucio_account', '--rucio_host', '--rucio_auth', '--mspileup_url'):
                 parameters[option[2:]] = value
 
 

{reqmgr2ms-monitor-2.2.6rc2 → reqmgr2ms-monitor-2.2.6rc4}/src/python/WMCore/__init__.py

@@ -6,5 +6,5 @@ Core libraries for Workload Management Packages
 
 """
 
-__version__ = '2.2.6rc2'
+__version__ = '2.2.6rc4'
 __all__ = []

{reqmgr2ms-monitor-2.2.6rc2 → reqmgr2ms-monitor-2.2.6rc4/src/python/reqmgr2ms_monitor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: reqmgr2ms-monitor
-Version: 2.2.6rc2
+Version: 2.2.6rc4
 Summary: UNKNOWN
 Home-page: https://github.com/dmwm/WMCore
 Maintainer: CMS DMWM Group

{reqmgr2ms-monitor-2.2.6rc2 → reqmgr2ms-monitor-2.2.6rc4}/src/python/reqmgr2ms_monitor.egg-info/SOURCES.txt

@@ -49,6 +49,7 @@ bin/wmcore-new-flow
 bin/wmcoreD
 bin/HWMon/wmcore-SysStat
 bin/adhoc-scripts/ParseSpecCmsswdist.py
+bin/adhoc-scripts/adjustMongoDocs.py
 bin/adhoc-scripts/checkDsetFileCount.py
 bin/adhoc-scripts/checkStuckLQE.py
 bin/adhoc-scripts/createPileupObjects.py