Skip to content

Commit

Permalink
feat: optional note to tenants about expirations.
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
sadsfae committed Nov 27, 2020
1 parent 3bb7e80 commit 5efc99a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
13 changes: 12 additions & 1 deletion conf/quads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +231,15 @@ default_wipe: True
models: R620,R630,R640,R930,R730XD,FC640,6018R,6048R,1029U-TRTP,1029U-TN10RT,1029P,5039MS,6049P

# Amount of hours for locking a cloud for redefinition
cloud_reservation_lock: 48
cloud_reservation_lock: 48

# Continue to send notifications for expiration until assignments are
# actually extended. We set this because our ticket system (JIRA) is not tied
# into QUADS to silence expiration notices if an expiration request is
# submitted, only when it's executed will notifications cease.
# Unless you have done custom modification of notify.py/QUADS to tie toggling
# MongoDB flags for 'message' you want to leave this alone.
# Leaving the below to True will include a message in expiration notifications
# that users can ignore future expiration warnings if they have already
# submitted an extension request but it hasn't been executed yet.
quads_notify_until_extended: True
7 changes: 7 additions & 0 deletions quads/templates/message
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ of your expiration date.

{% endif %}

{% if quads_notify_until_extended %}
If you have already submitted an extension you can disregard
this message, our system will continue to send out expiration
notices until the actual extension is executed.

{% endif %}

Docs:

{{ wp_wiki }}/faq/
Expand Down
1 change: 1 addition & 0 deletions quads/tools/notify.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ def create_message(
wp_wiki=conf["wp_wiki"],
quads_request_url=quads_request_url,
quads_request_deadline_day=conf["quads_request_deadline_day"],
quads_notify_until_extended=conf["quads_notify_until_extended"],
cloud=cloud,
hosts=host_list_expire,
)
Expand Down

0 comments on commit 5efc99a

Please sign in to comment.