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

Merge pull request #2784 from castrapel/add_metrics_reissue_rotate 

Gather more metrics on certificate reissue/rotate jobs
This commit is contained in:
Curtis 2019-05-08 07:57:51 -07:00 committed by GitHub
parent 9cfdf55d9e c9c782684d
commit 02554b427a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lemur/certificates/cli.py
View File

@ -153,15 +153,11 @@ def request_reissue(certificate, commit):
status = SUCCESS_METRIC_STATUS status = SUCCESS_METRIC_STATUS
except Exception as e: except Exception as e:
sentry.captureException() sentry.captureException(extra={"certificate_name": str(certificate.name)})
current_app.logger.exception("Error reissuing certificate.", exc_info=True) current_app.logger.exception(f"Error reissuing certificate: {certificate.name}", exc_info=True)
print( print(f"[!] Failed to reissue certificate: {certificate.name}. Reason: {e}")
"[!] Failed to reissue certificates. Reason: {}".format(
e
)
)
metrics.send('certificate_reissue', 'counter', 1, metric_tags={'status': status}) metrics.send('certificate_reissue', 'counter', 1, metric_tags={'status': status, 'certificate': certificate.name})
@manager.option('-e', '--endpoint', dest='endpoint_name', help='Name of the endpoint you wish to rotate.') @manager.option('-e', '--endpoint', dest='endpoint_name', help='Name of the endpoint you wish to rotate.')
@ -187,35 +183,55 @@ def rotate(endpoint_name, new_certificate_name, old_certificate_name, message, c
endpoint = validate_endpoint(endpoint_name) endpoint = validate_endpoint(endpoint_name)
if endpoint and new_cert: if endpoint and new_cert:
print("[+] Rotating endpoint: {0} to certificate {1}".format(endpoint.name, new_cert.name)) print(f"[+] Rotating endpoint: {endpoint.name} to certificate {new_cert.name}")
request_rotation(endpoint, new_cert, message, commit) request_rotation(endpoint, new_cert, message, commit)
elif old_cert and new_cert: elif old_cert and new_cert:
print("[+] Rotating all endpoints from {0} to {1}".format(old_cert.name, new_cert.name)) print(f"[+] Rotating all endpoints from {old_cert.name} to {new_cert.name}")
for endpoint in old_cert.endpoints: for endpoint in old_cert.endpoints:
print("[+] Rotating {0}".format(endpoint.name)) print(f"[+] Rotating {endpoint.name}")
request_rotation(endpoint, new_cert, message, commit) request_rotation(endpoint, new_cert, message, commit)
else: else:
print("[+] Rotating all endpoints that have new certificates available") print("[+] Rotating all endpoints that have new certificates available")
for endpoint in endpoint_service.get_all_pending_rotation(): for endpoint in endpoint_service.get_all_pending_rotation():
if len(endpoint.certificate.replaced) == 1: if len(endpoint.certificate.replaced) == 1:
print("[+] Rotating {0} to {1}".format(endpoint.name, endpoint.certificate.replaced[0].name)) print(f"[+] Rotating {endpoint.name} to {endpoint.certificate.replaced[0].name}")
request_rotation(endpoint, endpoint.certificate.replaced[0], message, commit) request_rotation(endpoint, endpoint.certificate.replaced[0], message, commit)
else: else:
metrics.send('endpoint_rotation', 'counter', 1, metric_tags={'status': FAILURE_METRIC_STATUS}) metrics.send('endpoint_rotation', 'counter', 1, metric_tags={
print("[!] Failed to rotate endpoint {0} reason: Multiple replacement certificates found.".format( 'status': FAILURE_METRIC_STATUS,
endpoint.name "old_certificate_name": str(old_cert),
)) "new_certificate_name": str(endpoint.certificate.replaced[0].name),
"endpoint_name": str(endpoint.name),
"message": str(message),
})
print(
f"[!] Failed to rotate endpoint {endpoint.name} reason: "
"Multiple replacement certificates found."
)
status = SUCCESS_METRIC_STATUS status = SUCCESS_METRIC_STATUS
print("[+] Done!") print("[+] Done!")
except Exception as e: except Exception as e:
sentry.captureException() sentry.captureException(
extra={
"old_certificate_name": str(old_certificate_name),
"new_certificate_name": str(new_certificate_name),
"endpoint_name": str(endpoint_name),
"message": str(message),
})
metrics.send('endpoint_rotation_job', 'counter', 1, metric_tags={'status': status}) metrics.send('endpoint_rotation_job', 'counter', 1, metric_tags={
"status": status,
"old_certificate_name": str(old_certificate_name),
"new_certificate_name": str(new_certificate_name),
"endpoint_name": str(endpoint_name),
"message": str(message),
"endpoint": str(globals().get("endpoint"))
})
@manager.option('-o', '--old-certificate', dest='old_certificate_name', help='Name of the certificate you wish to reissue.') @manager.option('-o', '--old-certificate', dest='old_certificate_name', help='Name of the certificate you wish to reissue.')