Various improvements (including fix for #2)

Author: gianlucaborello

examples/create_alert.py

@@ -29,13 +29,13 @@
 #
 # Find notification channels (you need IDs to create an alert).
 #
-notify_channels = [ {'type': 'SLACK', 'channel': 'sysdig-demo2-alerts'},
-                    {'type': 'EMAIL', 'emailRecipients': [u'kini@sysdig.com']},
-                    {'type': 'SNS', 'snsTopicARNs': [u'arn:aws:sns:us-east-1:273107874544:alarms-stg']}
+notify_channels = [ {'type': 'SLACK', 'channel': '#sysdig-demo2-alerts'},
+                    {'type': 'EMAIL', 'emailRecipients': ['kini@sysdig.com']},
+                    {'type': 'SNS', 'snsTopicARNs': ['arn:aws:sns:us-east-1:273107874544:alarms-stg']}
                     ]
 res = sdclient.get_notification_ids(notify_channels)
 if not res[0]:
-    print "Could not get IDs and hence not creating the alert"
+    print "Could not get IDs and hence not creating the alert: " + res[1]
     sys.exit(-1)
 
 notification_channel_ids = res[1]

sdcclient/_client.py

@@ -110,26 +110,32 @@ def get_notification_ids(self, channels):
 
         # Should try and improve this M * N lookup
         ids = []
-        for ch in res.json()["notificationChannels"]:
-            for c in channels:
+        for c in channels:
+            found = False
+            for ch in res.json()["notificationChannels"]:
                 if c['type'] == ch['type']:
-                    print c, ch
                     if c['type'] == 'SNS':
                         opt = ch['options']
                         if set(opt['snsTopicARNs']) == set(c['snsTopicARNs']):
+                            found = True
                             ids.append(ch['id'])
                     elif c['type'] == 'EMAIL':
                         opt = ch['options']
                         if set(c['emailRecipients']) == set(opt['emailRecipients']):
+                            found = True
                             ids.append(ch['id'])
                     elif c['type'] == 'PAGER_DUTY':
                         opt = ch['options']
                         if opt['account'] == c['account'] and opt['serviceName'] == c['serviceName']:
+                            found = True
                             ids.append(ch['id'])
                     elif c['type'] == 'SLACK':
                         opt = ch['options']
-                        if opt['channel'] == c['channel']:
+                        if 'channel' in opt and opt['channel'] == c['channel']:
+                            found = True
                             ids.append(ch['id'])
+            if not found:
+                return [False, "Channel not found: " + str(c)]
 
         return [True, ids]