undo #112 and reuse our existing alerting infrastructure

This commit undoes a lot of the work done in #112, and allows us to
reuse our existing rule manager and alerting infrastructure to also
alert when a new node is enrolled, rather than having to call a
specific method to get this functionality.

doorman/extensions.py

@@ -163,10 +163,6 @@ def handle_log_entry(self, entry, node):
         for alerter, match in to_trigger:
             self.alerters[alerter].handle_alert(node, match)
 
-    def handle_enroll(self, node):
-        for alerter in self.alerters.values():
-            alerter.handle_enroll(node)
-
 
 def make_celery(app, celery):
     """ From http://flask.pocoo.org/docs/0.10/patterns/celery/ """

doorman/plugins/alerters/base.py

@@ -13,7 +13,3 @@ class AbstractAlerterPlugin(with_metaclass(ABCMeta)):
     @abstractmethod
     def handle_alert(self, node, match):
         raise NotImplementedError()
-
-    @abstractmethod
-    def handle_enroll(self, node):
-        raise NotImplementedError()

doorman/plugins/alerters/debug.py

@@ -22,6 +22,3 @@ def __init__(self, config):
     def handle_alert(self, node, match):
         # TODO(andrew-d): better message?
         current_app.logger.log(self.level, 'Triggered alert: {0!r}'.format(match))
-
-    def handle_enroll(self, node):
-        current_app.logger.log(self.level, 'Node enrolled: {0!r}'.format(node))

doorman/plugins/alerters/emailer.py

@@ -48,36 +48,3 @@ def handle_alert(self, node, match):
         )
 
         return mail.send(message)
-
-    def handle_enroll(self, node):
-        subject_template = self.config.setdefault(
-            'enroll_subject_template', 'email/enroll.subject.txt'
-        )
-        message_template = self.config.setdefault(
-            'enroll_message_template', 'email/enroll.body.txt'
-        )
-        subject_prefix = self.config.setdefault(
-            'enroll_subject_prefix', '[Doorman]'
-        )
-
-        subject = render_template(
-            subject_template,
-            prefix=subject_prefix,
-            timestamp=dt.datetime.utcnow(),
-            node=node
-        )
-
-        body = render_template(
-            message_template,
-            timestamp=dt.datetime.utcnow(),
-            node=node
-        )
-
-        message = Message(
-            subject.strip(),
-            recipients=self.recipients,
-            body=body,
-            charset='utf-8',
-        )
-
-        return mail.send(message)

doorman/plugins/alerters/pagerduty.py

@@ -69,6 +69,3 @@ def handle_alert(self, node, match):
             self.logger.warn('Could not trigger PagerDuty alert!')
 
         self.logger.debug('Response from PagerDuty: %r', resp.content)
-
-    def handle_enroll(self, node):
-        pass

doorman/plugins/alerters/sentry.py

@@ -49,6 +49,3 @@ def handle_alert(self, node, match):
                 'query': query,
             },
         )
-
-    def handle_enroll(self, node):
-        pass

doorman/tasks.py

@@ -21,18 +21,41 @@ def learn_from_result(result, node):
     return
 
 
-@celery.task()
-def notify_of_node_enrollment(node):
-    current_app.rule_manager.handle_enroll(node)
-    return
-
-
 @celery.task()
 def example_task(one, two):
     print('Adding {0} and {1}'.format(one, two))
     return one + two
 
 
+@celery.task()
+def notify_of_node_enrollment(node):
+    '''
+    Create a result that gets run through our Rule Manager whenever a new
+    node is enrolled so that we may alert on this action.
+
+    A rule can be created within Doorman's rule manager to alert on
+    any of the following conditions:
+        - query name: doorman/tasks/node_enrolled
+        - action: triggered
+        - columns:
+            - enrolled_on
+            - last_ip
+            - node_id
+    '''
+    entry = {
+        'name': 'doorman/tasks/node_enrolled',
+        'calendarTime': dt.datetime.utcnow().strftime('%a %b %d %H:%M:%S %Y UTC'),
+        'action': 'triggered',
+    }
+    columns = entry['columns'] = {}
+    columns['enrolled_on'] = node.get('enrolled_on')
+    columns['last_ip'] = node.get('last_ip')
+    columns['node_id'] = node.get('id')
+    result = {'data': [entry]}
+    current_app.rule_manager.handle_log_entry(result, node)
+    return
+
+
 @celery.task()
 def alert_when_node_goes_offline():
     '''

tests/test_alerters.py

@@ -113,22 +113,6 @@ def verify(message, app):
         alerter = EmailAlerter(self.config)
         alerter.handle_alert(node.to_dict(), match)
 
-    def test_will_email_on_node_enrollment(self, node, testapp):
-        from flask_mail import email_dispatched
-
-        expected_subject = '[Doorman Test] New node enrolled: {display_name}'.format(
-            display_name=node.display_name,
-        )
-
-        @email_dispatched.connect
-        def verify(message, app):
-            assert message.subject == expected_subject
-            assert self.recipients == message.recipients
-            assert 'A new node was enrolled:' in message.body
-
-        alerter = EmailAlerter(self.config)
-        alerter.handle_enroll(node.to_dict())
-
 
 class TestSentryAlerter:
 

tests/test_functional.py

@@ -1362,9 +1362,6 @@ def __init__(self, *args, **kwargs):
             def handle_alert(self, node, match):
                 self.calls.append((node, match))
 
-            def handle_enroll(self, node):
-                self.calls.append((node, None))
-
         dummy_alerter = DummyAlerter()
 
         # This patches the appropriate config to create the 'dummy' alerter.  This is a bit ugly :-(