slapos_crm: Don't append monitoring suffix, we have categories for this.

master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/ComputeNode_checkState.py

@@ -11,8 +11,8 @@ if project.Project_isSupportRequestCreationClosed():
 reference = context.getReference()
 compute_node_title = context.getTitle()
 
-node_ticket_title = "[MONITORING] Lost contact with compute_node %s" % reference
-instance_ticket_title = "[MONITORING] Compute Node %s has a stalled instance process" % reference
+node_ticket_title = "Lost contact with compute_node %s" % reference
+instance_ticket_title = "Compute Node %s has a stalled instance process" % reference
 ticket_title = node_ticket_title
 
 description = ""
@@ -39,7 +39,7 @@ else:
     if data_array:
       should_notify = True
       notification_message_reference = "slapos-crm-compute_node_check_modified_file.notification"
-      ticket_title = "[MONITORING] Compute Node %s has modified file" % reference
+      ticket_title = "Compute Node %s has modified file" % reference
       issue_document_reference = data_array.getReference()
       description = "The Compute Node %s (%s) has modified file: %s" % (compute_node_title, reference, issue_document_reference)
 

master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/SoftwareInstallation_hasReportedError.py

@@ -30,7 +30,7 @@ if d.get("text").startswith("#building"):
     return last_contact
 
   should_notify = True
-  ticket_title = "[MONITORING] %s is building for too long on %s" % (reference, software_installation.getAggregateReference())
+  ticket_title = "%s is building for too long on %s" % (reference, software_installation.getAggregateReference())
   description = "The software release %s is building for mode them 12 hours on %s, started on %s" % \
           (software_installation.getUrlString(), software_installation.getAggregateTitle(), software_installation.getCreationDate())
   return should_notify, ticket_title, description, last_contact
@@ -40,7 +40,7 @@ if d.get("text").startswith("#error"):
     return DateTime(d.get('created_at'))
 
   should_notify = True
-  ticket_title = "[MONITORING] %s is failing to build on %s" % (reference, software_installation.getAggregateReference())
+  ticket_title = "%s is failing to build on %s" % (reference, software_installation.getAggregateReference())
   description = "The software release %s is failing to build for too long on %s, started on %s" % \
     (software_installation.getUrlString(), software_installation.getAggregateTitle(), software_installation.getCreationDate())
   return should_notify, ticket_title, description, last_contact

master/bt5/slapos_crm/TestTemplateItem/portal_components/test.erp5.testSlapOSCRMAlarm.py

@@ -1321,7 +1321,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeState(SlapOSTestCaseMixinWithAbort)
 
     compute_node_support_request = compute_node.ComputeNode_checkState()
     self.assertNotEqual(compute_node_support_request, None)
-    self.assertIn("[MONITORING] Lost contact with compute_node",
+    self.assertIn("Lost contact with compute_node",
       compute_node_support_request.getTitle())
     self.assertIn("has not contacted the server for more than 30 minutes",
       compute_node_support_request.getDescription())
@@ -1334,7 +1334,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeState(SlapOSTestCaseMixinWithAbort)
     compute_node_support_request = compute_node.ComputeNode_checkState()
 
     self.assertNotEqual(compute_node_support_request, None)
-    self.assertIn("[MONITORING] Lost contact with compute_node",
+    self.assertIn("Lost contact with compute_node",
       compute_node_support_request.getTitle())
     self.assertIn("has not contacted the server (No Contact Information)",
       compute_node_support_request.getDescription())
@@ -1375,7 +1375,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeState(SlapOSTestCaseMixinWithAbort)
     compute_node.ComputeNode_checkState()
     self.tic()
 
-    ticket_title = "[MONITORING] Lost contact with compute_node %s" % compute_node.getReference()
+    ticket_title = "Lost contact with compute_node %s" % compute_node.getReference()
     ticket = self._getGeneratedSupportRequest(compute_node.getUid(), ticket_title)
 
     self.assertNotEqual(ticket, None)
@@ -1413,7 +1413,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeState(SlapOSTestCaseMixinWithAbort)
     compute_node.ComputeNode_checkState()
     self.tic()
 
-    ticket_title = "[MONITORING] Lost contact with compute_node %s" % compute_node.getReference()
+    ticket_title = "Lost contact with compute_node %s" % compute_node.getReference()
     ticket = self._getGeneratedSupportRequest(compute_node.getUid(), ticket_title)
     self.assertNotEqual(ticket, None)
     event_list = ticket.getFollowUpRelatedValueList()
@@ -1458,7 +1458,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeState(SlapOSTestCaseMixinWithAbort)
     compute_node.ComputeNode_checkState()
     self.tic()
 
-    ticket_title = "[MONITORING] Compute Node %s has a stalled instance process" % compute_node.getReference()
+    ticket_title = "Compute Node %s has a stalled instance process" % compute_node.getReference()
     ticket = self._getGeneratedSupportRequest(compute_node.getUid(), ticket_title)
     self.assertNotEqual(ticket, None)
     event_list = ticket.getFollowUpRelatedValueList()
@@ -1504,7 +1504,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeState(SlapOSTestCaseMixinWithAbort)
     compute_node.ComputeNode_checkState()
     self.tic()
 
-    ticket_title = "[MONITORING] Compute Node %s has a stalled instance process" % compute_node.getReference()
+    ticket_title = "Compute Node %s has a stalled instance process" % compute_node.getReference()
     ticket = self._getGeneratedSupportRequest(compute_node.getUid(), ticket_title)
     self.assertNotEqual(ticket, None)
     event_list = ticket.getFollowUpRelatedValueList()
@@ -1593,7 +1593,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeSoftwareInstallation(SlapOSTestCase
     compute_node.ComputeNode_checkSoftwareInstallationState()
     self.tic()
 
-    ticket_title = "[MONITORING] No information for %s on %s" % (
+    ticket_title = "No information for %s on %s" % (
       self.start_requested_software_installation.getReference(),
       compute_node.getReference()
     )
@@ -1641,7 +1641,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeSoftwareInstallation(SlapOSTestCase
     compute_node.ComputeNode_checkSoftwareInstallationState()
     self.tic()
 
-    ticket_title = "[MONITORING] %s is building for too long on %s" % (
+    ticket_title = "%s is building for too long on %s" % (
       self.start_requested_software_installation.getReference(),
       compute_node.getReference()
     )
@@ -1687,7 +1687,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeSoftwareInstallation(SlapOSTestCase
     compute_node.ComputeNode_checkSoftwareInstallationState()
     self.tic()
 
-    ticket_title = "[MONITORING] %s is building for too long on %s" % (
+    ticket_title = "%s is building for too long on %s" % (
       self.start_requested_software_installation.getReference(),
       compute_node.getReference()
     )
@@ -1715,7 +1715,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeSoftwareInstallation(SlapOSTestCase
     compute_node.ComputeNode_checkSoftwareInstallationState()
     self.tic()
 
-    ticket_title = "[MONITORING] %s is failing to build on %s" % (
+    ticket_title = "%s is failing to build on %s" % (
       self.start_requested_software_installation.getReference(),
       compute_node.getReference()
     )
@@ -1761,7 +1761,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeSoftwareInstallation(SlapOSTestCase
     compute_node.ComputeNode_checkSoftwareInstallationState()
     self.tic()
 
-    ticket_title = "[MONITORING] %s is failing to build on %s" % (
+    ticket_title = "%s is failing to build on %s" % (
       self.start_requested_software_installation.getReference(),
       compute_node.getReference()
     )