From e5dee2d7e6c0ab360d633af4a1cbbac87f44ce87 Mon Sep 17 00:00:00 2001
From: kevgliss <kevgliss@gmail.com>
Date: Wed, 28 Dec 2016 09:52:23 -0800
Subject: [PATCH] Adding additional metrics for when destinations fail to
 upload. (#637)

---
 lemur/certificates/models.py                  | 40 ++++++++-----------
 lemur/certificates/views.py                   |  2 +-
 lemur/plugins/lemur_aws/elb.py                |  6 ++-
 .../certificates/certificate/edit.tpl.html    |  1 +
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/lemur/certificates/models.py b/lemur/certificates/models.py
index 5b6c1f72..0da66308 100644
--- a/lemur/certificates/models.py
+++ b/lemur/certificates/models.py
@@ -16,17 +16,23 @@ from sqlalchemy.sql.expression import case
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy import event, Integer, ForeignKey, String, PassiveDefault, func, Column, Text, Boolean
 
+from sqlalchemy_utils.types.arrow import ArrowType
+
 import lemur.common.utils
+
 from lemur.database import db
+
+from lemur.utils import Vault
+from lemur.common import defaults
+
+from lemur.plugins.base import plugins
+
+from lemur.extensions import metrics
+
 from lemur.models import certificate_associations, certificate_source_associations, \
     certificate_destination_associations, certificate_notification_associations, \
     certificate_replacement_associations, roles_certificates
-from lemur.plugins.base import plugins
-from lemur.utils import Vault
 
-from sqlalchemy_utils.types.arrow import ArrowType
-
-from lemur.common import defaults
 from lemur.domains.models import Domain
 
 
@@ -222,10 +228,10 @@ class Certificate(db.Model):
         return "Certificate(name={name})".format(name=self.name)
 
 
-@event.listens_for(Certificate.destinations, 'append')
+@event.listens_for(Certificate.destinations, 'append', retval=True)
 def update_destinations(target, value, initiator):
     """
-    Attempt to upload the new certificate to the new destination
+    Attempt to upload certificate to the new destination
 
     :param target:
     :param value:
@@ -236,8 +242,11 @@ def update_destinations(target, value, initiator):
 
     try:
         destination_plugin.upload(target.name, target.body, target.private_key, target.chain, value.options)
+        return value
     except Exception as e:
         current_app.logger.exception(e)
+        metrics.send('destination_upload_failure', 'counter', 1, metric_tags={'certificate': target.name, 'destination': value.label})
+        return None
 
 
 @event.listens_for(Certificate.replaces, 'append')
@@ -251,20 +260,3 @@ def update_replacement(target, value, initiator):
     :return:
     """
     value.notify = False
-
-
-# @event.listens_for(Certificate, 'before_update')
-# def protect_active(mapper, connection, target):
-#    """
-#     When a certificate has a replacement do not allow it to be marked as 'active'
-#
-#     :param connection:
-#     :param mapper:
-#     :param target:
-#     :return:
-#     """
-#     if target.active:
-#         if not target.notify:
-#             raise Exception(
-#                 "Cannot silence notification for a certificate Lemur has been found to be currently deployed onto endpoints"
-#             )
diff --git a/lemur/certificates/views.py b/lemur/certificates/views.py
index 7bf3ec76..16236021 100644
--- a/lemur/certificates/views.py
+++ b/lemur/certificates/views.py
@@ -644,7 +644,7 @@ class Certificates(AuthenticatedResource):
                         )
                     ), 400
 
-        return service.update(certificate_id)
+        return service.update(certificate_id, **data)
 
 
 class NotificationCertificatesList(AuthenticatedResource):
diff --git a/lemur/plugins/lemur_aws/elb.py b/lemur/plugins/lemur_aws/elb.py
index a066ffb4..473c5edb 100644
--- a/lemur/plugins/lemur_aws/elb.py
+++ b/lemur/plugins/lemur_aws/elb.py
@@ -22,7 +22,11 @@ def retry_throttled(exception):
     """
     if isinstance(exception, botocore.exceptions.ClientError):
         if exception.response['Error']['Code'] == 'LoadBalancerNotFound':
-            return False
+            return
+
+        if exception.response['Error']['Code'] == 'CertificateNotFound':
+            return
+
     return True
 
 
diff --git a/lemur/static/app/angular/certificates/certificate/edit.tpl.html b/lemur/static/app/angular/certificates/certificate/edit.tpl.html
index 5b439914..0b476f76 100644
--- a/lemur/static/app/angular/certificates/certificate/edit.tpl.html
+++ b/lemur/static/app/angular/certificates/certificate/edit.tpl.html
@@ -47,6 +47,7 @@
                 uib-tooltip="If selected, new certificates will be automatically re-issued and re-deployed onto known endpoints."></switch>
       </div>
     </div>
+    <div ng-include="'angular/certificates/certificate/destinations.tpl.html'"></div>
   </form>
 </div>
 <div class="modal-footer">