Skip to content

Commit f711650

Browse files
author
Andrei Tsaregorodtsev
authored
Merge pull request #5974 from fstagni/80_fixes25
[8.0] Tornado Monitoring/Monitoring handler
2 parents 9ab51c2 + e5e5532 commit f711650

File tree

25 files changed

+140
-80
lines changed

25 files changed

+140
-80
lines changed

‎docs/source/AdministratorGuide/Configuration/ConfReference/Systems/DataManagement/Services/index.rst‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,12 @@ presented in the following table:
1212
| *LogBackends* | Log backends | LogBackends = stdout |
1313
| | | LogBackends += ... |
1414
+-------------------------+----------------------------------------------+-----------------------------+
15-
| *MaskRequestParameters* | Request to mask the values, possible values: | MaskRequestParameters = yes |
16-
| | yes or no | |
17-
+-------------------------+----------------------------------------------+-----------------------------+
1815
| *MaxThreads* | Maximum number of threads used in parallel | MaxThreads = 50 |
1916
| | for the server | |
2017
+-------------------------+----------------------------------------------+-----------------------------+
2118
| *Port* | Port useb by DIRAC service | Port = 9140 |
2219
+-------------------------+----------------------------------------------+-----------------------------+
23-
| *Protocol* | Protocol used to comunicate with the service | Protocol = dips |
20+
| *Protocol* | Protocol used to comunicate with the service | Protocol = https |
2421
+-------------------------+----------------------------------------------+-----------------------------+
2522
| *Authorization* | Subsection used to define which kind of | Authorization |
2623
| | Authorization is required to talk with the | |

‎docs/source/AdministratorGuide/Configuration/ConfReference/Systems/DataManagement/URLs/index.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,3 @@ Services associated with DataManagement System:
2121
+------------------------+----------+
2222
| *StorageElementProxy* | 9139 |
2323
+------------------------+----------+
24-
| *TransferDBMonitoring* | 9191 |
25-
+------------------------+----------+

‎docs/source/AdministratorGuide/Configuration/ConfReference/Systems/Framework/Services/index.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ presented in the following table:
1212
| *LogBackends* | Log backends | LogBackends = stdout |
1313
| | | LogBackends += ... |
1414
+----------------------------+----------------------------------------------+--------------------------------+
15-
| *MaskRequestParameters* | Request to mask the values, possible values: | MaskRequestParameters = yes |
16-
| | yes or no | |
17-
+----------------------------+----------------------------------------------+--------------------------------+
1815
| *MaxThreads* | Maximum number of threads used in parallel | MaxThreads = 50 |
1916
| | for the server | |
2017
+---------------------------------------------------------------------------+--------------------------------+

‎docs/source/AdministratorGuide/Configuration/ConfReference/Systems/StorageManagement/Services/index.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ presented in the following table:
1212
| *LogBackends* | Log backends | LogBackends = stdout |
1313
| | | LogBackends += ... |
1414
+-------------------------+----------------------------------------------+-----------------------------+
15-
| *MaskRequestParameters* | Request to mask the values, possible values: | MaskRequestParameters = yes |
16-
| | yes or no | |
17-
+-------------------------+----------------------------------------------+-----------------------------+
1815
| *MaxThreads* | Maximum number of threads used in parallel | MaxThreads = 50 |
1916
| | for the server | |
2017
+-------------------------+----------------------------------------------+-----------------------------+

‎docs/source/AdministratorGuide/Configuration/ConfReference/Systems/Transformation/Services/index.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ presented in the following table:
1212
| *LogBackends* | Log backends | LogBackends = stdout |
1313
| | | LogBackends += ... |
1414
+-------------------------+----------------------------------------------+-----------------------------+
15-
| *MaskRequestParameters* | Request to mask the values, possible values: | MaskRequestParameters = yes |
16-
| | yes or no | |
17-
+-------------------------+----------------------------------------------+-----------------------------+
1815
| *MaxThreads* | Maximum number of threads used in parallel | MaxThreads = 50 |
1916
| | for the server | |
2017
+-------------------------+----------------------------------------------+-----------------------------+

‎docs/source/AdministratorGuide/Configuration/ConfReference/Systems/WorkloadManagement/Services/index.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ presented in the following table:
1212
| *LogBackends* | Log backends | LogBackends = stdout |
1313
| | | LogBackends += ... |
1414
+-------------------------+----------------------------------------------+-----------------------------+
15-
| *MaskRequestParameters* | Request to mask the values, possible values: | MaskRequestParameters = yes |
16-
| | yes or no | |
17-
+-------------------------+----------------------------------------------+-----------------------------+
1815
| *MaxThreads* | Maximum number of threads used in parallel | MaxThreads = 50 |
1916
| | for the server | |
2017
+-------------------------+----------------------------------------------+-----------------------------+

‎src/DIRAC/AccountingSystem/Service/ReportGeneratorHandler.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,8 @@ def __generatePlotFromFileId(self, fileId):
193193
return S_OK(result["Value"][fileToReturn])
194194

195195
def __sendErrorAsImg(self, msgText, fileHelper):
196-
retVal = generateErrorMessagePlot(msgText)
197-
retVal = fileHelper.sendData(retVal["Value"])
198-
if not retVal["OK"]:
199-
return retVal
196+
fileHelper.sendData(generateErrorMessagePlot(msgText))
200197
fileHelper.sendEOF()
201-
return S_OK()
202198

203199
def transfer_toClient(self, fileId, token, fileHelper):
204200
"""

‎src/DIRAC/Core/Utilities/Plotting/Plots.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def generateErrorMessagePlot(msgText):
5050
textGraph(msgText, fn, {})
5151
data = fn.getvalue()
5252
fn.close()
53-
return S_OK(data)
53+
return data
5454

5555

5656
def generateTimedStackedBarPlot(fileName, data, metadata):

‎src/DIRAC/MonitoringSystem/Client/MonitoringReporter.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from DIRAC.ConfigurationSystem.Client.Config import gConfig
2828

2929

30-
class MonitoringReporter(object):
30+
class MonitoringReporter:
3131

3232
"""
3333
.. class:: MonitoringReporter

‎src/DIRAC/MonitoringSystem/Client/Types/BaseType.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
########################################################################
55

66

7-
class BaseType(object):
7+
class BaseType:
88

99
"""
1010
.. class:: BaseType
@@ -14,7 +14,6 @@ class BaseType(object):
1414
:type keyFields: python:list
1515
:param monitoringFields: This is the value what we plot
1616
:type monitoringFields: python:list
17-
:param int dataToKeep: Data retention. We keep all data by default.
1817
:param dict mapping: We can specify the mapping of the documents. It is used during the creation of an index.
1918
Note: If you do not want to be analysed a string, you have to set the mapping
2019
:param str period: We can configure the elasticsearch index name with a period.
@@ -24,7 +23,6 @@ class BaseType(object):
2423
2524
"""
2625

27-
########################################################################
2826
def __init__(self):
2927
"""c'tor
3028
@@ -38,9 +36,6 @@ def __init__(self):
3836
self.index = None
3937
self.index = self._getIndex()
4038

41-
# we only keep the last month of the data.
42-
self.dataToKeep = -1
43-
4439
########################################################################
4540
def checkType(self):
4641
"""

0 commit comments

Comments
 (0)