Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3312 from jtschladen/fix-expiration-summary 

Expiration summary email fixes
This commit is contained in:
Hossein Shafagh 2020-12-16 09:48:50 -08:00 committed by GitHub
parent 34553c2586 3e53a43873
commit 8a63b175e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lemur/notifications/cli.py
View File

@ -85,11 +85,11 @@ def security_expiration_summary(exclude):
status = FAILURE_METRIC_STATUS status = FAILURE_METRIC_STATUS
try: try:
print("Starting to notify security team about expiring certificates!") print("Starting to notify security team about expiring certificates!")
success, failed = send_security_expiration_summary(exclude) success = send_security_expiration_summary(exclude)
print( print(
"Finished notifying security team about expiring certificates! " f"Finished notifying security team about expiring certificates! Success: {success}"
f"Sent: {success} Failed: {failed}"
) )
if success:
status = SUCCESS_METRIC_STATUS status = SUCCESS_METRIC_STATUS
except Exception: except Exception:
sentry.captureException() sentry.captureException()

3
lemur/plugins/lemur_email/templates/expiration_summary.html
View File

@ -77,7 +77,6 @@
<tr> <tr>
<td style="font-family:Roboto-Regular,Helvetica,Arial,sans-serif;font-size:13px;color:#202020;line-height:1.5"> <td style="font-family:Roboto-Regular,Helvetica,Arial,sans-serif;font-size:13px;color:#202020;line-height:1.5">
<br>This is a summary of all certificates expiring soon. <br>This is a summary of all certificates expiring soon.
Only certificates matching the configured expiration intervals are included here.
Certificates with notifications disabled have been omitted. Certificates with notifications disabled have been omitted.
<table border="0" cellspacing="0" cellpadding="0" style="margin-top:12px;margin-bottom:48px"> <table border="0" cellspacing="0" cellpadding="0" style="margin-top:12px;margin-bottom:48px">
<tbody> <tbody>
@ -87,7 +86,7 @@
<td width="16px"></td> <td width="16px"></td>
<td style="line-height:1.2"> <td style="line-height:1.2">
<span style="font-family:Roboto-Regular,Helvetica,Arial,sans-serif;font-size:24px;color:#202020"> <span style="font-family:Roboto-Regular,Helvetica,Arial,sans-serif;font-size:24px;color:#202020">
<br>Expiring in {{ interval_and_certs["interval"] }} days<br> <br>Expiring in {{ interval_and_certs["interval"] + 1 }} days<br>
</span> </span>
</td> </td>
</tr> </tr>