fix: Add SiteDirector string choice for sendPilotSubmissionMonitoring()

Author: rupozzi

src/DIRAC/MonitoringSystem/private/Plotters/PilotMonitoringPlotter.py

@@ -7,8 +7,6 @@
 from DIRAC.MonitoringSystem.Client.Types.PilotMonitoring import PilotMonitoring
 from DIRAC.MonitoringSystem.private.Plotters.BasePlotter import BasePlotter
 
-__RCSID__ = "$Id$"
-
 
 class WMSHistoryPlotter(BasePlotter):
 
@@ -95,7 +93,7 @@ def _plotNumSucceeded(self, reportRequest, plotInfo, filename):
         :return: S_OK or S_ERROR { 'plot' : value1, 'thumbnail' : value2 } value1 and value2 are TRUE/FALSE
         """
         metadata = {
-            "title": "Submissions by %s" % reportRequest["grouping"],
+            "title": "SuSubmissions by %s" % reportRequest["grouping"],
             "starttime": reportRequest["startTime"],
             "endtime": reportRequest["endTime"],
             "span": plotInfo["granularity"],

src/DIRAC/MonitoringSystem/private/Plotters/WMSHistoryPlotter.py

@@ -1,17 +1,12 @@
 """
 This class is used to define the plot using the plot attributes.
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
 
 from DIRAC import S_OK
 
 from DIRAC.MonitoringSystem.Client.Types.WMSHistory import WMSHistory
 from DIRAC.MonitoringSystem.private.Plotters.BasePlotter import BasePlotter
 
-__RCSID__ = "$Id$"
-
 
 class WMSHistoryPlotter(BasePlotter):
 

src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py

@@ -1398,10 +1398,16 @@ def sendPilotSubmissionMonitoring(self, siteName, ceName, queueName, numTotal, n
         """
 
         pilotMonitoringReporter = MonitoringReporter(monitoringType="PilotMonitoring")
+
+        if hasattr(self, "_AgentModule__moduleProperties"):
+            siteDirName = self.am_getModuleParam("agentName")
+        else:  # In case it is not executed as agent
+            siteDirName = "Client"
+
         pilotMonitoringData = [
             {
-                "HostName": "",
-                "SiteDirector": "",
+                "HostName": DIRAC.siteName(),
+                "SiteDirector": siteDirName,
                 "Site": siteName,
                 "CE": ceName,
                 "Queue": queueName,