Skip to content

Commit 5efc99a

Browse files
committed
feat: optional note to tenants about expirations.
* Configurable option "notify_until_extended:" for quads.yml * Default set to "True" * Adds message in expiration notifications that users can ignore expiration warnings if they've already submitted an extension request. * Reason: Hopefully this will cut down on duplicate extension requests as folks may not know that JIRA and MongoDB are not tied together (and we actually want repeated notifications for expiration for awareness). * This is temporary until a better solution is in place: #350 Change-Id: I042fc20fd7e9b58c207dad82634bf889926252d0
1 parent 3bb7e80 commit 5efc99a

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

conf/quads.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,4 +231,15 @@ default_wipe: True
231231
models: R620,R630,R640,R930,R730XD,FC640,6018R,6048R,1029U-TRTP,1029U-TN10RT,1029P,5039MS,6049P
232232

233233
# Amount of hours for locking a cloud for redefinition
234-
cloud_reservation_lock: 48
234+
cloud_reservation_lock: 48
235+
236+
# Continue to send notifications for expiration until assignments are
237+
# actually extended. We set this because our ticket system (JIRA) is not tied
238+
# into QUADS to silence expiration notices if an expiration request is
239+
# submitted, only when it's executed will notifications cease.
240+
# Unless you have done custom modification of notify.py/QUADS to tie toggling
241+
# MongoDB flags for 'message' you want to leave this alone.
242+
# Leaving the below to True will include a message in expiration notifications
243+
# that users can ignore future expiration warnings if they have already
244+
# submitted an extension request but it hasn't been executed yet.
245+
quads_notify_until_extended: True

quads/templates/message

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ of your expiration date.
3131

3232
{% endif %}
3333

34+
{% if quads_notify_until_extended %}
35+
If you have already submitted an extension you can disregard
36+
this message, our system will continue to send out expiration
37+
notices until the actual extension is executed.
38+
39+
{% endif %}
40+
3441
Docs:
3542

3643
{{ wp_wiki }}/faq/

quads/tools/notify.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ def create_message(
9292
wp_wiki=conf["wp_wiki"],
9393
quads_request_url=quads_request_url,
9494
quads_request_deadline_day=conf["quads_request_deadline_day"],
95+
quads_notify_until_extended=conf["quads_notify_until_extended"],
9596
cloud=cloud,
9697
hosts=host_list_expire,
9798
)

0 commit comments

Comments
 (0)