Merge pull request #642 from rupozzi/gmonitor-web

Remove activity monitor from web app
DIRACGrid · Apr 6, 2022 · c406800 · c406800
2 parents 080018b + 1f395d3
commit c406800
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 1,385 deletions.
diff --git a/src/WebAppDIRAC/WebApp/handler/SystemAdministrationHandler.py b/src/WebAppDIRAC/WebApp/handler/SystemAdministrationHandler.py
@@ -6,10 +6,10 @@
 
 from DIRAC import gConfig, gLogger
 from DIRAC.Core.Utilities.List import uniqueElements
-from DIRAC.FrameworkSystem.Client.MonitoringClient import gMonitor
 from DIRAC.FrameworkSystem.Client.NotificationClient import NotificationClient
 from DIRAC.FrameworkSystem.Client.SystemAdministratorClient import SystemAdministratorClient
 from DIRAC.FrameworkSystem.Client.ComponentMonitoringClient import ComponentMonitoringClient
+from DIRAC.FrameworkSystem.DB.ComponentMonitoringDB import ComponentMonitoringDB
 
 from WebAppDIRAC.Lib.WebHandler import WebHandler, asyncGen
 
@@ -699,7 +699,7 @@ def web_ComponentLocation(self):
                 condDict = {"Setup": _setup}
 
         gLogger.debug("condDict" + str(condDict))
-        retVal = gMonitor.getComponentsStatus(condDict)
+        retVal = ComponentMonitoringDB.getComponentsStatus(condDict)
 
         today = datetime.datetime.today()
         if retVal["OK"]: