Merge pull request #10475 from amaltaro/fix-10468

Remake MSTransferor alert subject; increase alert expiration time to 1h
dmwm · May 6, 2021 · fcca972 · fcca972
2 parents 3ac62d2 + 704a3e1
commit fcca972
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/python/WMCore/MicroService/MSTransferor/MSTransferor.py b/src/python/WMCore/MicroService/MSTransferor/MSTransferor.py
@@ -746,18 +746,21 @@ def notifyLargeData(self, aboveWarningThreshold, transferId, wflowName, dataSize
         """
         # Warn about data transfer subscriptions going above some threshold
         if aboveWarningThreshold:
-            alertName = "ms-transferor: Transfer over threshold: {}".format(transferId)
+            alertName = "{}: input data transfer over threshold: {}".format(self.alertServiceName,
+                                                                            wflowName)
             alertSeverity = "high"
             alertSummary = "[MS] Large pending data transfer under request id: {}".format(transferId)
-            alertDescription = "Workflow: {}\nhas a large amount of ".format(wflowName)
-            alertDescription += "data subscribed: {} TB,\n".format(teraBytes(dataSize))
+            alertDescription = "Workflow: {} has a large amount of ".format(wflowName)
+            alertDescription += "data subscribed: {} TB, ".format(teraBytes(dataSize))
             alertDescription += "for {} data: {}.""".format(dataIn['type'], dataIn['name'])
 
             try:
-                self.alertManagerApi.sendAlert(alertName, alertSeverity, alertSummary, alertDescription, self.alertServiceName)
+                # alert to expiry in an hour from now
+                self.alertManagerApi.sendAlert(alertName, alertSeverity, alertSummary, alertDescription,
+                                               self.alertServiceName, endSecs=1 * 60 * 60)
             except Exception as ex:
                 self.logger.exception("Failed to send alert to %s. Error: %s", self.alertManagerUrl, str(ex))
-            self.logger.info(alertDescription)
+            self.logger.warning(alertDescription)
 
     def _getValidSites(self, wflow, dataIn):
         """