Avoid aggegating Datadog deployment events accross envs

MeltwaterArchive · Sep 1, 2016 · 6347ae9 · 6347ae9
1 parent fe9e0a2
commit 6347ae9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/src/lighter/datadog.py b/src/lighter/datadog.py
@@ -9,9 +9,9 @@ def __init__(self, token, tags=[]):
         self._url = 'https://app.datadoghq.com'
         self._tags = tags + ['source:lighter', 'type:change']
 
-    def notify(self, title, message, id, tags=[], priority='normal', alert_type='success'):
-        if not title or not message or not id:
-            logging.warn('Datadog title, message and id required')
+    def notify(self, title, message, aggregation_key, tags=[], priority='normal', alert_type='success'):
+        if not title or not message or not aggregation_key:
+            logging.warn('Datadog title, message and aggregation_key required')
             return
 
         merged_tags = list(tags) + self._tags
@@ -28,7 +28,7 @@ def notify(self, title, message, id, tags=[], priority='normal', alert_type='suc
         self._call('/api/v1/events', {
             'title': title,
             'text': message,
-            'aggregation_key': 'lighter_' + id,
+            'aggregation_key': 'lighter_' + aggregation_key,
             'tags': merged_tags,
             'priority': priority,
             'alert_type': alert_type,

diff --git a/src/lighter/main.py b/src/lighter/main.py
@@ -248,7 +248,7 @@ def deploy(marathonurl, filenames, noop=False, force=False, targetdir=None):
                 util.rget(service.document, 'datadog', 'token'),
                 util.toList(util.rget(service.document, 'datadog', 'tags')))
             datadog.notify(
-                id=service.id,
+                aggregation_key="%s_%s" % (service.environment, service.id),
                 title="Deployed %s to the %s environment" % (service.id, service.environment),
                 message="%%%%%% \n Lighter deployed **%s** with image **%s** to **%s** (%s) \n %%%%%%" % (
                     service.id, service.image, service.environment, parsedMarathonUrl.netloc),

diff --git a/src/lighter/test/datadog_test.py b/src/lighter/test/datadog_test.py
@@ -10,7 +10,7 @@ def testNotify(self, mock_jsonRequest):
         Datadog('abc').notify(
             title='test title',
             message='test message',
-            id='/jenkins/test',
+            aggregation_key='/jenkins/test',
             tags=['environment:test'],
             priority='normal',
             alert_type='info')
@@ -23,25 +23,31 @@ def testNoApiKey(self, mock_jsonRequest):
         Datadog('').notify(
             title='test title',
             message='test message',
-            id='/jenkins/test',
+            aggregation_key='/jenkins/test',
             tags=['environment:test'],
             priority='normal',
             alert_type='info')
         self.assertEquals(mock_jsonRequest.call_count, 0)
 
     @patch('lighter.util.jsonRequest')
     def testNoTitle(self, mock_jsonRequest):
-        Datadog('abc').notify(title='', message='test message', id='/jenkins/test', tags=['environment:test'], priority='normal', alert_type='info')
+        Datadog('abc').notify(
+            title='',
+            message='test message',
+            aggregation_key='/jenkins/test',
+            tags=['environment:test'],
+            priority='normal',
+            alert_type='info')
         self.assertEquals(mock_jsonRequest.call_count, 0)
 
     @patch('lighter.util.jsonRequest')
     def testNoMessage(self, mock_jsonRequest):
-        Datadog('abc').notify(title='test title', message='', id='/jenkins/test', tags=['environment:test'], priority='normal', alert_type='info')
+        Datadog('abc').notify(title='test title', message='', aggregation_key='/jenkins/test', tags=['environment:test'], priority='normal', alert_type='info')
         self.assertEquals(mock_jsonRequest.call_count, 0)
 
     @patch('lighter.util.jsonRequest')
     def testNoID(self, mock_jsonRequest):
-        Datadog('abc').notify(title='test title', message='test message', id='', tags=['environment:test'], priority='normal', alert_type='info')
+        Datadog('abc').notify(title='test title', message='test message', aggregation_key='', tags=['environment:test'], priority='normal', alert_type='info')
         self.assertEquals(mock_jsonRequest.call_count, 0)
 
     def _createJsonRequestWrapper(self, marathonurl='http://localhost:1'):