Remove old notification settings and use the new notification channel

Author: gianlucaborello

.travis.yml

@@ -29,6 +29,7 @@ script:
 - examples/print_user_info.py XXX
 - examples/list_sysdig_captures.py XXX
 - examples/create_sysdig_capture.py XXX ip-10-0-1-110.ec2.internal apicapture 10
+- examples/notification_channels.py XXX
 - echo "Testing pip version"
 - rm -rf sdcclient
 - pip install sdcclient
@@ -54,7 +55,7 @@ script:
 # - examples/print_explore_grouping.py XXX
 # - examples/print_user_info.py XXX
 # - examples/list_sysdig_captures.py XXX
-# - examples/create_sysdig_capture.py XXX ip-10-0-1-110.ec2.internal apicapture 10
+# - examples/create_sysdig_capture.py XXX ip-10-0-2-202.ec2.internal apicapture 10
 notifications:
   slack:
     secure: GJ0H2wAaW67t3+x+cCjOVLw/b+YAZjH9rebAfluCFJklJS9u+V6/qqIyiNDAkMPIcgilFyhiyOQCZYXapgthQ1ieFbZZo//mrRtuGo2wuxCAwcOx2mXAZpZ4I5b3+Q/znVqSuqkwFRid1d138z4TW7sYSIburouDX3QUNoUOy+g7VJxCFQCcqlN8LYxGJHQYdOZa9zIGCtKrOtZ/B8C1TLgXmDMwAAVNO2WzL4GiBTLCGuMsQWMTLw2Qmv1ayZPztmeDWo1C9oa7HIH8Bg2YVjssR87el28X+EqEO533mgYjPmW2/hii30WVFOUE5hMdvKeQLBvy5N3/OCch1np0RQBd8eYEtaPv38rc5L2wAnUq9G5Zzr252z7vnwSLi6lap9jWU8tOerSTEPU+jG05PnuCnufVDXVNPyiPsH6BDP4qxHmLjooNpxfe63Df7NNyUi2I3QoroLj/UzI7zZVQjJEqsTrr5BbsH4z6NTGY91+ZqobBn62+hV3ESAam0ivQgC7s2AKko0qkKyIUGjj7ozU8ebo1UpagNvKC/J9szMqtdXJgKtG8BeonyLMeN6MEEyEvcMJbB4dCcfet+1Sb9AZWnGvYVdajhVLb1HE6OrbzZyhC3KqCe06J9O5BCY9ncy+l16i7MyIfcKTibHQlxPU+Id/VijD97JSRXxnd2i4=

examples/notification_channels.py

@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+#
+# This script shows how to manipulate the notification channel list for alerts
+#
+
+import os
+import sys
+sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), '..'))
+from sdcclient import SdcClient
+
+#
+# Parse arguments
+#
+if len(sys.argv) != 2:
+    print 'usage: %s <sysdig-token>' % sys.argv[0]
+    print 'You can find your token at https://app.sysdigcloud.com/#/settings/user'
+    sys.exit(1)
+
+sdc_token = sys.argv[1]
+
+#
+# Instantiate the SDC client
+#
+sdclient = SdcClient(sdc_token)
+
+#
+# Create an email notification channel
+#
+res = sdclient.create_email_notification_channel('Api Channel', ['[email protected]', '[email protected]', '[email protected]'])
+if not res[0]:
+    print res[1]
+    sys.exit(1)
+
+#
+# The notification channel will contain the id, that can be used when creating alerts
+#
+channel = res[1]['notificationChannel']
+print channel
+
+#
+# Notification channels can also be programmatically deleted
+#
+res = sdclient.delete_notification_channel(channel)
+if not res[0]:
+    print res[1]
+    sys.exit(1)

sdcclient/_client.py

@@ -88,7 +88,7 @@ def get_notifications(self, from_ts, to_ts, state=None, resolved=None):
 
     def update_notification_resolution(self, notification, resolved):
         if 'id' not in notification:
-            return [False, "Invalid notification format"]
+            return [False, 'Invalid notification format']
 
         notification['resolved'] = resolved
         data = {'notification': notification}
@@ -189,50 +189,39 @@ def create_alert(self, name, description, severity, for_atleast_s, condition, se
 
     def delete_alert(self, alert):
         if 'id' not in alert:
-            return [False, "Invalid alert format"]
+            return [False, 'Invalid alert format']
 
         res = requests.delete(self.url + '/api/alerts/' + str(alert['id']), headers=self.hdrs)
         if not self.__checkResponse(res):
             return [False, self.lasterr]
 
         return [True, None]
 
-    def get_notification_settings(self):
-        res = requests.get(self.url + '/api/settings/notifications', headers=self.hdrs)
-        if not self.__checkResponse(res):
-            return [False, self.lasterr]
-        return [True, res.json()]
+    def create_email_notification_channel(self, channel_name, email_recipients):
+        channel_json = {
+            'notificationChannel' : {
+                'type' : 'EMAIL',
+                'name' : channel_name,
+                'enabled' : True,
+                'options' : {
+                    'emailRecipients' : email_recipients
+                }
+            }
+        }
 
-    def set_notification_settings(self, settings):
-        res = requests.put(self.url + '/api/settings/notifications', headers=self.hdrs,
-                           data=json.dumps(settings))
+        res = requests.post(self.url + '/api/notificationChannels', headers=self.hdrs, data=json.dumps(channel_json))
         if not self.__checkResponse(res):
             return [False, self.lasterr]
         return [True, res.json()]
 
-    def add_email_notification_recipient(self, email):
-        #
-        # Retirieve the user's notification settings
-        #
-        res = requests.get(self.url + '/api/settings/notifications', headers=self.hdrs)
+    def delete_notification_channel(self, channel):
+        if 'id' not in channel:
+            return [False, "Invalid channel format"]
+
+        res = requests.delete(self.url + '/api/notificationChannels/' + str(channel['id']), headers=self.hdrs)
         if not self.__checkResponse(res):
             return [False, self.lasterr]
-        j = res.json()
-
-        #
-        # Enable email notifications
-        #
-        j['userNotification']['email']['enabled'] = True
-
-        #
-        # Add the given recipient
-        #
-        if email not in j['userNotification']['email']['recipients']:
-            j['userNotification']['email']['recipients'].append(email)
-        else:
-            return [False, 'notification target ' + email + ' already present']
-
-        return self.set_notification_settings(j)
+        return [True, None]
 
     def get_explore_grouping_hierarchy(self):
         res = requests.get(self.url + '/api/groupConfigurations', headers=self.hdrs)