fix: Fixing integration errors

Author: rupozzi

setup.cfg

@@ -171,7 +171,7 @@ console_scripts =
     dirac-admin-users-with-proxy = DIRAC.FrameworkSystem.scripts.dirac_admin_users_with_proxy:main [admin]
     dirac-install-component = DIRAC.FrameworkSystem.scripts.dirac_install_component:main [server]
     dirac-install-tornado-service = DIRAC.FrameworkSystem.scripts.dirac_install_tornado_service:main [server]
-    dirac-monitoring-get-components-status = DIRAC.FrameworkSystem.scripts.dirac_monitoring_get_components_status:main [admin]
+    #dirac-monitoring-get-components-status = DIRAC.FrameworkSystem.scripts.dirac_monitoring_get_components_status:main [admin]
     dirac-myproxy-upload = DIRAC.FrameworkSystem.scripts.dirac_myproxy_upload:main
     dirac-populate-component-db = DIRAC.FrameworkSystem.scripts.dirac_populate_component_db:main [admin]
     dirac-proxy-destroy = DIRAC.FrameworkSystem.scripts.dirac_proxy_destroy:main

src/DIRAC/Core/DISET/private/Service.py

@@ -116,10 +116,9 @@ def initialize(self):
         self._initMonitoring()
         # Call static initialization function
         try:
-            if self.activityMonitoring:
-                self._handler["class"]._rh__initializeClass(
-                    dict(self._serviceInfoDict), self._lockManager, self._msgBroker, self.activityMonitoringReporter
-                )
+            self._handler["class"]._rh__initializeClass(
+                dict(self._serviceInfoDict), self._lockManager, self._msgBroker, self.activityMonitoringReporter
+            )
             if self._handler["init"]:
                 for initFunc in self._handler["init"]:
                     gLogger.verbose("Executing initialization function")
@@ -243,6 +242,15 @@ def _loadActions(self):
         return S_OK({"methods": methodsList, "auth": authRules, "types": typeCheck})
 
     def _initMonitoring(self):
+        props = [("__doc__", "description")]
+        for prop in props:
+            try:
+                value = getattr(self._handler["module"], prop[0])
+            except Exception as e:
+                gLogger.exception(e)
+                gLogger.error("Missing property", prop[0])
+                value = "unset"
+
         for secondaryName in self._cfg.registerAlsoAs():
             gLogger.info("Registering %s also as %s" % (self._name, secondaryName))
             self._validNames.append(secondaryName)

src/DIRAC/Core/Tornado/Server/TornadoServer.py

@@ -26,7 +26,6 @@
 from DIRAC.Core.Utilities import MemStat
 from DIRAC.Core.Tornado.Server.HandlerManager import HandlerManager
 from DIRAC.ConfigurationSystem.Client import PathFinder
-from DIRAC.FrameworkSystem.Client.MonitoringClient import MonitoringClient
 
 sLog = gLogger.getSubLogger(__name__)
 DEBUG_M2CRYPTO = os.getenv("DIRAC_DEBUG_M2CRYPTO", "No").lower() in ("yes", "true")
@@ -96,8 +95,6 @@ def __init__(self, services=True, endpoints=False, port=None):
         # Handler manager initialization with default settings
         self.handlerManager = HandlerManager(services, endpoints)
 
-        # Monitoring attributes
-        self._monitor = MonitoringClient()
         # temp value for computation, used by the monitoring
         self.__report = None
         # Last update time stamp
@@ -232,17 +229,6 @@ def _initMonitoring(self):
         Initialize the monitoring
         """
 
-        self._monitor.setComponentType(MonitoringClient.COMPONENT_TORNADO)
-        self._monitor.initialize()
-        self._monitor.setComponentName("Tornado")
-
-        self._monitor.registerActivity("CPU", "CPU Usage", "Framework", "CPU,%", MonitoringClient.OP_MEAN, 600)
-        self._monitor.registerActivity("MEM", "Memory Usage", "Framework", "Memory,MB", MonitoringClient.OP_MEAN, 600)
-
-        self._monitor.setComponentExtraParam("DIRACVersion", DIRAC.version)
-        self._monitor.setComponentExtraParam("platform", DIRAC.getPlatform())
-        self._monitor.setComponentExtraParam("startTime", datetime.datetime.utcnow())
-
     def __reportToMonitoring(self):
         """
         Periodically report to the monitoring of the CPU and MEM
@@ -276,7 +262,6 @@ def __startReportToMonitoringLoop(self):
         membytes = MemStat.VmB("VmRSS:")
         if membytes:
             mem = membytes / (1024.0 * 1024.0)
-            self._monitor.addMark("MEM", mem)
         return (now, cpuTime)
 
     def __endReportToMonitoringLoop(self, initialWallTime, initialCPUTime):
@@ -292,5 +277,4 @@ def __endReportToMonitoringLoop(self, initialWallTime, initialCPUTime):
         stats = os.times()
         cpuTime = stats[0] + stats[2] - initialCPUTime
         percentage = cpuTime / wallTime * 100.0
-        if percentage > 0:
-            self._monitor.addMark("CPU", percentage)
+        return percentage

src/DIRAC/DataManagementSystem/Agent/RequestOperations/test/Test_ArchiveFiles.py

@@ -40,7 +40,6 @@ def _myMocker(mocker):
     mocker.patch(MODULE + ".shutil.rmtree")
     mocker.patch(MODULE + ".os.makedirs")
     mocker.patch(MODULE + ".os.remove")
-    mocker.patch(MODULE + ".gMonitor")
     return None
 
 

src/DIRAC/FrameworkSystem/scripts/dirac_monitoring_get_components_status.py

@@ -84,9 +84,6 @@ def __init__(self, agentName, loadName, baseAgentName=False, properties=None):
     def initialize(self):
         """Sets default parameters and creates CE instance"""
 
-        # Disable monitoring
-        self.am_disableMonitoring()
-
         localCE = gConfig.getValue("/LocalSite/LocalCE", self.ceName)
         if localCE != self.ceName:
             self.log.info("Defining Inner CE from local configuration", "= %s" % localCE)

src/DIRAC/WorkloadManagementSystem/Agent/JobAgent.py

@@ -75,7 +75,6 @@ def __declareInstanceRunning(self):
 
     def initialize(self):
 
-        self.am_disableMonitoring()
         self.op = Operations.Operations()
         # Init vars
         self.runningPod = gConfig.getValue("/LocalSite/RunningPod")

src/DIRAC/WorkloadManagementSystem/Agent/VirtualMachineMonitorAgent.py

@@ -87,12 +87,3 @@ echo " "
 echo " ########################## Framework #############################"
 echo " "
 echo " "
-
-
-echo " "
-echo "======  dirac-monitoring-get-components-status"
-dirac-monitoring-get-components-status
-if [[ "${?}" -ne 0 ]]; then
-   exit 1
-fi
-echo " "