Skip to content

Commit b4aae83

Browse files
Feature/ask approval file invalidation (#1002)
* fixed issue preventing sending alerts * fixed email settings * Latest email formatting changes
1 parent fadbc4e commit b4aae83

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

DMOps/file_invalidation_server/fi_manager/utils.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,18 @@ def send_approval_alert(request_id):
6161
<body>
6262
<h2>A new file invalidation request has been submitted and awaits approval</h2>
6363
64-
<p><b>Request ID:</b> {request_id}</p>
65-
<p><b>Reason:</b> {reason}</p>
66-
<p><b>Mode:</b> {mode}</p>
67-
<p><b>RSE:</b> {rse}</p>
68-
<p><b>Dry run:</b> {dry_run}</p>
69-
<p><b>Requested by:</b> {request_user}</p>
70-
<p><b>Number of files:</b> {count}</p>
71-
<p><b>Contains /RAW/?:</b> {contains_raw}</p>
72-
73-
<p><b>File names:</b></p>
64+
<p><b>Request ID:</b> <a href="https://file-invalidation.app.cern.ch/api/approve/{request_id}"> {request_id} </a> <br>
65+
<b>Reason:</b> {reason}<br>
66+
<b>Mode:</b> {mode}<br>
67+
<b>RSE:</b> {rse}<br>
68+
<b>Dry run:</b> {dry_run}<br>
69+
<b>Requested by:</b> {request_user}<br>
70+
<b>Number of files:</b> {count}<br>
71+
<b>Contains /RAW/?:</b> {contains_raw}</p>
72+
73+
<p><b>File names preview (up to 10 files):</b></p>
7474
<ul>
75-
{''.join(f"<li>{f.file_name}</li>" for f in files)}
75+
{''.join(f"<li>{f.file_name}</li>" for f in files[:10])}
7676
</ul>
7777
</body>
7878
</html>

DMOps/file_invalidation_server/file_invalidation_server/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676

7777
EMAIL_USE_TLS = False
7878
EMAIL_USE_SSL = False
79-
ADMIN_EMAILS = ['juan.pablo.salas.galindo@cern.ch','christos.emmanouil@cern.ch','h.ozturk@cern.ch','panos.paparrigopoulos@cern.ch'] #cms-comp-ops-transfer-team@cern.ch
79+
ADMIN_EMAILS = ['cms-dm-ops-core-team@cern.ch'] #cms-comp-ops-transfer-team@cern.ch
8080

8181
ROOT_URLCONF = 'file_invalidation_server.urls'
8282

0 commit comments

Comments
 (0)